Attachment 587021 Details for Bug 825465 – Add maven POMS

[patch] Add maven POMS

0001-Added-maven-POM.patch (text/plain), 11.14 KB, created by gil cattaneo on 2012-05-26 16:34:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-05-26 16:34:38 UTC

Size: 11.14 KB

patch

obsolete

>From 5b15ef0a5839884a5d28ecd673549d931c4127fe Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Sat, 26 May 2012 16:34:04 +0200
>Subject: [PATCH] - Added maven POM - Adapt to current guideline
>
>---
> jibx-1.2.4-poms.patch |  191 +++++++++++++++++++++++++++++++++++++++++++++++++
> jibx.spec             |   44 +++++++-----
> 2 files changed, 218 insertions(+), 17 deletions(-)
> create mode 100644 jibx-1.2.4-poms.patch
>
>diff --git a/jibx-1.2.4-poms.patch b/jibx-1.2.4-poms.patch
>new file mode 100644
>index 0000000..96a8ee7
>--- /dev/null
>+++ b/jibx-1.2.4-poms.patch
>@@ -0,0 +1,191 @@
>+diff -Nru build/maven/jibx-bind/pom.xml build/maven-gil/jibx-bind/pom.xml
>+--- build/maven/jibx-bind/pom.xml	2012-05-02 09:51:18.000000000 +0200
>++++ build/maven-gil/jibx-bind/pom.xml	2012-05-26 16:11:24.000000000 +0200
>+@@ -5,7 +5,7 @@
>+   <parent>
>+     <groupId>org.jibx.config</groupId>
>+     <artifactId>main-reactor</artifactId>
>+-    <version>1.2.4-SNAPSHOT</version>
>++    <version>1.2.4</version>
>+   </parent>
>+ 
>+   <groupId>org.jibx</groupId>
>+@@ -72,9 +72,7 @@
>+                 org.jibx.binding.*;version=${project.version},
>+                 org.jibx.util.*;version=${project.version},
>+             </Export-Package>
>+-	    <Include-Resource>@${jibxLibDir}/jibx-bind.jar;inline=**</Include-Resource>
>+ 	    <Main-Class>org.jibx.binding.Compile</Main-Class>
>+-	    <Class-Path>bcel.jar jibx-run.jar xpp3.jar stax-api.jar wstx-asl.jar</Class-Path>
>+           </instructions>
>+         </configuration>
>+       </plugin>
>+@@ -85,7 +83,7 @@
>+     <dependency>
>+       <groupId>${project.groupId}</groupId>
>+       <artifactId>jibx-run</artifactId>
>+-      <version>1.2.4-SNAPSHOT</version>
>++      <version>1.2.4</version>
>+     </dependency>
>+ 
>+     <dependency>
>+diff -Nru build/maven/jibx-extras/pom.xml build/maven-gil/jibx-extras/pom.xml
>+--- build/maven/jibx-extras/pom.xml	2012-05-02 09:51:18.000000000 +0200
>++++ build/maven-gil/jibx-extras/pom.xml	2012-05-26 16:11:24.000000000 +0200
>+@@ -5,7 +5,7 @@
>+   <parent>
>+     <groupId>org.jibx.config</groupId>
>+     <artifactId>main-reactor</artifactId>
>+-    <version>1.2.4-SNAPSHOT</version>
>++    <version>1.2.4</version>
>+   </parent>
>+ 
>+   <groupId>org.jibx</groupId>
>+@@ -60,9 +60,7 @@
>+             <Export-Package>
>+                 org.jibx.extras.*;version=${project.version},
>+             </Export-Package>
>+-	    <Include-Resource>@${jibxLibDir}/jibx-extras.jar;inline=**</Include-Resource>
>+ 	    <Main-Class>org.jibx.extras.TestRoundtrip</Main-Class>
>+-	    <Class-Path>jibx-run.jar xpp3.jar stax-api.jar wstx-asl.jar</Class-Path>
>+           </instructions>
>+         </configuration>
>+       </plugin>
>+@@ -73,7 +71,7 @@
>+     <dependency>
>+       <groupId>${project.groupId}</groupId>
>+       <artifactId>jibx-run</artifactId>
>+-      <version>1.2.4-SNAPSHOT</version>
>++      <version>1.2.4</version>
>+     </dependency>
>+ 
>+ 	<dependency>
>+diff -Nru build/maven/jibx-run/pom.xml build/maven-gil/jibx-run/pom.xml
>+--- build/maven/jibx-run/pom.xml	2012-05-02 09:51:18.000000000 +0200
>++++ build/maven-gil/jibx-run/pom.xml	2012-05-26 16:11:24.000000000 +0200
>+@@ -5,7 +5,7 @@
>+   <parent>
>+     <groupId>org.jibx.config</groupId>
>+     <artifactId>main-reactor</artifactId>
>+-    <version>1.2.4-SNAPSHOT</version>
>++    <version>1.2.4</version>
>+   </parent>
>+ 
>+   <groupId>org.jibx</groupId>
>+@@ -63,9 +63,7 @@
>+             <Export-Package>
>+                 org.jibx.runtime.*;version=${project.version},
>+             </Export-Package>
>+-	    <Include-Resource>@${jibxLibDir}/jibx-run.jar;inline=**</Include-Resource>
>+ 	    <Main-Class>org.jibx.runtime.PrintInfo</Main-Class>
>+-	    <Class-Path>xpp3.jar stax-api.jar wstx-asl.jar</Class-Path>
>+           </instructions>
>+         </configuration>
>+       </plugin>
>+diff -Nru build/maven/jibx-schema/pom.xml build/maven-gil/jibx-schema/pom.xml
>+--- build/maven/jibx-schema/pom.xml	2012-05-02 09:51:18.000000000 +0200
>++++ build/maven-gil/jibx-schema/pom.xml	2012-05-26 16:11:24.000000000 +0200
>+@@ -5,7 +5,7 @@
>+   <parent>
>+     <groupId>org.jibx.config</groupId>
>+     <artifactId>main-reactor</artifactId>
>+-    <version>1.2.4-SNAPSHOT</version>
>++    <version>1.2.4</version>
>+   </parent>
>+ 
>+   <groupId>org.jibx</groupId>
>+@@ -79,8 +79,6 @@
>+                 !org.jibx.schema.generator.*,  
>+                 org.jibx.schema.*;version=${project.version},
>+             </Export-Package>
>+-	    <Include-Resource>@${jibxLibDir}/jibx-schema.jar;inline=**</Include-Resource>
>+-	    <Class-Path>jibx-run.jar jibx-bind.jar xpp3.jar stax-api.jar wstx-asl.jar</Class-Path>
>+           </instructions>
>+         </configuration>
>+       </plugin>
>+@@ -91,12 +89,12 @@
>+     <dependency>
>+       <groupId>${project.groupId}</groupId>
>+       <artifactId>jibx-bind</artifactId>
>+-      <version>1.2.4-SNAPSHOT</version>
>++      <version>1.2.4</version>
>+     </dependency>
>+     <dependency>
>+       <groupId>${project.groupId}</groupId>
>+       <artifactId>jibx-extras</artifactId>
>+-      <version>1.2.4-SNAPSHOT</version>
>++      <version>1.2.4</version>
>+     </dependency>
>+   </dependencies>
>+ 
>+diff -Nru build/maven/jibx-tools/pom.xml build/maven-gil/jibx-tools/pom.xml
>+--- build/maven/jibx-tools/pom.xml	2012-05-02 09:51:18.000000000 +0200
>++++ build/maven-gil/jibx-tools/pom.xml	2012-05-26 16:11:24.000000000 +0200
>+@@ -5,7 +5,7 @@
>+   <parent>
>+     <groupId>org.jibx.config</groupId>
>+     <artifactId>main-reactor</artifactId>
>+-    <version>1.2.4-SNAPSHOT</version>
>++    <version>1.2.4</version>
>+   </parent>
>+ 
>+   <groupId>org.jibx</groupId>
>+@@ -81,15 +81,7 @@
>+                 org.jibx.custom.*;version=${project.version},  
>+                 org.jibx.ws.*;version=${project.version},  
>+             </Export-Package>
>+-	    <Include-Resource>@${jibxLibDir}/jibx-tools.jar;inline=**</Include-Resource>
>+ 	    <Main-Class>org.jibx.ws.wsdl.tools.Jibx2Wsdl</Main-Class>
>+-	    <Class-Path>bcel.jar jibx-run.jar jibx-bind.jar jibx-extras.jar
>+-	    jibx-schema.jar xpp3.jar stax-api.jar wstx-asl.jar joda-time.jar log4j.jar
>+-	    qdox.jar org.eclipse.core.contenttype.jar org.eclipse.core.jobs.jar
>+-	    org.eclipse.core.resources.jar org.eclipse.core.runtime.jar
>+-	    org.eclipse.equinox.common.jar org.eclipse.equinox.preferences.jar
>+-	    org.eclipse.jdt.core.jar org.eclipse.jdt.core.manipulation.jar org.eclipse.osgi.jar
>+-	    org.eclipse.text.jar</Class-Path>
>+           </instructions>
>+         </configuration>
>+       </plugin>
>+@@ -100,10 +92,10 @@
>+     <dependency>
>+       <groupId>${project.groupId}</groupId>
>+       <artifactId>jibx-schema</artifactId>
>+-      <version>1.2.4-SNAPSHOT</version>
>++      <version>1.2.4</version>
>+     </dependency>
>+ 
>+-      
>++      
>+   </dependencies>
>+ 
>+ </project>
>+diff -Nru build/maven/pom.xml build/maven-gil/pom.xml
>+--- build/maven/pom.xml	2012-05-02 09:51:18.000000000 +0200
>++++ build/maven-gil/pom.xml	2012-05-26 16:29:27.892538845 +0200
>+@@ -2,15 +2,9 @@
>+ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
>+   <modelVersion>4.0.0</modelVersion>
>+ 
>+-  <parent>
>+-    <groupId>org.jibx.config</groupId>
>+-    <artifactId>core-reactor</artifactId>
>+-    <version>1.2.4-SNAPSHOT</version>
>+-    <relativePath>../..</relativePath>
>+-  </parent>
>+-
>++  <groupId>org.jibx.config</groupId>
>+   <artifactId>main-reactor</artifactId>
>+-  
>++  <version>1.2.4</version>
>+   <packaging>pom</packaging>
>+   <name>main-reactor - JiBX main reactor</name>
>+   <description>JiBX main reactor</description>
>diff --git a/jibx.spec b/jibx.spec
>index d3bda65..32dba38 100644
>--- a/jibx.spec
>+++ b/jibx.spec
>@@ -1,16 +1,19 @@
> %define debug_package %{nil}
>-
>+%global parent_version 3
> Name: jibx		
> Version:	1.2.4	
>-Release:	2%{?dist}
>+Release:	3%{?dist}
> Summary:	Framework for binding XML data to Java objects 
> 
> Group:		Development/Libraries
> License:	BSD and ASL 1.1
> URL: http://sourceforge.net/projects/jibx/
>-Source0:	http://sourceforge.net/projects/jibx/files/jibx/jibx-1.2.4/%{name}_1_2_4.zip
>+Source0:	http://sourceforge.net/projects/jibx/files/jibx/jibx-1.2.4/jibx_1_2_4.zip
>+
> Patch0: %{name}-classpath.patch
>-BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
>+# fix version and remove unavailable deps and parent pom
>+Patch1: %{name}-%{version}-poms.patch
>+
> BuildRequires: java-devel >= 1:1.6.0
> BuildRequires: ant
> BuildRequires: ant-junit
>@@ -48,11 +51,12 @@ This package contains the API documentation for %{name}.
> %setup -q -n %{name}
> #Patch to add the bundled jar dependencies in the classpath
> %patch0 -p1
>+%patch1 -p0
>+
> find -name '*.class' -exec rm -f '{}' \;
> find -name '*.jar' -exec rm -f '{}' \;
> rm -rf %{_builddir}/%{name}/build/docs/src/*
> 
>-
> #Symlink the eclipse dependencies 
> plugin_file=`ls %{_libdir}/eclipse/plugins/org.eclipse.core.contenttype_*.jar`
> ln -s "$plugin_file" lib/org.eclipse.core.contenttype.jar
>@@ -108,34 +112,40 @@ export CLASSPATH=$(build-classpath junit)
> ant current #test-multiples test-singles test-extras basic-blackbox blackbox devdoc javadoc
> 
> %install
>-rm -rf %{buildroot}
>+
> install -d -m 755 %{buildroot}/%{_javadir}/%{name}
>+install -d -m 755 %{buildroot}%{_mavenpomdir}
>+
>+install -pm 644 build/maven/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-main-reactor.pom
>+%add_maven_depmap JPP.%{name}-main-reactor.pom
>+
> for sub_component in bind extras run schema tools; do
>-install -m 644 lib/jibx-${sub_component}.jar \
>+install -m 644 lib/%{name}-${sub_component}.jar \
> %{buildroot}/%{_javadir}/%{name}/${sub_component}-%{version}.jar
>+# TODO unversioned jars
>+( cd %{buildroot}%{_javadir}/%{name} && ln -sf ${sub_component}-%{version}.jar ${sub_component}.jar )
>+install -m 644 build/maven/jibx-${sub_component}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${sub_component}.pom
>+%add_maven_depmap JPP.%{name}-${sub_component}.pom %{name}/${sub_component}.jar
> done
> 
>-
> mkdir -p %{buildroot}/%{_javadocdir}/%{name}
> cp -rp %{_builddir}/%{name}/build/docs/* \
> %{buildroot}/%{_javadocdir}/%{name}/
> 
>-
>-%clean
>-rm -rf %{buildroot}
>-
>-
>-
> %files
>-%defattr(-,root,root,-)
> %{_javadir}/%{name}/*.jar
> %dir %{_javadir}/%{name}
>+%{_mavenpomdir}/JPP.%{name}-*.pom
>+%{_mavendepmapfragdir}/%{name}
> 
> %files javadoc
>-%defattr(-,root,root,-)
> %{_javadocdir}/%{name}
> 
> %changelog
>+* Sat May 26 2012 gil cattaneo <puntogil@libero.it> - 1.2.4-3
>+- Add maven POM
>+- Adapt to current guideline
>+
> * Sun May 20 2012 Johannes Lips <johannes.lips@googlemail.com> - 1.2.4-2
> - removed the empty debuginfo subpackage caused by the removal of noarch
>  
>@@ -181,4 +191,4 @@ rm -rf %{buildroot}
> - added missing javadoc file attributes
> 
> * Fri Aug 27 2010 Johannes Lips <johannes.lips@googlemail.com> - 1.2.2-1
>-- initial build
>+- initial build
>\ No newline at end of file
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 825465: 587021