diff --git a/.gitignore b/.gitignore index 52189c0..67a4f5f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /jaxb-api-2.2.3-sources.jar +/jaxb-api-src.zip diff --git a/glassfish-jaxb-api-2.2.3-fixbuild.patch b/glassfish-jaxb-api-2.2.3-fixbuild.patch deleted file mode 100644 index e3d5cdf..0000000 --- a/glassfish-jaxb-api-2.2.3-fixbuild.patch +++ /dev/null @@ -1,136 +0,0 @@ ---- pom.xml 2011-06-08 17:02:04.000000000 +0200 -+++ pom.xml-gil 2012-01-14 15:58:24.533138357 +0100 -@@ -81,20 +81,35 @@ - - - -- javax.xml.stream -+ stax - stax-api - 1.0-2 - -- -+ - - -+ -+ spec-comments@jsr222.java.net -+ Dec 2009 -+ -+ - - -- -+ -+ org.apache.maven.plugins -+ maven-compiler-plugin -+ 2.3.2 -+ -+ 1.5 -+ 1.5 -+ -+ -+ -+ -+ -+ org.apache.felix -+ maven-bundle-plugin -+ 2.0.0 -+ -+ -+ ${project.artifactId} -+ ${project.artifactId} -+ ${project.version} -+ org.glassfish.hk2.osgiresourcelocator -+ javax.xml.bind.*;version="${project.version}" -+ * -+ javax.xml.bind -+ -+ -+ -+ -+ bundle-manifest -+ process-classes -+ -+ manifest -+ -+ -+ -+ -+ -+ -+ org.apache.maven.plugins -+ maven-jar-plugin -+ 2.3.2 -+ -+ -+ -+ ${project.build.outputDirectory}/META-INF/MANIFEST.MF -+ -+ -+ -+ -+ -+ org.apache.maven.plugins -+ maven-javadoc-plugin -+ 2.8 -+ -+ false -+ false -+ true -+ true -+ -+JAXB ${project.version} Runtime Library -+${project.name} specification, ${release.spec.date}
-+Comments to: ${release.spec.feedback}
-+More information at: http://jaxb.java.net
-+ 
 

${project.name}

-+
 
]]> -+ -+
v${project.version}]]> -+
-+ -+
Comments to: ${release.spec.feedback} -+
More information at: http://jaxb.java.net -+

Copyright © 2004-2011 Oracle ]]> -+ -+ false -+ -+ -+ http://download.oracle.com/javase/6/docs/api/ -+ ${basedir}/offline-javadoc -+ -+ -+ - -+ - -- -+ - -- - - - m2.dev.java.net diff --git a/glassfish-jaxb-api-2.2.6-osgi-support.patch b/glassfish-jaxb-api-2.2.6-osgi-support.patch new file mode 100644 index 0000000..4f90940 --- /dev/null +++ b/glassfish-jaxb-api-2.2.6-osgi-support.patch @@ -0,0 +1,70 @@ +--- pom.xml 2011-12-01 09:20:20.000000000 +0100 ++++ pom.xml-gil 2012-04-27 10:24:01.741796876 +0200 +@@ -119,17 +119,61 @@ + + + ++ org.apache.felix ++ maven-bundle-plugin ++ 2.0.0 ++ ++ ++ ${project.description} bundled for OSGi distribution ++ ${project.artifactId} ++ ${project.artifactId} ++ org.glassfish.hk2.osgiresourcelocator ++ javax.xml.bind.*;version="${project.version}" ++ javax.activation, ++ javax.xml.bind;version="${project.version}", ++ javax.xml.bind.annotation;version="${project.version}", ++ javax.xml.bind.annotation.adapters;version="${project.version}", ++ javax.xml.bind.attachment;version="${project.version}", ++ javax.xml.bind.helpers;version="${project.version}", ++ javax.xml.bind.util;version="${project.version}", ++ javax.xml.datatype, ++ javax.xml.namespace, ++ javax.xml.parsers, ++ javax.xml.stream, ++ javax.xml.transform, ++ javax.xml.transform.dom, ++ javax.xml.transform.sax, ++ javax.xml.transform.stream, ++ javax.xml.validation, ++ org.w3c.dom, ++ org.xml.sax, ++ org.xml.sax.ext, ++ org.xml.sax.helpers ++ javax.xml.bind ++ ${project.name} ++ ${project.organization.name} ++ ${project.version} ++ ++ ++ ++ ++ bundle-manifest ++ process-classes ++ ++ manifest ++ ++ ++ ++ ++ ++ + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + +- +- javax.xml.bind +- +- +- true +- ++ ++ ${project.build.outputDirectory}/META-INF/MANIFEST.MF + + + diff --git a/glassfish-jaxb-api.spec b/glassfish-jaxb-api.spec index c5029c7..7266105 100644 --- a/glassfish-jaxb-api.spec +++ b/glassfish-jaxb-api.spec @@ -1,31 +1,37 @@ %global oname jaxb-api Name: glassfish-jaxb-api -Version: 2.2.3 -Release: 2%{?dist} +Version: 2.2.6 +Release: 1%{?dist} Summary: Java Architecture for XML Binding Group: Development/Libraries License: CDDL or GPLv2 with exception URL: http://jaxb.java.net/ -Source0: http://download.java.net/maven/2/javax/xml/bind/jaxb-api/%{version}/jaxb-api-%{version}-sources.jar -Source1: http://download.java.net/maven/2/javax/xml/bind/jaxb-api/%{version}/jaxb-api-%{version}.pom -Patch0: %{name}-2.2.3-fixbuild.patch +# jaxb api and impl have different version +# svn export https://svn.java.net/svn/jaxb~version2/tags/jaxb-2_2_5/tools/lib/redist/jaxb-api-src.zip + +Source0: jaxb-api-src.zip +#Source1: http://download.java.net/maven/2/javax/xml/bind/jaxb-api/%{version}/jaxb-api-%{version}.pom +Source1: http://repo1.maven.org/maven2/javax/xml/bind/jaxb-api/%{version}/jaxb-api-%{version}.pom + +Patch0: %{name}-2.2.6-osgi-support.patch BuildRequires: java-devel >= 1:1.6.0 BuildRequires: jpackage-utils BuildRequires: java-javadoc -BuildRequires: bea-stax-api -BuildRequires: forge-parent +BuildRequires: jvnet-parent + BuildRequires: maven BuildRequires: maven-compiler-plugin +BuildRequires: maven-enforcer-plugin BuildRequires: maven-install-plugin BuildRequires: maven-jar-plugin BuildRequires: maven-javadoc-plugin BuildRequires: maven-plugin-bundle BuildRequires: maven-resources-plugin BuildRequires: maven-shared-osgi +BuildRequires: maven-surefire-plugin -Requires: bea-stax-api Requires: java >= 1:1.6.0 Requires: jpackage-utils BuildArch: noarch @@ -48,33 +54,19 @@ This package contains javadoc for %{name}. %setup -T -q -c # fixing incomplete source directory structure -mkdir -p src/main/java src/main/resources +mkdir -p src/main/java ( cd src/main/java - jar -xf %{SOURCE0} - find . -iname 'package.html' -delete + unzip -qq %{SOURCE0} rm -rf META-INF ) cp -p %{SOURCE1} pom.xml - %patch0 -p0 sed -i 's|${basedir}/offline-javadoc|%{_javadocdir}/java|' pom.xml -# clone source directory structure -find src/ -type d | while read dirname ; do - newdirname=`echo $dirname | sed "s:src/main/java:src/main/resources:g"` - mkdir -p $newdirname -done - -# copy Messages.properties files except *.java sources -find src/ -type f | grep -v "\.java" | while read cpfrom ; do - cpto=`echo $cpfrom | sed "s:src/main/java:src/main/resources:g"` - cp $cpfrom $cpto -done - %build mvn-rpmbuild install javadoc:javadoc @@ -100,6 +92,10 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{oname} %{_javadocdir}/%{oname} %changelog +* Fri Apr 27 2012 gil cattaneo 2.2.6-1 +- update to 2.2.6 +- remove Build/Requires: bea-stax-api + * Tue Jan 24 2012 gil cattaneo 2.2.3-2 - revert to 2.2.3 (stable release) - fix License field diff --git a/jaxb-api-2.2.3.pom b/jaxb-api-2.2.3.pom deleted file mode 100644 index cf95b64..0000000 --- a/jaxb-api-2.2.3.pom +++ /dev/null @@ -1,149 +0,0 @@ - - - - - 4.0.0 - javax.xml.bind - jaxb-api - 2.2.3 - jar - - JAXB API bundle for GlassFish V3 - http://jaxb.java.net/ - - - Oracle Corporation - http://www.oracle.com/ - - - - - CDDL 1.1 - https://glassfish.java.net/public/CDDL+GPL_1_1.html - repo - - - GPL2 w/ CPE - https://glassfish.java.net/public/CDDL+GPL_1_1.html - repo - - - - - https://svn.java.net/svn/jaxb~version2/jaxb-ri - - - - JAXB (JSR 222) API - - - - - javax.xml.stream - stax-api - 1.0-2 - - - javax.activation - activation - 1.1 - - - - - - - - org.jvnet.maven-antrun-extended-plugin - maven-antrun-extended-plugin - - - package - - run - - - - - - - - - - - - - org.jvnet.wagon-svn - wagon-svn - 1.8 - - - - - - - m2.dev.java.net - http://download.java.net/maven/2 - default - - - - - - maven2-repository.dev.java.net - Java.net Repository for Maven - http://download.java.net/maven/2/ - - - - - - false - java.net-maven2-repository - svn:https://svn.java.net/svn/maven2-repository~svn/trunk/repository - - - - diff --git a/jaxb-api-2.2.6.pom b/jaxb-api-2.2.6.pom new file mode 100644 index 0000000..7275da5 --- /dev/null +++ b/jaxb-api-2.2.6.pom @@ -0,0 +1,207 @@ + + + + + + + net.java + jvnet-parent + 1 + + + 4.0.0 + javax.xml.bind + jaxb-api + 2.2.6 + jar + + Java Architecture for XML Binding + JAXB (JSR 222) API + http://jaxb.java.net/ + + + Oracle Corporation + http://www.oracle.com/ + + + + + Martin Grebac + martin.grebac@oracle.com + Oracle Corporation + + + + + + CDDL 1.1 + https://glassfish.java.net/public/CDDL+GPL_1_1.html + repo + + + GPL2 w/ CPE + https://glassfish.java.net/public/CDDL+GPL_1_1.html + repo + + + + + scm:svn:http://svn.java.net/svn/jsr222~svn/tags/jaxb-api-2.2.6 + scm:svn:https://svn.java.net/svn/jsr222~svn/tags/jaxb-api-2.2.6 + http://java.net/projects/jsr222/sources/svn/show/tags/jaxb-api-2.2.6 + + + + spec-comments@jsr222.java.net + Dec 2009 + + + + + + + src/main/java + + **/*.java + + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 2.0.2 + + 1.5 + 1.5 + + + + + org.apache.maven.plugins + maven-jar-plugin + 2.3.1 + + + + javax.xml.bind + + + true + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + 2.8 + + false + false + true + true + +JAXB ${project.version} Runtime Library +${project.name} specification, ${release.spec.date}
+Comments to: ${release.spec.feedback}
+More information at: http://jaxb.java.net
+ 
 

${project.name}

+
 
]]> + +
v${project.version}]]> +
+ +
Comments to: ${release.spec.feedback} +
More information at: http://jaxb.java.net +

Copyright © 2004-2011 Oracle ]]> + + false + + + http://download.oracle.com/javase/6/docs/api/ + ${basedir}/offline-javadoc + + + + + + + + + + + + release-sign-artifacts + + + performRelease + true + + + + + + org.apache.maven.plugins + maven-gpg-plugin + 1.1 + + + sign-artifacts + verify + + sign + + + + + + + + + + diff --git a/sources b/sources index b6846b3..f73eb03 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -87c95083c6d18d66ec7a68268468d6a4 jaxb-api-2.2.3-sources.jar +3382264d4f64465c189aef74ea7a6a3f jaxb-api-src.zip