From e5fe81b3af942edd13c6bd4ec7faa05bd5d72b96 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 12 Mar 2012 12:12:44 +0000 Subject: [PATCH 01/36] Initial setup of the repo --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 .gitignore create mode 100644 sources diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e69de29 diff --git a/sources b/sources new file mode 100644 index 0000000..e69de29 From 313bef32f6fec28d187233fd54697dcbafd62c7e Mon Sep 17 00:00:00 2001 From: Juan Hernandez Date: Mon, 12 Mar 2012 13:36:45 +0100 Subject: [PATCH 02/36] First import after review (#796201) --- .gitignore | 1 + build-javadoc.xml | 17 ++ glassfish-jaxb-add-dependencies.patch | 106 +++++++++ glassfish-jaxb-dont-build-examples.patch | 37 +++ glassfish-jaxb-dont-bundle-other-jars.patch | 44 ++++ ...sfish-jaxb-dont-generate-1.0-runtime.patch | 60 +++++ ...h-jaxb-dont-generate-jing-rnc-driver.patch | 31 +++ ...fish-jaxb-dont-use-internal-resolver.patch | 27 +++ ...fish-jaxb-dont-use-prebuilt-javadocs.patch | 26 +++ ...jaxb-remove-classpath-from-manifests.patch | 34 +++ glassfish-jaxb.spec | 220 ++++++++++++++++++ jaxb-impl-2.2.5.pom | 114 +++++++++ jaxb-xjc-2.2.5.pom | 104 +++++++++ sources | 1 + 14 files changed, 822 insertions(+) create mode 100644 build-javadoc.xml create mode 100644 glassfish-jaxb-add-dependencies.patch create mode 100644 glassfish-jaxb-dont-build-examples.patch create mode 100644 glassfish-jaxb-dont-bundle-other-jars.patch create mode 100644 glassfish-jaxb-dont-generate-1.0-runtime.patch create mode 100644 glassfish-jaxb-dont-generate-jing-rnc-driver.patch create mode 100644 glassfish-jaxb-dont-use-internal-resolver.patch create mode 100644 glassfish-jaxb-dont-use-prebuilt-javadocs.patch create mode 100644 glassfish-jaxb-remove-classpath-from-manifests.patch create mode 100644 glassfish-jaxb.spec create mode 100644 jaxb-impl-2.2.5.pom create mode 100644 jaxb-xjc-2.2.5.pom diff --git a/.gitignore b/.gitignore index e69de29..e6f2579 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/glassfish-jaxb-2.2.5.tar.gz diff --git a/build-javadoc.xml b/build-javadoc.xml new file mode 100644 index 0000000..6411abb --- /dev/null +++ b/build-javadoc.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/glassfish-jaxb-add-dependencies.patch b/glassfish-jaxb-add-dependencies.patch new file mode 100644 index 0000000..4e07d26 --- /dev/null +++ b/glassfish-jaxb-add-dependencies.patch @@ -0,0 +1,106 @@ +--- a/jaxb-impl.pom ++++ b/jaxb-impl.pom +@@ -43,12 +43,6 @@ + + + +- +- net.java +- jvnet-parent +- 1 +- +- + 4.0.0 + com.sun.xml.bind + jaxb-impl +@@ -91,6 +85,37 @@ + http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri + + ++ ++ ++ isorelax ++ isorelax ++ system ++ /usr/share/java/isorelax.jar ++ ++ ++ msv-msv ++ msv-msv ++ system ++ /usr/share/java/msv-msv.jar ++ ++ ++ relaxngDatatype ++ relaxngDatatype ++ system ++ /usr/share/java/relaxngDatatype.jar ++ ++ ++ com.sun.istack ++ istack-commons-runtime ++ 2.6.1 ++ ++ ++ com.sun.xml.txw2 ++ txw2 ++ 20110809 ++ ++ ++ + + + +--- a/jaxb-xjc.pom ++++ b/jaxb-xjc.pom +@@ -43,12 +43,6 @@ + + + +- +- net.java +- jvnet-parent +- 1 +- +- + 4.0.0 + com.sun.xml.bind + jaxb-xjc +@@ -91,6 +85,37 @@ + http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri + + ++ ++ ++ isorelax ++ isorelax ++ system ++ /usr/share/java/isorelax.jar ++ ++ ++ msv-msv ++ msv-msv ++ system ++ /usr/share/java/msv-msv.jar ++ ++ ++ relaxngDatatype ++ relaxngDatatype ++ system ++ /usr/share/java/relaxngDatatype.jar ++ ++ ++ com.sun.istack ++ istack-commons-runtime ++ 2.6.1 ++ ++ ++ com.sun.xml.txw2 ++ txw2 ++ 20110809 ++ ++ ++ + + + diff --git a/glassfish-jaxb-dont-build-examples.patch b/glassfish-jaxb-dont-build-examples.patch new file mode 100644 index 0000000..0c34924 --- /dev/null +++ b/glassfish-jaxb-dont-build-examples.patch @@ -0,0 +1,37 @@ +From bc4b149aa582d1663db86141533477a3a7ca937e Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 18:04:52 +0100 +Subject: [PATCH 7/7] Don't build examples + +--- + build.xml | 14 -------------- + 1 files changed, 0 insertions(+), 14 deletions(-) + +diff --git a/build.xml b/build.xml +index 7b18a8e..4da31cb 100644 +--- a/build.xml ++++ b/build.xml +@@ -880,20 +880,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +-- +1.7.9 + diff --git a/glassfish-jaxb-dont-bundle-other-jars.patch b/glassfish-jaxb-dont-bundle-other-jars.patch new file mode 100644 index 0000000..3a862f7 --- /dev/null +++ b/glassfish-jaxb-dont-bundle-other-jars.patch @@ -0,0 +1,44 @@ +From a954f6d671b5c3f334a80e803db77362500c1e48 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 17:20:13 +0100 +Subject: [PATCH 4/5] Don't bundle other jars + +--- + build.xml | 7 ------- + 1 files changed, 0 insertions(+), 7 deletions(-) + +diff --git a/build.xml b/build.xml +index 12631a1..4dda9ef 100644 +--- a/build.xml ++++ b/build.xml +@@ -830,7 +830,6 @@ + + + +- + + + +@@ -854,19 +853,13 @@ Class-Path: ${manifest.classpath} + + + +- +- +- +- + + +- + + + +- + + + +-- +1.7.9 + diff --git a/glassfish-jaxb-dont-generate-1.0-runtime.patch b/glassfish-jaxb-dont-generate-1.0-runtime.patch new file mode 100644 index 0000000..81504cf --- /dev/null +++ b/glassfish-jaxb-dont-generate-1.0-runtime.patch @@ -0,0 +1,60 @@ +From 2dd0e1c44601db267fab47fa903c3f478d624d53 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 17:11:14 +0100 +Subject: [PATCH 2/5] Don't generate 1.0 runtime + +--- + build.xml | 23 +---------------------- + 1 files changed, 1 insertions(+), 22 deletions(-) + +diff --git a/build.xml b/build.xml +index 7e95870..12631a1 100644 +--- a/build.xml ++++ b/build.xml +@@ -798,7 +798,7 @@ + + + + + +@@ -834,25 +834,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -884,8 +865,6 @@ Class-Path: ${manifest.classpath} + + + +- +- + + + +-- +1.7.9 + diff --git a/glassfish-jaxb-dont-generate-jing-rnc-driver.patch b/glassfish-jaxb-dont-generate-jing-rnc-driver.patch new file mode 100644 index 0000000..17b709a --- /dev/null +++ b/glassfish-jaxb-dont-generate-jing-rnc-driver.patch @@ -0,0 +1,31 @@ +From 2fad64699dd922ae6c78575b4b32f621461544a5 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 17:16:56 +0100 +Subject: [PATCH 3/5] Don't generate Jing RNC driver + +--- + tools/build.xml | 2 -- + 1 files changed, 0 insertions(+), 2 deletions(-) + +diff --git a/tools/build.xml b/tools/build.xml +index d304db4..0723987 100644 +--- a/tools/build.xml ++++ b/tools/build.xml +@@ -53,14 +53,12 @@ + + +- + + + + + + +- + + + +-- +1.7.9 + diff --git a/glassfish-jaxb-dont-use-internal-resolver.patch b/glassfish-jaxb-dont-use-internal-resolver.patch new file mode 100644 index 0000000..240e5c0 --- /dev/null +++ b/glassfish-jaxb-dont-use-internal-resolver.patch @@ -0,0 +1,27 @@ +From 5f4055b0b8792440e3f004ff189e08e05c5a1d44 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 17:08:06 +0100 +Subject: [PATCH 1/5] Don't use internal resolver + +--- + xjc/src/com/sun/tools/xjc/Options.java | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/xjc/src/com/sun/tools/xjc/Options.java b/xjc/src/com/sun/tools/xjc/Options.java +index 78c9cf4..d8247de 100644 +--- a/xjc/src/com/sun/tools/xjc/Options.java ++++ b/xjc/src/com/sun/tools/xjc/Options.java +@@ -67,8 +67,8 @@ import com.sun.codemodel.CodeWriter; + import com.sun.codemodel.JPackage; + import com.sun.codemodel.writer.FileCodeWriter; + import com.sun.codemodel.writer.PrologCodeWriter; +-import com.sun.org.apache.xml.internal.resolver.CatalogManager; +-import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; ++import org.apache.xml.resolver.CatalogManager; ++import org.apache.xml.resolver.tools.CatalogResolver; + import com.sun.tools.xjc.api.ClassNameAllocator; + import com.sun.tools.xjc.api.SpecVersion; + import com.sun.tools.xjc.generator.bean.field.FieldRendererFactory; +-- +1.7.9 + diff --git a/glassfish-jaxb-dont-use-prebuilt-javadocs.patch b/glassfish-jaxb-dont-use-prebuilt-javadocs.patch new file mode 100644 index 0000000..f905447 --- /dev/null +++ b/glassfish-jaxb-dont-use-prebuilt-javadocs.patch @@ -0,0 +1,26 @@ +From 463def43292b22ba9137b79fe98a96fe545725ed Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 18:04:19 +0100 +Subject: [PATCH 6/7] Don't use prebuilt javadocs + +--- + build.xml | 3 --- + 1 files changed, 0 insertions(+), 3 deletions(-) + +diff --git a/build.xml b/build.xml +index a0759eb..7b18a8e 100644 +--- a/build.xml ++++ b/build.xml +@@ -880,9 +880,6 @@ + + + +- +- +- + + + +-- +1.7.9 + diff --git a/glassfish-jaxb-remove-classpath-from-manifests.patch b/glassfish-jaxb-remove-classpath-from-manifests.patch new file mode 100644 index 0000000..8933dfc --- /dev/null +++ b/glassfish-jaxb-remove-classpath-from-manifests.patch @@ -0,0 +1,34 @@ +From 1bcc5546d6100f1cc41f6e1cb9be113ce967d737 Mon Sep 17 00:00:00 2001 +From: Juan Hernandez +Date: Sat, 10 Mar 2012 17:24:00 +0100 +Subject: [PATCH 5/5] Remove classpath from manifests + +--- + build.xml | 4 ---- + 1 files changed, 0 insertions(+), 4 deletions(-) + +diff --git a/build.xml b/build.xml +index 4dda9ef..a0759eb 100644 +--- a/build.xml ++++ b/build.xml +@@ -820,9 +820,6 @@ + + + +- +- +- + +@@ -845,7 +842,6 @@ + + Main-Class: com.sun.tools.xjc.XJCFacade +-Class-Path: ${manifest.classpath} + + + +-- +1.7.9 + diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec new file mode 100644 index 0000000..4bcfcb7 --- /dev/null +++ b/glassfish-jaxb.spec @@ -0,0 +1,220 @@ +Name: glassfish-jaxb +Version: 2.2.5 +Release: 1%{?dist} +Summary: JAXB Reference Implementation + +Group: Development/Libraries +License: CDDL and GPLv2 with exceptions +URL: http://jaxb.java.net + +# svn export https://svn.java.net/svn/jaxb~version2/tags/jaxb-2_2_5/ glassfish-jaxb-2.2.5 +# find glassfish-jaxb-2.2.5/ -name '*.class' -delete +# find glassfish-jaxb-2.2.5/ -name '*.jar' -delete +# find glassfish-jaxb-2.2.5/ -name '*.zip' -delete +# find glassfish-jaxb-2.2.5/ -name '*.dll' -delete +# tar czf glassfish-jaxb-2.2.5.tar.gz glassfish-jaxb-2.2.5 +Source0: %{name}-%{version}.tar.gz + +# JAXB implementation POM: +Source1: http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/2.2.5/jaxb-impl-2.2.5.pom + +# JAXB XJC POM: +Source2: http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-xjc/2.2.5/jaxb-xjc-2.2.5.pom + +# Ant build file used to generate the Javadoc (this is not part of the original +# source but written on purpose for the packaging): +Source3: build-javadoc.xml + +# Use resolver from xml-commons-resolver instead of an internal rebundled one: +Patch0: %{name}-dont-use-internal-resolver.patch + +# Don't try to generate the 1.0 runtime: +Patch1: %{name}-dont-generate-1.0-runtime.patch + +# Removing Jing driver because of incompatibility issues: +Patch2: %{name}-dont-generate-jing-rnc-driver.patch + +# Don't bundle the contents of other jar files in the XJC compiler jar file: +Patch3: %{name}-dont-bundle-other-jars.patch + +# Remove the class-path entry from the generated manifest files: +Patch4: %{name}-remove-classpath-from-manifests.patch + +# Patch the POM files to include the dependencies corresponding to the jar +# files that we aren't bundling within the jat files of this package: +Patch5: %{name}-add-dependencies.patch + +# Don't use the prebuilt javadocs: +Patch6: %{name}-dont-use-prebuilt-javadocs.patch + +# Don't build the examples as they need additional dependencies: +Patch7: %{name}-dont-build-examples.patch + +BuildArch: noarch + +BuildRequires: jpackage-utils +BuildRequires: java-devel + +BuildRequires: ant +BuildRequires: codemodel +BuildRequires: istack-commons +BuildRequires: relaxngcc +BuildRequires: xml-commons-resolver +BuildRequires: txw2 +BuildRequires: relaxngDatatype +BuildRequires: glassfish-dtd-parser +BuildRequires: glassfish-jaxb-api +BuildRequires: glassfish-fastinfoset +BuildRequires: jing +BuildRequires: stax-ex +BuildRequires: isorelax +BuildRequires: xsom + +Requires: glassfish-dtd-parser +Requires: xml-commons-resolver +Requires: xsom +Requires: isorelax +Requires: jing +Requires: stax-ex +Requires: glassfish-fastinfoset +Requires: glassfish-jaxb-api +Requires: relaxngDatatype +Requires: txw2 +Requires: relaxngcc +Requires: istack-commons +Requires: codemodel +Requires: jpackage-utils +Requires: java + + +%description +GlassFish JAXB Reference Implementation. + + +%package javadoc +Summary: Javadocs for %{name} +Group: Documentation +Requires: jpackage-utils + + +%description javadoc +This package contains the API documentation for %{name}. + + +%prep + +# Unpack the sources: +%setup -q + +# Put the POM files in place (we do this before patching because we need to +# patch the POMs in order to add the dependencies for the artifacts that we are +# not bundling): +cp %{SOURCE1} jaxb-impl.pom +cp %{SOURCE2} jaxb-xjc.pom + +# Apply the patches: +%patch0 -p1 +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 + +# Link the libraries where the build script expects them: +ln -s $(build-classpath codemodel) tools/lib/rebundle/compiler/codemodel.jar +ln -s $(build-classpath glassfish-dtd-parser) tools/lib/rebundle/compiler/dtd-parser.jar +ln -s $(build-classpath istack-commons-tools) tools/lib/rebundle/compiler/istack-commons-tools.jar +ln -s $(build-classpath relaxngDatatype) tools/lib/rebundle/compiler/relaxngDatatype.jar +ln -s $(build-classpath xml-resolver) tools/lib/rebundle/compiler/resolver.jar +ln -s $(build-classpath rngom) tools/lib/rebundle/compiler/rngom.jar +ln -s $(build-classpath xsom) tools/lib/rebundle/compiler/xsom.jar +ln -s $(build-classpath isorelax) tools/lib/rebundle/runtime/isorelax.jar +ln -s $(build-classpath msv-msv) tools/lib/rebundle/runtime/msv.jar +ln -s $(build-classpath relaxngDatatype) tools/lib/rebundle/runtime/relaxngDatatype.jar +ln -s $(build-classpath istack-commons-runtime) tools/lib/rebundle/runtime2/istack-commons-runtime.jar +ln -s $(build-classpath txw2) tools/lib/rebundle/runtime2/txw2.jar +ln -s $(build-classpath jaxb-api) tools/lib/redist/jaxb-api.jar +ln -s $(build-classpath FastInfoset) tools/lib/util/FastInfoset.jar +ln -s $(build-classpath args4j) tools/lib/util/args4j.jar +ln -s $(build-classpath codemodel-annotation-compiler) tools/lib/util/codemodel-annotation-compiler.jar +ln -s $(build-classpath dom4j) tools/lib/util/dom4j.jar +ln -s $(build-classpath jing) tools/lib/util/jing.jar +ln -s $(build-classpath relaxngcc) tools/lib/util/relaxngcc.jar +ln -s $(build-classpath stax-ex) tools/lib/util/stax-ex.jar +ln -s $(build-classpath txwc2) tools/lib/util/txwc2.jar + +# Put the Javadoc build file in place (no patching needed here, as this is not +# part of the original source): +cp %{SOURCE3} build-javadoc.xml + + +%build + +# Build the binaries: +ant \ + -Dbuild.sysclasspath=last \ + -Dbuild.number=1 \ + dist + +# Build the javadoc for the runtime and the compiler: +ant \ + -Dbuild.sysclasspath=last \ + -f build-javadoc.xml + + +%install + +# Jar files: +install -d -m 755 %{buildroot}%{_javadir}/%{name} +install -m 644 dist/lib/jaxb-impl.jar %{buildroot}%{_javadir}/%{name}/jaxb-impl.jar +install -m 644 dist/lib/jaxb-xjc.jar %{buildroot}%{_javadir}/%{name}/jaxb-xjc.jar +install -m 644 tools/pretty-printer/build/pretty-printer.jar %{buildroot}%{_javadir}/%{name}/pretty-printer.jar +install -m 644 tools/xmllint/build/xmllint.jar %{buildroot}%{_javadir}/%{name}/xmllint.jar + +# POM files: +install -d -m 755 %{buildroot}%{_mavenpomdir} +install -m 644 jaxb-impl.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxb-impl.pom +install -m 644 jaxb-xjc.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxb-xjc.pom + +# Javadoc files: +install -d -m 755 %{buildroot}%{_javadocdir}/%{name} +cp -rp apidocs/* %{buildroot}%{_javadocdir}/%{name}/. + +# Dependencies map: +%add_maven_depmap JPP.%{name}-jaxb-impl.pom %{name}/jaxb-impl.jar +%add_maven_depmap JPP.%{name}-jaxb-xjc.pom %{name}/jaxb-xjc.jar + + +%files +%{_mavenpomdir}/* +%{_mavendepmapfragdir}/* +%{_javadir}/* +%doc License.txt +%doc License.html + + +%files javadoc +%{_javadocdir}/%{name} +%doc License.txt +%doc License.html + + +%changelog +* Sat Mar 10 2012 Juan Hernandez 2.2.5-1 +- Updated to upstream version 2.2.5 +- Removed classpath from manifest files + +* Wed Mar 7 2012 Juan Hernandez 2.2.4u1-4 +- Updated to reflect the change from glassfish-fi to glassfish-fastinfoset + +* Wed Feb 22 2012 Juan Hernandez 2.2.4u1-3 +- Updated to reflect the changes of the jar names in txw2 + +* Wed Feb 22 2012 Juan Hernandez 2.2.4u1-2 +- Cleanup of the spec file + +* Sat Jan 21 2012 Marek Goldmann 2.2.4u1-1 +- Initial packaging + diff --git a/jaxb-impl-2.2.5.pom b/jaxb-impl-2.2.5.pom new file mode 100644 index 0000000..05d66e6 --- /dev/null +++ b/jaxb-impl-2.2.5.pom @@ -0,0 +1,114 @@ + + + + + + + net.java + jvnet-parent + 1 + + + 4.0.0 + com.sun.xml.bind + jaxb-impl + 2.2.5 + jar + + JAXB Reference Implementation + JAXB (JSR 222) Reference Implementation + 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/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri + scm:svn:https://svn.java.net/svn/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri + http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri + + + + + + javax.xml.bind + jaxb-api + 2.2.6 + + + com.sun.istack + istack-commons-runtime + 2.6.1 + + + com.sun.xml.fastinfoset + FastInfoset + 1.2.12 + + + + + diff --git a/jaxb-xjc-2.2.5.pom b/jaxb-xjc-2.2.5.pom new file mode 100644 index 0000000..c2fd8aa --- /dev/null +++ b/jaxb-xjc-2.2.5.pom @@ -0,0 +1,104 @@ + + + + + + + net.java + jvnet-parent + 1 + + + 4.0.0 + com.sun.xml.bind + jaxb-xjc + 2.2.5 + jar + + JAXB XJC + JAXB (JSR 222) reference implementation - Schema compiler + 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/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri + scm:svn:https://svn.java.net/svn/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri + http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri + + + + + + com.sun.xml.bind + jaxb-impl + 2.2.5 + + + + + diff --git a/sources b/sources index e69de29..499c3b9 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +141e9f0e9c8fc76b263898627e627131 glassfish-jaxb-2.2.5.tar.gz From 4b7818c45786e91b5d134334264a03f7fd779912 Mon Sep 17 00:00:00 2001 From: Juan Hernandez Date: Tue, 13 Mar 2012 10:50:21 +0100 Subject: [PATCH 03/36] Add missing xsom and rngom dependencies During the update to upstream 2.2.5 the patch that adds the depencencies for xsom and rngom was updated incorrectly. althought that is not strictly required as it is also a transitive --- glassfish-jaxb-add-dependencies.patch | 66 +++++++++++++++------------ glassfish-jaxb.spec | 7 ++- 2 files changed, 43 insertions(+), 30 deletions(-) diff --git a/glassfish-jaxb-add-dependencies.patch b/glassfish-jaxb-add-dependencies.patch index 4e07d26..bfebdac 100644 --- a/glassfish-jaxb-add-dependencies.patch +++ b/glassfish-jaxb-add-dependencies.patch @@ -66,39 +66,47 @@ 4.0.0 com.sun.xml.bind jaxb-xjc -@@ -91,6 +85,37 @@ +@@ -91,6 +85,45 @@ http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri + -+ -+ isorelax -+ isorelax -+ system -+ /usr/share/java/isorelax.jar -+ -+ -+ msv-msv -+ msv-msv -+ system -+ /usr/share/java/msv-msv.jar -+ -+ -+ relaxngDatatype -+ relaxngDatatype -+ system -+ /usr/share/java/relaxngDatatype.jar -+ -+ -+ com.sun.istack -+ istack-commons-runtime -+ 2.6.1 -+ -+ -+ com.sun.xml.txw2 -+ txw2 -+ 20110809 -+ ++ ++ com.sun.codemodel ++ codemodel ++ 2.6 ++ ++ ++ com.sun.xml.dtd-parser ++ dtd-parser ++ 1.2-SNAPSHOT ++ ++ ++ com.sun.istack ++ istack-commons-tools ++ 2.6.1 ++ ++ ++ relaxngDatatype ++ relaxngDatatype ++ system ++ /usr/share/java/relaxngDatatype.jar ++ ++ ++ xml-resolver ++ xml-resolver ++ 1.2 ++ ++ ++ org.kohsuke.rngom ++ rngom ++ 201103-SNAPSHOT ++ ++ ++ com.sun.xsom ++ xsom ++ 20110809 ++ + + diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 4bcfcb7..7ba7092 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JAXB Reference Implementation Group: Development/Libraries @@ -69,10 +69,12 @@ BuildRequires: jing BuildRequires: stax-ex BuildRequires: isorelax BuildRequires: xsom +BuildRequires: rngom Requires: glassfish-dtd-parser Requires: xml-commons-resolver Requires: xsom +Requires: rngom Requires: isorelax Requires: jing Requires: stax-ex @@ -202,6 +204,9 @@ cp -rp apidocs/* %{buildroot}%{_javadocdir}/%{name}/. %changelog +* Tue Mar 13 2012 Juan Hernandez 2.2.5-2 +- Add missing xsom and rngom dependencies to the POM files + * Sat Mar 10 2012 Juan Hernandez 2.2.5-1 - Updated to upstream version 2.2.5 - Removed classpath from manifest files From 359d43c22a1f3824e7b299bfdc38d4c569e82a9d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 19 Jul 2012 01:49:57 -0500 Subject: [PATCH 04/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 7ba7092..79fff0c 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.5 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JAXB Reference Implementation Group: Development/Libraries @@ -204,6 +204,9 @@ cp -rp apidocs/* %{buildroot}%{_javadocdir}/%{name}/. %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 2.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Tue Mar 13 2012 Juan Hernandez 2.2.5-2 - Add missing xsom and rngom dependencies to the POM files From edc0b789ae5aedd85ab729454024db460e3162e6 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 13 Feb 2013 17:35:09 -0600 Subject: [PATCH 05/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 79fff0c..aebf1d3 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.5 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JAXB Reference Implementation Group: Development/Libraries @@ -204,6 +204,9 @@ cp -rp apidocs/* %{buildroot}%{_javadocdir}/%{name}/. %changelog +* Wed Feb 13 2013 Fedora Release Engineering - 2.2.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + * Thu Jul 19 2012 Fedora Release Engineering - 2.2.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild From 638e5b39ea2a8edad1318d143d0e5f5eb4987b39 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 3 Aug 2013 09:39:40 -0500 Subject: [PATCH 06/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index aebf1d3..9abbce8 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.5 -Release: 4%{?dist} +Release: 5%{?dist} Summary: JAXB Reference Implementation Group: Development/Libraries @@ -204,6 +204,9 @@ cp -rp apidocs/* %{buildroot}%{_javadocdir}/%{name}/. %changelog +* Sat Aug 03 2013 Fedora Release Engineering - 2.2.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + * Wed Feb 13 2013 Fedora Release Engineering - 2.2.5-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild From 5d978944e45aac0e1ea0d34ed0426f7ddbd13e7f Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 28 Mar 2014 17:45:00 +0100 Subject: [PATCH 07/36] Use Requires: java-headless rebuild (#1067528) Signed-off-by: Michael Simacek Signed-off-by: Mikolaj Izdebski --- glassfish-jaxb.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 9abbce8..2c040dc 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.5 -Release: 5%{?dist} +Release: 6%{?dist} Summary: JAXB Reference Implementation Group: Development/Libraries @@ -86,7 +86,6 @@ Requires: relaxngcc Requires: istack-commons Requires: codemodel Requires: jpackage-utils -Requires: java %description @@ -204,6 +203,9 @@ cp -rp apidocs/* %{buildroot}%{_javadocdir}/%{name}/. %changelog +* Fri Mar 28 2014 Michael Simacek - 2.2.5-6 +- Use Requires: java-headless rebuild (#1067528) + * Sat Aug 03 2013 Fedora Release Engineering - 2.2.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild From bfb16eb9b431d0edab529e646dc026b46134a6d4 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 11:06:08 -0500 Subject: [PATCH 08/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 2c040dc..d6f43cd 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.5 -Release: 6%{?dist} +Release: 7%{?dist} Summary: JAXB Reference Implementation Group: Development/Libraries @@ -203,6 +203,9 @@ cp -rp apidocs/* %{buildroot}%{_javadocdir}/%{name}/. %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 2.2.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Fri Mar 28 2014 Michael Simacek - 2.2.5-6 - Use Requires: java-headless rebuild (#1067528) From 3662b2d6db083e6bd7b417ba9c9f02980fa63e82 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 27 Oct 2014 14:58:17 +0100 Subject: [PATCH 09/36] Fix FTBFS (Resolves: rhbz#1106636) - Adapt to current packaging guidelines --- glassfish-jaxb-fix-java8-compatibility.patch | 43 +++++++++++++++++++ glassfish-jaxb.spec | 44 +++++++------------- 2 files changed, 59 insertions(+), 28 deletions(-) create mode 100644 glassfish-jaxb-fix-java8-compatibility.patch diff --git a/glassfish-jaxb-fix-java8-compatibility.patch b/glassfish-jaxb-fix-java8-compatibility.patch new file mode 100644 index 0000000..1f1e4cf --- /dev/null +++ b/glassfish-jaxb-fix-java8-compatibility.patch @@ -0,0 +1,43 @@ +diff --git a/xjc/src/com/sun/tools/jxc/model/nav/ApNavigator.java b/xjc/src/com/sun/tools/jxc/model/nav/ApNavigator.java +index f1d3745..3a16a1c 100644 +--- a/xjc/src/com/sun/tools/jxc/model/nav/ApNavigator.java ++++ b/xjc/src/com/sun/tools/jxc/model/nav/ApNavigator.java +@@ -47,6 +47,7 @@ import com.sun.xml.bind.v2.model.nav.Navigator; + import com.sun.xml.bind.v2.runtime.Location; + + import javax.annotation.processing.ProcessingEnvironment; ++import javax.lang.model.element.AnnotationMirror; + import javax.lang.model.element.Element; + import javax.lang.model.element.ElementKind; + import javax.lang.model.element.ExecutableElement; +@@ -66,6 +67,8 @@ import javax.lang.model.util.ElementFilter; + import javax.lang.model.util.Elements; + import javax.lang.model.util.SimpleTypeVisitor6; + import javax.lang.model.util.Types; ++ ++import java.lang.annotation.Annotation; + import java.util.Collection; + import java.util.HashMap; + import java.util.HashSet; +@@ -387,6 +390,21 @@ public class ApNavigator implements Navigator T[] getAnnotationsByType(Class annotationClass) { ++ throw new IllegalStateException(); ++ } ++ ++ @Override ++ public A getAnnotation(Class annotationType) { ++ throw new IllegalStateException(); ++ } ++ ++ @Override ++ public List getAnnotationMirrors() { ++ throw new IllegalStateException(); ++ } + }; + + public Location getClassLocation(TypeElement typeElement) { diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index d6f43cd..08ec655 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.5 -Release: 7%{?dist} +Release: 8%{?dist} Summary: JAXB Reference Implementation Group: Development/Libraries @@ -50,6 +50,9 @@ Patch6: %{name}-dont-use-prebuilt-javadocs.patch # Don't build the examples as they need additional dependencies: Patch7: %{name}-dont-build-examples.patch +# Fix Java 8 compatibility +Patch8: %{name}-fix-java8-compatibility.patch + BuildArch: noarch BuildRequires: jpackage-utils @@ -107,6 +110,7 @@ This package contains the API documentation for %{name}. # Unpack the sources: %setup -q + # Put the POM files in place (we do this before patching because we need to # patch the POMs in order to add the dependencies for the artifacts that we are # not bundling): @@ -122,6 +126,7 @@ cp %{SOURCE2} jaxb-xjc.pom %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 # Link the libraries where the build script expects them: ln -s $(build-classpath codemodel) tools/lib/rebundle/compiler/codemodel.jar @@ -137,7 +142,7 @@ ln -s $(build-classpath relaxngDatatype) tools/lib/rebundle/runtime/relaxngDatat ln -s $(build-classpath istack-commons-runtime) tools/lib/rebundle/runtime2/istack-commons-runtime.jar ln -s $(build-classpath txw2) tools/lib/rebundle/runtime2/txw2.jar ln -s $(build-classpath jaxb-api) tools/lib/redist/jaxb-api.jar -ln -s $(build-classpath FastInfoset) tools/lib/util/FastInfoset.jar +ln -s $(build-classpath glassfish-fastinfoset) tools/lib/util/FastInfoset.jar ln -s $(build-classpath args4j) tools/lib/util/args4j.jar ln -s $(build-classpath codemodel-annotation-compiler) tools/lib/util/codemodel-annotation-compiler.jar ln -s $(build-classpath dom4j) tools/lib/util/dom4j.jar @@ -166,43 +171,26 @@ ant \ %install +%mvn_artifact jaxb-impl.pom dist/lib/jaxb-impl.jar +%mvn_artifact jaxb-xjc.pom dist/lib/jaxb-xjc.jar -# Jar files: -install -d -m 755 %{buildroot}%{_javadir}/%{name} -install -m 644 dist/lib/jaxb-impl.jar %{buildroot}%{_javadir}/%{name}/jaxb-impl.jar -install -m 644 dist/lib/jaxb-xjc.jar %{buildroot}%{_javadir}/%{name}/jaxb-xjc.jar -install -m 644 tools/pretty-printer/build/pretty-printer.jar %{buildroot}%{_javadir}/%{name}/pretty-printer.jar -install -m 644 tools/xmllint/build/xmllint.jar %{buildroot}%{_javadir}/%{name}/xmllint.jar +%mvn_install -J apidocs/ -# POM files: -install -d -m 755 %{buildroot}%{_mavenpomdir} -install -m 644 jaxb-impl.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxb-impl.pom -install -m 644 jaxb-xjc.pom %{buildroot}%{_mavenpomdir}/JPP.%{name}-jaxb-xjc.pom - -# Javadoc files: -install -d -m 755 %{buildroot}%{_javadocdir}/%{name} -cp -rp apidocs/* %{buildroot}%{_javadocdir}/%{name}/. - -# Dependencies map: -%add_maven_depmap JPP.%{name}-jaxb-impl.pom %{name}/jaxb-impl.jar -%add_maven_depmap JPP.%{name}-jaxb-xjc.pom %{name}/jaxb-xjc.jar - - -%files -%{_mavenpomdir}/* -%{_mavendepmapfragdir}/* -%{_javadir}/* +%files -f .mfiles %doc License.txt %doc License.html -%files javadoc -%{_javadocdir}/%{name} +%files javadoc -f .mfiles-javadoc %doc License.txt %doc License.html %changelog +* Mon Oct 27 2014 Michal Srb - 2.2.5-8 +- Fix FTBFS (Resolves: rhbz#1106636) +- Adapt to current packaging guidelines + * Sat Jun 07 2014 Fedora Release Engineering - 2.2.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 82881b6907fe03c45016480511f5ccaf1f9a7dae Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 27 Oct 2014 15:49:30 +0100 Subject: [PATCH 10/36] Remove R, add BR: javapackages-local (for %%mvn_artifact macro) --- glassfish-jaxb.spec | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 08ec655..90ae66e 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -55,7 +55,7 @@ Patch8: %{name}-fix-java8-compatibility.patch BuildArch: noarch -BuildRequires: jpackage-utils +BuildRequires: javapackages-local BuildRequires: java-devel BuildRequires: ant @@ -74,22 +74,6 @@ BuildRequires: isorelax BuildRequires: xsom BuildRequires: rngom -Requires: glassfish-dtd-parser -Requires: xml-commons-resolver -Requires: xsom -Requires: rngom -Requires: isorelax -Requires: jing -Requires: stax-ex -Requires: glassfish-fastinfoset -Requires: glassfish-jaxb-api -Requires: relaxngDatatype -Requires: txw2 -Requires: relaxngcc -Requires: istack-commons -Requires: codemodel -Requires: jpackage-utils - %description GlassFish JAXB Reference Implementation. @@ -190,6 +174,7 @@ ant \ * Mon Oct 27 2014 Michal Srb - 2.2.5-8 - Fix FTBFS (Resolves: rhbz#1106636) - Adapt to current packaging guidelines +- Remove R, add BR: javapackages-local (for %%mvn_artifact macro) * Sat Jun 07 2014 Fedora Release Engineering - 2.2.5-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild From 8cdf8849c4b5528f84d7969825d56a7e39a88929 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Mon, 19 Jan 2015 20:18:49 +0100 Subject: [PATCH 11/36] Update to upstream version 2.2.11 --- .gitignore | 1 + build-javadoc.xml | 17 -- glassfish-jaxb-add-dependencies.patch | 114 ---------- glassfish-jaxb-dont-build-examples.patch | 37 ---- glassfish-jaxb-dont-bundle-other-jars.patch | 44 ---- ...sfish-jaxb-dont-generate-1.0-runtime.patch | 60 ------ ...h-jaxb-dont-generate-jing-rnc-driver.patch | 31 --- ...fish-jaxb-dont-use-internal-resolver.patch | 27 --- ...fish-jaxb-dont-use-prebuilt-javadocs.patch | 26 --- glassfish-jaxb-fix-java8-compatibility.patch | 43 ---- ...jaxb-remove-classpath-from-manifests.patch | 34 --- glassfish-jaxb.spec | 199 +++++------------- jaxb-impl-2.2.5.pom | 114 ---------- jaxb-xjc-2.2.5.pom | 104 --------- sources | 2 +- 15 files changed, 60 insertions(+), 793 deletions(-) delete mode 100644 build-javadoc.xml delete mode 100644 glassfish-jaxb-add-dependencies.patch delete mode 100644 glassfish-jaxb-dont-build-examples.patch delete mode 100644 glassfish-jaxb-dont-bundle-other-jars.patch delete mode 100644 glassfish-jaxb-dont-generate-1.0-runtime.patch delete mode 100644 glassfish-jaxb-dont-generate-jing-rnc-driver.patch delete mode 100644 glassfish-jaxb-dont-use-internal-resolver.patch delete mode 100644 glassfish-jaxb-dont-use-prebuilt-javadocs.patch delete mode 100644 glassfish-jaxb-fix-java8-compatibility.patch delete mode 100644 glassfish-jaxb-remove-classpath-from-manifests.patch delete mode 100644 jaxb-impl-2.2.5.pom delete mode 100644 jaxb-xjc-2.2.5.pom diff --git a/.gitignore b/.gitignore index e6f2579..621ee41 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /glassfish-jaxb-2.2.5.tar.gz +/jaxb-ri-2.2.11.src.zip diff --git a/build-javadoc.xml b/build-javadoc.xml deleted file mode 100644 index 6411abb..0000000 --- a/build-javadoc.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/glassfish-jaxb-add-dependencies.patch b/glassfish-jaxb-add-dependencies.patch deleted file mode 100644 index bfebdac..0000000 --- a/glassfish-jaxb-add-dependencies.patch +++ /dev/null @@ -1,114 +0,0 @@ ---- a/jaxb-impl.pom -+++ b/jaxb-impl.pom -@@ -43,12 +43,6 @@ - - - -- -- net.java -- jvnet-parent -- 1 -- -- - 4.0.0 - com.sun.xml.bind - jaxb-impl -@@ -91,6 +85,37 @@ - http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri - - -+ -+ -+ isorelax -+ isorelax -+ system -+ /usr/share/java/isorelax.jar -+ -+ -+ msv-msv -+ msv-msv -+ system -+ /usr/share/java/msv-msv.jar -+ -+ -+ relaxngDatatype -+ relaxngDatatype -+ system -+ /usr/share/java/relaxngDatatype.jar -+ -+ -+ com.sun.istack -+ istack-commons-runtime -+ 2.6.1 -+ -+ -+ com.sun.xml.txw2 -+ txw2 -+ 20110809 -+ -+ -+ - - - ---- a/jaxb-xjc.pom -+++ b/jaxb-xjc.pom -@@ -43,12 +43,6 @@ - - - -- -- net.java -- jvnet-parent -- 1 -- -- - 4.0.0 - com.sun.xml.bind - jaxb-xjc -@@ -91,6 +85,45 @@ - http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri - - -+ -+ -+ com.sun.codemodel -+ codemodel -+ 2.6 -+ -+ -+ com.sun.xml.dtd-parser -+ dtd-parser -+ 1.2-SNAPSHOT -+ -+ -+ com.sun.istack -+ istack-commons-tools -+ 2.6.1 -+ -+ -+ relaxngDatatype -+ relaxngDatatype -+ system -+ /usr/share/java/relaxngDatatype.jar -+ -+ -+ xml-resolver -+ xml-resolver -+ 1.2 -+ -+ -+ org.kohsuke.rngom -+ rngom -+ 201103-SNAPSHOT -+ -+ -+ com.sun.xsom -+ xsom -+ 20110809 -+ -+ -+ - - - diff --git a/glassfish-jaxb-dont-build-examples.patch b/glassfish-jaxb-dont-build-examples.patch deleted file mode 100644 index 0c34924..0000000 --- a/glassfish-jaxb-dont-build-examples.patch +++ /dev/null @@ -1,37 +0,0 @@ -From bc4b149aa582d1663db86141533477a3a7ca937e Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Sat, 10 Mar 2012 18:04:52 +0100 -Subject: [PATCH 7/7] Don't build examples - ---- - build.xml | 14 -------------- - 1 files changed, 0 insertions(+), 14 deletions(-) - -diff --git a/build.xml b/build.xml -index 7b18a8e..4da31cb 100644 ---- a/build.xml -+++ b/build.xml -@@ -880,20 +880,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - --- -1.7.9 - diff --git a/glassfish-jaxb-dont-bundle-other-jars.patch b/glassfish-jaxb-dont-bundle-other-jars.patch deleted file mode 100644 index 3a862f7..0000000 --- a/glassfish-jaxb-dont-bundle-other-jars.patch +++ /dev/null @@ -1,44 +0,0 @@ -From a954f6d671b5c3f334a80e803db77362500c1e48 Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Sat, 10 Mar 2012 17:20:13 +0100 -Subject: [PATCH 4/5] Don't bundle other jars - ---- - build.xml | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) - -diff --git a/build.xml b/build.xml -index 12631a1..4dda9ef 100644 ---- a/build.xml -+++ b/build.xml -@@ -830,7 +830,6 @@ - - - -- - - - -@@ -854,19 +853,13 @@ Class-Path: ${manifest.classpath} - - - -- -- -- -- - - -- - - - -- - - - --- -1.7.9 - diff --git a/glassfish-jaxb-dont-generate-1.0-runtime.patch b/glassfish-jaxb-dont-generate-1.0-runtime.patch deleted file mode 100644 index 81504cf..0000000 --- a/glassfish-jaxb-dont-generate-1.0-runtime.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 2dd0e1c44601db267fab47fa903c3f478d624d53 Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Sat, 10 Mar 2012 17:11:14 +0100 -Subject: [PATCH 2/5] Don't generate 1.0 runtime - ---- - build.xml | 23 +---------------------- - 1 files changed, 1 insertions(+), 22 deletions(-) - -diff --git a/build.xml b/build.xml -index 7e95870..12631a1 100644 ---- a/build.xml -+++ b/build.xml -@@ -798,7 +798,7 @@ - - - - - -@@ -834,25 +834,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -884,8 +865,6 @@ Class-Path: ${manifest.classpath} - - - -- -- - - - --- -1.7.9 - diff --git a/glassfish-jaxb-dont-generate-jing-rnc-driver.patch b/glassfish-jaxb-dont-generate-jing-rnc-driver.patch deleted file mode 100644 index 17b709a..0000000 --- a/glassfish-jaxb-dont-generate-jing-rnc-driver.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 2fad64699dd922ae6c78575b4b32f621461544a5 Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Sat, 10 Mar 2012 17:16:56 +0100 -Subject: [PATCH 3/5] Don't generate Jing RNC driver - ---- - tools/build.xml | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/tools/build.xml b/tools/build.xml -index d304db4..0723987 100644 ---- a/tools/build.xml -+++ b/tools/build.xml -@@ -53,14 +53,12 @@ - - -- - - - - - - -- - - - --- -1.7.9 - diff --git a/glassfish-jaxb-dont-use-internal-resolver.patch b/glassfish-jaxb-dont-use-internal-resolver.patch deleted file mode 100644 index 240e5c0..0000000 --- a/glassfish-jaxb-dont-use-internal-resolver.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 5f4055b0b8792440e3f004ff189e08e05c5a1d44 Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Sat, 10 Mar 2012 17:08:06 +0100 -Subject: [PATCH 1/5] Don't use internal resolver - ---- - xjc/src/com/sun/tools/xjc/Options.java | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/xjc/src/com/sun/tools/xjc/Options.java b/xjc/src/com/sun/tools/xjc/Options.java -index 78c9cf4..d8247de 100644 ---- a/xjc/src/com/sun/tools/xjc/Options.java -+++ b/xjc/src/com/sun/tools/xjc/Options.java -@@ -67,8 +67,8 @@ import com.sun.codemodel.CodeWriter; - import com.sun.codemodel.JPackage; - import com.sun.codemodel.writer.FileCodeWriter; - import com.sun.codemodel.writer.PrologCodeWriter; --import com.sun.org.apache.xml.internal.resolver.CatalogManager; --import com.sun.org.apache.xml.internal.resolver.tools.CatalogResolver; -+import org.apache.xml.resolver.CatalogManager; -+import org.apache.xml.resolver.tools.CatalogResolver; - import com.sun.tools.xjc.api.ClassNameAllocator; - import com.sun.tools.xjc.api.SpecVersion; - import com.sun.tools.xjc.generator.bean.field.FieldRendererFactory; --- -1.7.9 - diff --git a/glassfish-jaxb-dont-use-prebuilt-javadocs.patch b/glassfish-jaxb-dont-use-prebuilt-javadocs.patch deleted file mode 100644 index f905447..0000000 --- a/glassfish-jaxb-dont-use-prebuilt-javadocs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 463def43292b22ba9137b79fe98a96fe545725ed Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Sat, 10 Mar 2012 18:04:19 +0100 -Subject: [PATCH 6/7] Don't use prebuilt javadocs - ---- - build.xml | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) - -diff --git a/build.xml b/build.xml -index a0759eb..7b18a8e 100644 ---- a/build.xml -+++ b/build.xml -@@ -880,9 +880,6 @@ - - - -- -- -- - - - --- -1.7.9 - diff --git a/glassfish-jaxb-fix-java8-compatibility.patch b/glassfish-jaxb-fix-java8-compatibility.patch deleted file mode 100644 index 1f1e4cf..0000000 --- a/glassfish-jaxb-fix-java8-compatibility.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/xjc/src/com/sun/tools/jxc/model/nav/ApNavigator.java b/xjc/src/com/sun/tools/jxc/model/nav/ApNavigator.java -index f1d3745..3a16a1c 100644 ---- a/xjc/src/com/sun/tools/jxc/model/nav/ApNavigator.java -+++ b/xjc/src/com/sun/tools/jxc/model/nav/ApNavigator.java -@@ -47,6 +47,7 @@ import com.sun.xml.bind.v2.model.nav.Navigator; - import com.sun.xml.bind.v2.runtime.Location; - - import javax.annotation.processing.ProcessingEnvironment; -+import javax.lang.model.element.AnnotationMirror; - import javax.lang.model.element.Element; - import javax.lang.model.element.ElementKind; - import javax.lang.model.element.ExecutableElement; -@@ -66,6 +67,8 @@ import javax.lang.model.util.ElementFilter; - import javax.lang.model.util.Elements; - import javax.lang.model.util.SimpleTypeVisitor6; - import javax.lang.model.util.Types; -+ -+import java.lang.annotation.Annotation; - import java.util.Collection; - import java.util.HashMap; - import java.util.HashSet; -@@ -387,6 +390,21 @@ public class ApNavigator implements Navigator T[] getAnnotationsByType(Class annotationClass) { -+ throw new IllegalStateException(); -+ } -+ -+ @Override -+ public A getAnnotation(Class annotationType) { -+ throw new IllegalStateException(); -+ } -+ -+ @Override -+ public List getAnnotationMirrors() { -+ throw new IllegalStateException(); -+ } - }; - - public Location getClassLocation(TypeElement typeElement) { diff --git a/glassfish-jaxb-remove-classpath-from-manifests.patch b/glassfish-jaxb-remove-classpath-from-manifests.patch deleted file mode 100644 index 8933dfc..0000000 --- a/glassfish-jaxb-remove-classpath-from-manifests.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 1bcc5546d6100f1cc41f6e1cb9be113ce967d737 Mon Sep 17 00:00:00 2001 -From: Juan Hernandez -Date: Sat, 10 Mar 2012 17:24:00 +0100 -Subject: [PATCH 5/5] Remove classpath from manifests - ---- - build.xml | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) - -diff --git a/build.xml b/build.xml -index 4dda9ef..a0759eb 100644 ---- a/build.xml -+++ b/build.xml -@@ -820,9 +820,6 @@ - - - -- -- -- - -@@ -845,7 +842,6 @@ - - Main-Class: com.sun.tools.xjc.XJCFacade --Class-Path: ${manifest.classpath} - - - --- -1.7.9 - diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 90ae66e..00edc68 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,176 +1,93 @@ -Name: glassfish-jaxb -Version: 2.2.5 -Release: 8%{?dist} -Summary: JAXB Reference Implementation +Name: glassfish-jaxb +Version: 2.2.11 +Release: 1%{?dist} +Summary: JAXB Reference Implementation -Group: Development/Libraries -License: CDDL and GPLv2 with exceptions -URL: http://jaxb.java.net +License: CDDL and GPLv2 with exceptions +URL: http://jaxb.java.net -# svn export https://svn.java.net/svn/jaxb~version2/tags/jaxb-2_2_5/ glassfish-jaxb-2.2.5 -# find glassfish-jaxb-2.2.5/ -name '*.class' -delete -# find glassfish-jaxb-2.2.5/ -name '*.jar' -delete -# find glassfish-jaxb-2.2.5/ -name '*.zip' -delete -# find glassfish-jaxb-2.2.5/ -name '*.dll' -delete -# tar czf glassfish-jaxb-2.2.5.tar.gz glassfish-jaxb-2.2.5 -Source0: %{name}-%{version}.tar.gz +Source0: https://jaxb.java.net/%{version}/jaxb-ri-%{version}.src.zip -# JAXB implementation POM: -Source1: http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-impl/2.2.5/jaxb-impl-2.2.5.pom - -# JAXB XJC POM: -Source2: http://repo1.maven.org/maven2/com/sun/xml/bind/jaxb-xjc/2.2.5/jaxb-xjc-2.2.5.pom - -# Ant build file used to generate the Javadoc (this is not part of the original -# source but written on purpose for the packaging): -Source3: build-javadoc.xml - -# Use resolver from xml-commons-resolver instead of an internal rebundled one: -Patch0: %{name}-dont-use-internal-resolver.patch - -# Don't try to generate the 1.0 runtime: -Patch1: %{name}-dont-generate-1.0-runtime.patch - -# Removing Jing driver because of incompatibility issues: -Patch2: %{name}-dont-generate-jing-rnc-driver.patch - -# Don't bundle the contents of other jar files in the XJC compiler jar file: -Patch3: %{name}-dont-bundle-other-jars.patch - -# Remove the class-path entry from the generated manifest files: -Patch4: %{name}-remove-classpath-from-manifests.patch - -# Patch the POM files to include the dependencies corresponding to the jar -# files that we aren't bundling within the jat files of this package: -Patch5: %{name}-add-dependencies.patch - -# Don't use the prebuilt javadocs: -Patch6: %{name}-dont-use-prebuilt-javadocs.patch - -# Don't build the examples as they need additional dependencies: -Patch7: %{name}-dont-build-examples.patch - -# Fix Java 8 compatibility -Patch8: %{name}-fix-java8-compatibility.patch - -BuildArch: noarch - -BuildRequires: javapackages-local -BuildRequires: java-devel - -BuildRequires: ant -BuildRequires: codemodel -BuildRequires: istack-commons -BuildRequires: relaxngcc -BuildRequires: xml-commons-resolver -BuildRequires: txw2 -BuildRequires: relaxngDatatype -BuildRequires: glassfish-dtd-parser -BuildRequires: glassfish-jaxb-api -BuildRequires: glassfish-fastinfoset -BuildRequires: jing -BuildRequires: stax-ex -BuildRequires: isorelax -BuildRequires: xsom -BuildRequires: rngom +BuildRequires: maven-local +BuildRequires: codemodel +BuildRequires: istack-commons +BuildRequires: relaxngcc +BuildRequires: xml-commons-resolver +BuildRequires: txw2 +BuildRequires: relaxngDatatype +BuildRequires: glassfish-dtd-parser +BuildRequires: glassfish-jaxb-api +BuildRequires: glassfish-fastinfoset +BuildRequires: jing +BuildRequires: stax-ex +BuildRequires: isorelax +BuildRequires: xsom +BuildRequires: rngom +BuildRequires: javaparser +BuildRequires: args4j +BuildRequires: args4j-tools +BuildRequires: maven-site-plugin +BuildRequires: maven-dependency-plugin +BuildRequires: maven-shade-plugin +BuildArch: noarch %description GlassFish JAXB Reference Implementation. - %package javadoc -Summary: Javadocs for %{name} -Group: Documentation -Requires: jpackage-utils - +Summary: Javadocs for %{name} %description javadoc This package contains the API documentation for %{name}. - %prep +%setup -q -c -# Unpack the sources: -%setup -q +# uses very old args4j +%pom_disable_module compiler txw +%pom_remove_dep com.sun:tools +%pom_add_dep_mgmt com.sun:tools +%pom_remove_dep com.sun:tools jxc +%pom_add_dep com.sun:tools jxc -# Put the POM files in place (we do this before patching because we need to -# patch the POMs in order to add the dependencies for the artifacts that we are -# not bundling): -cp %{SOURCE1} jaxb-impl.pom -cp %{SOURCE2} jaxb-xjc.pom +%pom_remove_dep com.sun.xml.bind:jaxb-release-documentation bundles/ri +%pom_remove_dep com.sun.xml.bind:jaxb-samples bundles/ri -# Apply the patches: -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 -%patch6 -p1 -%patch7 -p1 -%patch8 -p1 +%pom_remove_plugin :gfnexus-maven-plugin +%pom_remove_plugin :maven-site-plugin -# Link the libraries where the build script expects them: -ln -s $(build-classpath codemodel) tools/lib/rebundle/compiler/codemodel.jar -ln -s $(build-classpath glassfish-dtd-parser) tools/lib/rebundle/compiler/dtd-parser.jar -ln -s $(build-classpath istack-commons-tools) tools/lib/rebundle/compiler/istack-commons-tools.jar -ln -s $(build-classpath relaxngDatatype) tools/lib/rebundle/compiler/relaxngDatatype.jar -ln -s $(build-classpath xml-resolver) tools/lib/rebundle/compiler/resolver.jar -ln -s $(build-classpath rngom) tools/lib/rebundle/compiler/rngom.jar -ln -s $(build-classpath xsom) tools/lib/rebundle/compiler/xsom.jar -ln -s $(build-classpath isorelax) tools/lib/rebundle/runtime/isorelax.jar -ln -s $(build-classpath msv-msv) tools/lib/rebundle/runtime/msv.jar -ln -s $(build-classpath relaxngDatatype) tools/lib/rebundle/runtime/relaxngDatatype.jar -ln -s $(build-classpath istack-commons-runtime) tools/lib/rebundle/runtime2/istack-commons-runtime.jar -ln -s $(build-classpath txw2) tools/lib/rebundle/runtime2/txw2.jar -ln -s $(build-classpath jaxb-api) tools/lib/redist/jaxb-api.jar -ln -s $(build-classpath glassfish-fastinfoset) tools/lib/util/FastInfoset.jar -ln -s $(build-classpath args4j) tools/lib/util/args4j.jar -ln -s $(build-classpath codemodel-annotation-compiler) tools/lib/util/codemodel-annotation-compiler.jar -ln -s $(build-classpath dom4j) tools/lib/util/dom4j.jar -ln -s $(build-classpath jing) tools/lib/util/jing.jar -ln -s $(build-classpath relaxngcc) tools/lib/util/relaxngcc.jar -ln -s $(build-classpath stax-ex) tools/lib/util/stax-ex.jar -ln -s $(build-classpath txwc2) tools/lib/util/txwc2.jar - -# Put the Javadoc build file in place (no patching needed here, as this is not -# part of the original source): -cp %{SOURCE3} build-javadoc.xml +%pom_remove_dep org.glassfish.jaxb:jaxb-runtime bundles/runtime +%pom_remove_dep org.glassfish.jaxb:jaxb-jxc bundles/jxc +%mvn_alias com.sun.xml.bind:jaxb-impl org.glassfish.jaxb:jaxb-runtime +%mvn_alias com.sun.xml.bind:jaxb-jxc org.glassfish.jaxb:jaxb-jxc %build - -# Build the binaries: -ant \ - -Dbuild.sysclasspath=last \ - -Dbuild.number=1 \ - dist - -# Build the javadoc for the runtime and the compiler: -ant \ - -Dbuild.sysclasspath=last \ - -f build-javadoc.xml - +%mvn_build -f -i -- -Ddev %install -%mvn_artifact jaxb-impl.pom dist/lib/jaxb-impl.jar -%mvn_artifact jaxb-xjc.pom dist/lib/jaxb-xjc.jar +%mvn_artifact boms/bom/pom.xml +%mvn_artifact boms/bom-ext/pom.xml +%mvn_artifact pom.xml +%mvn_artifact bundles/pom.xml +%mvn_artifact bundles/runtime/pom.xml bundles/runtime/target/jaxb-impl-%{version}.jar +%mvn_artifact bundles/jxc/pom.xml bundles/jxc/target/jaxb-jxc-%{version}.jar -%mvn_install -J apidocs/ +%mvn_install %files -f .mfiles -%doc License.txt -%doc License.html - +%doc License.txt licenceheader.txt License.html %files javadoc -f .mfiles-javadoc -%doc License.txt -%doc License.html +%doc License.txt licenceheader.txt License.html %changelog +* Mon Jan 19 2015 Michal Srb - 2.2.11-1 +- Update to upstream version 2.2.11 + * Mon Oct 27 2014 Michal Srb - 2.2.5-8 - Fix FTBFS (Resolves: rhbz#1106636) - Adapt to current packaging guidelines diff --git a/jaxb-impl-2.2.5.pom b/jaxb-impl-2.2.5.pom deleted file mode 100644 index 05d66e6..0000000 --- a/jaxb-impl-2.2.5.pom +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - net.java - jvnet-parent - 1 - - - 4.0.0 - com.sun.xml.bind - jaxb-impl - 2.2.5 - jar - - JAXB Reference Implementation - JAXB (JSR 222) Reference Implementation - 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/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri - scm:svn:https://svn.java.net/svn/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri - http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri - - - - - - javax.xml.bind - jaxb-api - 2.2.6 - - - com.sun.istack - istack-commons-runtime - 2.6.1 - - - com.sun.xml.fastinfoset - FastInfoset - 1.2.12 - - - - - diff --git a/jaxb-xjc-2.2.5.pom b/jaxb-xjc-2.2.5.pom deleted file mode 100644 index c2fd8aa..0000000 --- a/jaxb-xjc-2.2.5.pom +++ /dev/null @@ -1,104 +0,0 @@ - - - - - - - net.java - jvnet-parent - 1 - - - 4.0.0 - com.sun.xml.bind - jaxb-xjc - 2.2.5 - jar - - JAXB XJC - JAXB (JSR 222) reference implementation - Schema compiler - 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/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri - scm:svn:https://svn.java.net/svn/jaxb~version2/branches/jaxb-2_2-branch/jaxb-ri - http://java.net/projects/jaxb/sources/version2/show/branches/jaxb-2_2-branch/jaxb-ri - - - - - - com.sun.xml.bind - jaxb-impl - 2.2.5 - - - - - diff --git a/sources b/sources index 499c3b9..a1b8830 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -141e9f0e9c8fc76b263898627e627131 glassfish-jaxb-2.2.5.tar.gz +bed496dd96e5b9efc4539fc5bdb69c69 jaxb-ri-2.2.11.src.zip From a0175266f42e8b90258254ed200e5976d2da28d2 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 20 Jan 2015 08:27:59 +0100 Subject: [PATCH 12/36] Regenerate BR; install everything except bundles --- glassfish-jaxb.spec | 59 +++++++++++++++++++-------------------------- 1 file changed, 25 insertions(+), 34 deletions(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 00edc68..de00cd9 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -9,26 +9,27 @@ URL: http://jaxb.java.net Source0: https://jaxb.java.net/%{version}/jaxb-ri-%{version}.src.zip BuildRequires: maven-local -BuildRequires: codemodel -BuildRequires: istack-commons -BuildRequires: relaxngcc -BuildRequires: xml-commons-resolver -BuildRequires: txw2 -BuildRequires: relaxngDatatype -BuildRequires: glassfish-dtd-parser -BuildRequires: glassfish-jaxb-api -BuildRequires: glassfish-fastinfoset -BuildRequires: jing -BuildRequires: stax-ex -BuildRequires: isorelax -BuildRequires: xsom -BuildRequires: rngom -BuildRequires: javaparser -BuildRequires: args4j -BuildRequires: args4j-tools -BuildRequires: maven-site-plugin -BuildRequires: maven-dependency-plugin -BuildRequires: maven-shade-plugin +BuildRequires: mvn(args4j:args4j) +BuildRequires: mvn(com.google.code.javaparser:javaparser) +BuildRequires: mvn(com.sun.istack:istack-commons-runtime) +BuildRequires: mvn(com.sun.istack:istack-commons-tools) +BuildRequires: mvn(com.sun:tools) +BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser) +BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) +BuildRequires: mvn(com.sun.xsom:xsom) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(net.java.dev.msv:msv-core) +BuildRequires: mvn(net.java:jvnet-parent:pom:) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-deploy-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin) +BuildRequires: mvn(org.jvnet.staxex:stax-ex) +BuildRequires: mvn(relaxngDatatype:relaxngDatatype) +BuildRequires: mvn(xmlunit:xmlunit) BuildArch: noarch @@ -43,9 +44,9 @@ This package contains the API documentation for %{name}. %prep %setup -q -c - # uses very old args4j %pom_disable_module compiler txw +%pom_disable_module bundles %pom_remove_dep com.sun:tools %pom_add_dep_mgmt com.sun:tools @@ -58,23 +59,13 @@ This package contains the API documentation for %{name}. %pom_remove_plugin :gfnexus-maven-plugin %pom_remove_plugin :maven-site-plugin -%pom_remove_dep org.glassfish.jaxb:jaxb-runtime bundles/runtime -%pom_remove_dep org.glassfish.jaxb:jaxb-jxc bundles/jxc - -%mvn_alias com.sun.xml.bind:jaxb-impl org.glassfish.jaxb:jaxb-runtime -%mvn_alias com.sun.xml.bind:jaxb-jxc org.glassfish.jaxb:jaxb-jxc +%mvn_alias org.glassfish.jaxb:jaxb-runtime "com.sun.xml.bind:jaxb-impl" +%mvn_alias org.glassfish.jaxb:jaxb-xjc "com.sun.xml.bind:jaxb-xjc" %build -%mvn_build -f -i -- -Ddev +%mvn_build -f -- -Ddev %install -%mvn_artifact boms/bom/pom.xml -%mvn_artifact boms/bom-ext/pom.xml -%mvn_artifact pom.xml -%mvn_artifact bundles/pom.xml -%mvn_artifact bundles/runtime/pom.xml bundles/runtime/target/jaxb-impl-%{version}.jar -%mvn_artifact bundles/jxc/pom.xml bundles/jxc/target/jaxb-jxc-%{version}.jar - %mvn_install %files -f .mfiles From 653ae1c7048eac1cee2686833c848cab42070b98 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Tue, 20 Jan 2015 09:18:30 +0100 Subject: [PATCH 13/36] Add missing BR: javax.xml.bind:jaxb-api --- glassfish-jaxb.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index de00cd9..6d2391d 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -17,6 +17,7 @@ BuildRequires: mvn(com.sun:tools) BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser) BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) BuildRequires: mvn(com.sun.xsom:xsom) +BuildRequires: mvn(javax.xml.bind:jaxb-api) BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.java.dev.msv:msv-core) BuildRequires: mvn(net.java:jvnet-parent:pom:) From 2819a7d61caf034e4e127fafb4ffa0222adcf5a7 Mon Sep 17 00:00:00 2001 From: Michal Srb Date: Fri, 20 Mar 2015 15:49:18 +0100 Subject: [PATCH 14/36] Split into subpackages (Resolves: rhbz#1204187) --- glassfish-jaxb.spec | 193 ++++++++++++++++++++++++++++++++++++++++++-- txw2-args4j.patch | 147 +++++++++++++++++++++++++++++++++ 2 files changed, 335 insertions(+), 5 deletions(-) create mode 100644 txw2-args4j.patch diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 6d2391d..35e926f 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,12 +1,13 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 1%{?dist} +Release: 2%{?dist} Summary: JAXB Reference Implementation License: CDDL and GPLv2 with exceptions URL: http://jaxb.java.net Source0: https://jaxb.java.net/%{version}/jaxb-ri-%{version}.src.zip +Patch0: txw2-args4j.patch BuildRequires: maven-local BuildRequires: mvn(args4j:args4j) @@ -32,11 +33,137 @@ BuildRequires: mvn(org.jvnet.staxex:stax-ex) BuildRequires: mvn(relaxngDatatype:relaxngDatatype) BuildRequires: mvn(xmlunit:xmlunit) +Requires: glassfish-jaxb1-impl = %{version}-%{release} +Requires: %{name}-bom = %{version}-%{release} +Requires: %{name}-bom-ext = %{version}-%{release} +Requires: %{name}-codemodel = %{version}-%{release} +Requires: %{name}-codemodel-annotation-compiler = %{version}-%{release} +Requires: %{name}-codemodel-parent = %{version}-%{release} +Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-external-parent = %{version}-%{release} +Requires: %{name}-jxc = %{version}-%{release} +Requires: %{name}-parent = %{version}-%{release} +Requires: %{name}-rngom = %{version}-%{release} +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-runtime-parent = %{version}-%{release} +Requires: %{name}-txw2 = %{version}-%{release} +Requires: %{name}-txwc2 = %{version}-%{release} +Requires: %{name}-txw-parent = %{version}-%{release} +Requires: %{name}-xjc = %{version}-%{release} + BuildArch: noarch %description GlassFish JAXB Reference Implementation. +%package codemodel +Summary: Codemodel Core + +%description codemodel +The core functionality of the CodeModel java source code generation +library. + +%package codemodel-annotation-compiler +Summary: Codemodel Annotation Compiler + +%description codemodel-annotation-compiler +The annotation compiler ant task for the CodeModel java source code +generation library. + +%package -n glassfish-jaxb1-impl +Summary: JAXB1 Runtime + +%description -n glassfish-jaxb1-impl +Runtime classes for JAXB1 runtime implementation. + +%package bom +Summary: JAXB BOM + +%description bom +JAXB Bill of Materials (BOM) + +%package bom-ext +Summary: JAXB BOM with all dependencies + +%description bom-ext +JAXB Bill of Materials (BOM) with all dependencies. + +%package codemodel-parent +Summary: Codemodel parent POM + +%description codemodel-parent +This package contains codemodel parent POM. + +%package core +Summary: JAXB Core + +%description core +JAXB Core module. Contains sources required by XJC, JXC and Runtime +modules. + +%package external-parent +Summary: JAXB External parent POM + +%description external-parent +JAXB External parent POM. + +%package jxc +Summary: JAXB schema generator + +%description jxc +The tool to generate XML schema based on java classes. + +%package parent +Summary: JAXB parent POM + +%description parent +This package contains parent POM. + +%package runtime +Summary: JAXB Runtime + +%description runtime +JAXB (JSR 222) Reference Implementation + +%package runtime-parent +Summary: JAXB Runtime parent POM + +%description runtime-parent +This package contains Runtime parent POM. + +%package txw-parent +Summary: JAXB TXW parent POM + +%description txw-parent +This package contains TXW parent POM. + +%package xjc +Summary: JAXB XJC + +%description xjc +JAXB Binding Compiler. Contains source code needed for binding +customization files into java sources. In other words: the tool to +generate java classes for the given xml representation. + +%package rngom +Summary: RELAX NG Object Model/Parser + +%description rngom +This package contains RELAX NG Object Model/Parser. + +%package txw2 +Summary: TXW2 Runtime + +%description txw2 +TXW is a library that allows you to write XML documents. + +%package txwc2 +Summary: TXW2 Compiler + +%description txwc2 +JAXB schema generator. The tool to generate XML schema based on java +classes. + %package javadoc Summary: Javadocs for %{name} @@ -45,8 +172,9 @@ This package contains the API documentation for %{name}. %prep %setup -q -c -# uses very old args4j -%pom_disable_module compiler txw + +%patch0 -p1 + %pom_disable_module bundles %pom_remove_dep com.sun:tools @@ -64,12 +192,64 @@ This package contains the API documentation for %{name}. %mvn_alias org.glassfish.jaxb:jaxb-xjc "com.sun.xml.bind:jaxb-xjc" %build -%mvn_build -f -- -Ddev +%mvn_build -f -s -- -Ddev %install %mvn_install -%files -f .mfiles +%files +%doc License.txt licenceheader.txt License.html + +%files codemodel -f .mfiles-codemodel +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files codemodel-annotation-compiler -f .mfiles-codemodel-annotation-compiler +%dir %{_javadir}/%{name} + +%files -n glassfish-jaxb1-impl -f .mfiles-jaxb1-impl +%dir %{_javadir}/%{name} + +%files bom -f .mfiles-jaxb-bom +%doc License.txt licenceheader.txt License.html + +%files bom-ext -f .mfiles-jaxb-bom-ext + +%files codemodel-parent -f .mfiles-jaxb-codemodel-parent + +%files core -f .mfiles-jaxb-core +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files external-parent -f .mfiles-jaxb-external-parent + +%files jxc -f .mfiles-jaxb-jxc +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files parent -f .mfiles-jaxb-parent + +%files runtime -f .mfiles-jaxb-runtime +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files runtime-parent -f .mfiles-jaxb-runtime-parent + +%files txw-parent -f .mfiles-jaxb-txw-parent + +%files xjc -f .mfiles-jaxb-xjc +%dir %{_javadir}/%{name} + +%files rngom -f .mfiles-rngom +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files txw2 -f .mfiles-txw2 +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files txwc2 -f .mfiles-txwc2 +%dir %{_javadir}/%{name} %doc License.txt licenceheader.txt License.html %files javadoc -f .mfiles-javadoc @@ -77,6 +257,9 @@ This package contains the API documentation for %{name}. %changelog +* Fri Mar 20 2015 Michal Srb - 2.2.11-2 +- Split into subpackages (Resolves: rhbz#1204187) + * Mon Jan 19 2015 Michal Srb - 2.2.11-1 - Update to upstream version 2.2.11 diff --git a/txw2-args4j.patch b/txw2-args4j.patch new file mode 100644 index 0000000..df71f86 --- /dev/null +++ b/txw2-args4j.patch @@ -0,0 +1,147 @@ +diff --git a/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java b/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java +index 3c8cc84..3f1a092 100644 +--- a/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java ++++ b/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java +@@ -43,10 +43,10 @@ package com.sun.tools.txw2; + import com.sun.codemodel.writer.FileCodeWriter; + import com.sun.codemodel.writer.SingleStreamCodeWriter; + import com.sun.tools.txw2.model.NodeSet; ++import org.kohsuke.args4j.Argument; ++import org.kohsuke.args4j.Option; + import org.kohsuke.args4j.CmdLineException; + import org.kohsuke.args4j.CmdLineParser; +-import org.kohsuke.args4j.opts.BooleanOption; +-import org.kohsuke.args4j.opts.StringOption; + import org.kohsuke.rngom.parse.IllegalSchemaException; + import org.kohsuke.rngom.parse.Parseable; + import org.kohsuke.rngom.parse.compact.CompactParseable; +@@ -60,6 +60,8 @@ import java.io.File; + import java.io.IOException; + import java.net.MalformedURLException; + import java.util.Properties; ++import java.util.List; ++import java.util.ArrayList; + + /** + * Programatic entry point to the TXW compiler. +@@ -73,26 +75,39 @@ public class Main { + this.opts = opts; + } + +- public static void main(String[] args) { +- System.exit(run(args)); ++ public static class Options { ++ @Argument ++ public List arguments = new ArrayList(); ++ ++ @Option(name="-o") ++ public String output; ++ ++ @Option(name="-p") ++ public String pkg; ++ ++ @Option(name="-c") ++ public boolean compact; ++ ++ @Option(name="-x") ++ public boolean xml; ++ ++ @Option(name="-xsd") ++ public boolean xsd; ++ ++ @Option(name="-h") ++ public boolean chain; + } + +- public static class Options { +- public StringOption output = new StringOption("-o"); +- public StringOption pkg = new StringOption("-p"); +- public BooleanOption compact = new BooleanOption("-c"); +- public BooleanOption xml = new BooleanOption("-x"); +- public BooleanOption xsd = new BooleanOption("-xsd"); +- public BooleanOption chain = new BooleanOption("-h"); ++ public static void main(String[] args) { ++ System.exit(run(args)); + } + + public static int run(String[] args) { + Options opts = new Options(); +- CmdLineParser parser = new CmdLineParser(); +- parser.addOptionClass(opts); ++ CmdLineParser parser = new CmdLineParser(opts); + + try { +- parser.parse(args); ++ parser.parseArgument(args); + } catch (CmdLineException e) { + System.out.println(e.getMessage()); + printUsage(); +@@ -102,9 +117,9 @@ public class Main { + TxwOptions topts = new TxwOptions(); + topts.errorListener = new ConsoleErrorReporter(System.out); + +- if(opts.output.value!=null) { ++ if(opts.output != null) { + try { +- topts.codeWriter = new FileCodeWriter(new File(opts.output.value)); ++ topts.codeWriter = new FileCodeWriter(new File(opts.output)); + } catch( IOException e ) { + System.out.println(e.getMessage()); + printUsage(); +@@ -114,12 +129,12 @@ public class Main { + topts.codeWriter = new SingleStreamCodeWriter(System.out); + } + +- if(opts.chain.isOn()) { ++ if(opts.chain) { + topts.chainMethod = true; + } + +- if(opts.pkg.value!=null) { +- topts._package = topts.codeModel._package(opts.pkg.value); ++ if(opts.pkg != null) { ++ topts._package = topts.codeModel._package(opts.pkg); + } else { + topts._package = topts.codeModel.rootPackage(); + } +@@ -146,21 +161,21 @@ public class Main { + * out of the specified schema file. + */ + private static SchemaBuilder makeSourceSchema(CmdLineParser parser, Options opts, ErrorHandler eh) throws MalformedURLException { +- File f = new File((String)parser.getArguments().get(0)); ++ File f = new File(opts.arguments.get(0)); + final InputSource in = new InputSource(f.toURL().toExternalForm()); + +- if(opts.xsd.isOff() && opts.xml.isOff() && opts.compact.isOff()) { ++ if(!opts.xsd && !opts.xml && !opts.compact) { + // auto detect + if(in.getSystemId().endsWith(".rnc")) +- opts.compact.value=true; ++ opts.compact = true; + else + if(in.getSystemId().endsWith(".rng")) +- opts.xml.value=true; ++ opts.xml = true; + else +- opts.xsd.value=true; ++ opts.xsd = true; + } + +- if(opts.xsd.isOn()) ++ if(opts.xsd) + return new XmlSchemaLoader(in); + + final Parseable parseable = makeRELAXNGSource(opts, in, eh, f); +@@ -169,10 +184,10 @@ public class Main { + } + + private static Parseable makeRELAXNGSource(Options opts, final InputSource in, ErrorHandler eh, File f) { +- if(opts.compact.isOn()) ++ if(opts.compact) + return new CompactParseable(in,eh); + +- if(opts.xml.isOn()) ++ if(opts.xml) + return new SAXParseable(in,eh); + + // otherwise sniff from the file extension From 427b4b88847dbf01c22e01f80d4427854761c38d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 08:23:10 +0000 Subject: [PATCH 15/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 35e926f..53c1c69 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 2%{?dist} +Release: 3%{?dist} Summary: JAXB Reference Implementation License: CDDL and GPLv2 with exceptions @@ -257,6 +257,9 @@ This package contains the API documentation for %{name}. %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 2.2.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Fri Mar 20 2015 Michal Srb - 2.2.11-2 - Split into subpackages (Resolves: rhbz#1204187) From f5a152f07e6397aa3c024e30c1741e90e669fad2 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 22:01:29 +0000 Subject: [PATCH 16/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 53c1c69..f62dc1e 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 3%{?dist} +Release: 4%{?dist} Summary: JAXB Reference Implementation License: CDDL and GPLv2 with exceptions @@ -257,6 +257,9 @@ This package contains the API documentation for %{name}. %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 2.2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Wed Jun 17 2015 Fedora Release Engineering - 2.2.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild From cf27d2b75fce3e31a6a3e1fcf35cbbb6ce02ddab Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 11:04:52 +0000 Subject: [PATCH 17/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index f62dc1e..126dbbf 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 4%{?dist} +Release: 5%{?dist} Summary: JAXB Reference Implementation License: CDDL and GPLv2 with exceptions @@ -257,6 +257,9 @@ This package contains the API documentation for %{name}. %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 2.2.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Wed Feb 03 2016 Fedora Release Engineering - 2.2.11-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild From a61af9a53638e34c54f77e19c464c42d04fa5025 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 10:16:58 +0000 Subject: [PATCH 18/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 126dbbf..f0f686a 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 5%{?dist} +Release: 6%{?dist} Summary: JAXB Reference Implementation License: CDDL and GPLv2 with exceptions @@ -257,6 +257,9 @@ This package contains the API documentation for %{name}. %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 2.2.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Fri Feb 10 2017 Fedora Release Engineering - 2.2.11-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild From e6b5828b66fd5d1d0ca7318efd25d8551fbe3902 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Thu, 9 Nov 2017 15:03:23 +0200 Subject: [PATCH 19/36] Specify CDDL license version --- glassfish-jaxb.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index f0f686a..cd7b0c2 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,9 +1,9 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 6%{?dist} +Release: 7%{?dist} Summary: JAXB Reference Implementation -License: CDDL and GPLv2 with exceptions +License: CDDL-1.1 and GPLv2 with exceptions URL: http://jaxb.java.net Source0: https://jaxb.java.net/%{version}/jaxb-ri-%{version}.src.zip @@ -257,6 +257,9 @@ This package contains the API documentation for %{name}. %changelog +* Thu Nov 09 2017 Michael Simacek - 2.2.11-7 +- Specify CDDL license version + * Wed Jul 26 2017 Fedora Release Engineering - 2.2.11-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From b74817e0740ee4cf1c0a89a2a3e23d480e590299 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 7 Feb 2018 12:44:47 +0000 Subject: [PATCH 20/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index cd7b0c2..5ede5b2 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 7%{?dist} +Release: 8%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -257,6 +257,9 @@ This package contains the API documentation for %{name}. %changelog +* Wed Feb 07 2018 Fedora Release Engineering - 2.2.11-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + * Thu Nov 09 2017 Michael Simacek - 2.2.11-7 - Specify CDDL license version From 2a115d8e2d008a84f7be62df0eb616415d375924 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Fri, 25 May 2018 10:39:49 +0200 Subject: [PATCH 21/36] Reduce build deps --- glassfish-jaxb.spec | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 5ede5b2..e67b9d8 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 8%{?dist} +Release: 9%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -11,7 +11,6 @@ Patch0: txw2-args4j.patch BuildRequires: maven-local BuildRequires: mvn(args4j:args4j) -BuildRequires: mvn(com.google.code.javaparser:javaparser) BuildRequires: mvn(com.sun.istack:istack-commons-runtime) BuildRequires: mvn(com.sun.istack:istack-commons-tools) BuildRequires: mvn(com.sun:tools) @@ -19,19 +18,15 @@ BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser) BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) BuildRequires: mvn(com.sun.xsom:xsom) BuildRequires: mvn(javax.xml.bind:jaxb-api) -BuildRequires: mvn(junit:junit) BuildRequires: mvn(net.java.dev.msv:msv-core) BuildRequires: mvn(net.java:jvnet-parent:pom:) BuildRequires: mvn(org.apache.ant:ant) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-deploy-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin) BuildRequires: mvn(org.jvnet.staxex:stax-ex) BuildRequires: mvn(relaxngDatatype:relaxngDatatype) -BuildRequires: mvn(xmlunit:xmlunit) Requires: glassfish-jaxb1-impl = %{version}-%{release} Requires: %{name}-bom = %{version}-%{release} @@ -187,12 +182,13 @@ This package contains the API documentation for %{name}. %pom_remove_plugin :gfnexus-maven-plugin %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :buildnumber-maven-plugin %mvn_alias org.glassfish.jaxb:jaxb-runtime "com.sun.xml.bind:jaxb-impl" %mvn_alias org.glassfish.jaxb:jaxb-xjc "com.sun.xml.bind:jaxb-xjc" %build -%mvn_build -f -s -- -Ddev +%mvn_build -f -s -- -Ddev -DbuildNumber=unknown %install %mvn_install @@ -257,6 +253,9 @@ This package contains the API documentation for %{name}. %changelog +* Fri May 25 2018 Michael Simacek - 2.2.11-9 +- Reduce build deps + * Wed Feb 07 2018 Fedora Release Engineering - 2.2.11-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 5b5af0704fa76fb5a6000a12f4b6de4a0fb76148 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 02:31:20 +0000 Subject: [PATCH 22/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index e67b9d8..a6b9f0f 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 9%{?dist} +Release: 10%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -253,6 +253,9 @@ This package contains the API documentation for %{name}. %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 2.2.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri May 25 2018 Michael Simacek - 2.2.11-9 - Reduce build deps From 08607dc7c2406174a9682f1c4d8ee3ae575045cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 31 Jan 2019 22:36:08 +0000 Subject: [PATCH 23/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index a6b9f0f..85dbc70 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 10%{?dist} +Release: 11%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -253,6 +253,9 @@ This package contains the API documentation for %{name}. %changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.2.11-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Jul 13 2018 Fedora Release Engineering - 2.2.11-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From db8edccc5c49690f252e2f5a07489d7093f4395c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 1 Apr 2019 23:13:37 +0200 Subject: [PATCH 24/36] Orphaned for 6+ weeks --- .gitignore | 2 - dead.package | 1 + glassfish-jaxb.spec | 327 -------------------------------------------- sources | 1 - txw2-args4j.patch | 147 -------------------- 5 files changed, 1 insertion(+), 477 deletions(-) delete mode 100644 .gitignore create mode 100644 dead.package delete mode 100644 glassfish-jaxb.spec delete mode 100644 sources delete mode 100644 txw2-args4j.patch diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 621ee41..0000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -/glassfish-jaxb-2.2.5.tar.gz -/jaxb-ri-2.2.11.src.zip diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..5204a84 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +Orphaned for 6+ weeks diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec deleted file mode 100644 index 85dbc70..0000000 --- a/glassfish-jaxb.spec +++ /dev/null @@ -1,327 +0,0 @@ -Name: glassfish-jaxb -Version: 2.2.11 -Release: 11%{?dist} -Summary: JAXB Reference Implementation - -License: CDDL-1.1 and GPLv2 with exceptions -URL: http://jaxb.java.net - -Source0: https://jaxb.java.net/%{version}/jaxb-ri-%{version}.src.zip -Patch0: txw2-args4j.patch - -BuildRequires: maven-local -BuildRequires: mvn(args4j:args4j) -BuildRequires: mvn(com.sun.istack:istack-commons-runtime) -BuildRequires: mvn(com.sun.istack:istack-commons-tools) -BuildRequires: mvn(com.sun:tools) -BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser) -BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) -BuildRequires: mvn(com.sun.xsom:xsom) -BuildRequires: mvn(javax.xml.bind:jaxb-api) -BuildRequires: mvn(net.java.dev.msv:msv-core) -BuildRequires: mvn(net.java:jvnet-parent:pom:) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -BuildRequires: mvn(org.jvnet.staxex:stax-ex) -BuildRequires: mvn(relaxngDatatype:relaxngDatatype) - -Requires: glassfish-jaxb1-impl = %{version}-%{release} -Requires: %{name}-bom = %{version}-%{release} -Requires: %{name}-bom-ext = %{version}-%{release} -Requires: %{name}-codemodel = %{version}-%{release} -Requires: %{name}-codemodel-annotation-compiler = %{version}-%{release} -Requires: %{name}-codemodel-parent = %{version}-%{release} -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-external-parent = %{version}-%{release} -Requires: %{name}-jxc = %{version}-%{release} -Requires: %{name}-parent = %{version}-%{release} -Requires: %{name}-rngom = %{version}-%{release} -Requires: %{name}-runtime = %{version}-%{release} -Requires: %{name}-runtime-parent = %{version}-%{release} -Requires: %{name}-txw2 = %{version}-%{release} -Requires: %{name}-txwc2 = %{version}-%{release} -Requires: %{name}-txw-parent = %{version}-%{release} -Requires: %{name}-xjc = %{version}-%{release} - -BuildArch: noarch - -%description -GlassFish JAXB Reference Implementation. - -%package codemodel -Summary: Codemodel Core - -%description codemodel -The core functionality of the CodeModel java source code generation -library. - -%package codemodel-annotation-compiler -Summary: Codemodel Annotation Compiler - -%description codemodel-annotation-compiler -The annotation compiler ant task for the CodeModel java source code -generation library. - -%package -n glassfish-jaxb1-impl -Summary: JAXB1 Runtime - -%description -n glassfish-jaxb1-impl -Runtime classes for JAXB1 runtime implementation. - -%package bom -Summary: JAXB BOM - -%description bom -JAXB Bill of Materials (BOM) - -%package bom-ext -Summary: JAXB BOM with all dependencies - -%description bom-ext -JAXB Bill of Materials (BOM) with all dependencies. - -%package codemodel-parent -Summary: Codemodel parent POM - -%description codemodel-parent -This package contains codemodel parent POM. - -%package core -Summary: JAXB Core - -%description core -JAXB Core module. Contains sources required by XJC, JXC and Runtime -modules. - -%package external-parent -Summary: JAXB External parent POM - -%description external-parent -JAXB External parent POM. - -%package jxc -Summary: JAXB schema generator - -%description jxc -The tool to generate XML schema based on java classes. - -%package parent -Summary: JAXB parent POM - -%description parent -This package contains parent POM. - -%package runtime -Summary: JAXB Runtime - -%description runtime -JAXB (JSR 222) Reference Implementation - -%package runtime-parent -Summary: JAXB Runtime parent POM - -%description runtime-parent -This package contains Runtime parent POM. - -%package txw-parent -Summary: JAXB TXW parent POM - -%description txw-parent -This package contains TXW parent POM. - -%package xjc -Summary: JAXB XJC - -%description xjc -JAXB Binding Compiler. Contains source code needed for binding -customization files into java sources. In other words: the tool to -generate java classes for the given xml representation. - -%package rngom -Summary: RELAX NG Object Model/Parser - -%description rngom -This package contains RELAX NG Object Model/Parser. - -%package txw2 -Summary: TXW2 Runtime - -%description txw2 -TXW is a library that allows you to write XML documents. - -%package txwc2 -Summary: TXW2 Compiler - -%description txwc2 -JAXB schema generator. The tool to generate XML schema based on java -classes. - -%package javadoc -Summary: Javadocs for %{name} - -%description javadoc -This package contains the API documentation for %{name}. - -%prep -%setup -q -c - -%patch0 -p1 - -%pom_disable_module bundles - -%pom_remove_dep com.sun:tools -%pom_add_dep_mgmt com.sun:tools -%pom_remove_dep com.sun:tools jxc -%pom_add_dep com.sun:tools jxc - -%pom_remove_dep com.sun.xml.bind:jaxb-release-documentation bundles/ri -%pom_remove_dep com.sun.xml.bind:jaxb-samples bundles/ri - -%pom_remove_plugin :gfnexus-maven-plugin -%pom_remove_plugin :maven-site-plugin -%pom_remove_plugin :buildnumber-maven-plugin - -%mvn_alias org.glassfish.jaxb:jaxb-runtime "com.sun.xml.bind:jaxb-impl" -%mvn_alias org.glassfish.jaxb:jaxb-xjc "com.sun.xml.bind:jaxb-xjc" - -%build -%mvn_build -f -s -- -Ddev -DbuildNumber=unknown - -%install -%mvn_install - -%files -%doc License.txt licenceheader.txt License.html - -%files codemodel -f .mfiles-codemodel -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files codemodel-annotation-compiler -f .mfiles-codemodel-annotation-compiler -%dir %{_javadir}/%{name} - -%files -n glassfish-jaxb1-impl -f .mfiles-jaxb1-impl -%dir %{_javadir}/%{name} - -%files bom -f .mfiles-jaxb-bom -%doc License.txt licenceheader.txt License.html - -%files bom-ext -f .mfiles-jaxb-bom-ext - -%files codemodel-parent -f .mfiles-jaxb-codemodel-parent - -%files core -f .mfiles-jaxb-core -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files external-parent -f .mfiles-jaxb-external-parent - -%files jxc -f .mfiles-jaxb-jxc -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files parent -f .mfiles-jaxb-parent - -%files runtime -f .mfiles-jaxb-runtime -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files runtime-parent -f .mfiles-jaxb-runtime-parent - -%files txw-parent -f .mfiles-jaxb-txw-parent - -%files xjc -f .mfiles-jaxb-xjc -%dir %{_javadir}/%{name} - -%files rngom -f .mfiles-rngom -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files txw2 -f .mfiles-txw2 -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files txwc2 -f .mfiles-txwc2 -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html - -%files javadoc -f .mfiles-javadoc -%doc License.txt licenceheader.txt License.html - - -%changelog -* Thu Jan 31 2019 Fedora Release Engineering - 2.2.11-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2.2.11-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri May 25 2018 Michael Simacek - 2.2.11-9 -- Reduce build deps - -* Wed Feb 07 2018 Fedora Release Engineering - 2.2.11-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Nov 09 2017 Michael Simacek - 2.2.11-7 -- Specify CDDL license version - -* Wed Jul 26 2017 Fedora Release Engineering - 2.2.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.2.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 2.2.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 2.2.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Mar 20 2015 Michal Srb - 2.2.11-2 -- Split into subpackages (Resolves: rhbz#1204187) - -* Mon Jan 19 2015 Michal Srb - 2.2.11-1 -- Update to upstream version 2.2.11 - -* Mon Oct 27 2014 Michal Srb - 2.2.5-8 -- Fix FTBFS (Resolves: rhbz#1106636) -- Adapt to current packaging guidelines -- Remove R, add BR: javapackages-local (for %%mvn_artifact macro) - -* Sat Jun 07 2014 Fedora Release Engineering - 2.2.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 2.2.5-6 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Aug 03 2013 Fedora Release Engineering - 2.2.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 2.2.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 2.2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Mar 13 2012 Juan Hernandez 2.2.5-2 -- Add missing xsom and rngom dependencies to the POM files - -* Sat Mar 10 2012 Juan Hernandez 2.2.5-1 -- Updated to upstream version 2.2.5 -- Removed classpath from manifest files - -* Wed Mar 7 2012 Juan Hernandez 2.2.4u1-4 -- Updated to reflect the change from glassfish-fi to glassfish-fastinfoset - -* Wed Feb 22 2012 Juan Hernandez 2.2.4u1-3 -- Updated to reflect the changes of the jar names in txw2 - -* Wed Feb 22 2012 Juan Hernandez 2.2.4u1-2 -- Cleanup of the spec file - -* Sat Jan 21 2012 Marek Goldmann 2.2.4u1-1 -- Initial packaging - diff --git a/sources b/sources deleted file mode 100644 index a1b8830..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -bed496dd96e5b9efc4539fc5bdb69c69 jaxb-ri-2.2.11.src.zip diff --git a/txw2-args4j.patch b/txw2-args4j.patch deleted file mode 100644 index df71f86..0000000 --- a/txw2-args4j.patch +++ /dev/null @@ -1,147 +0,0 @@ -diff --git a/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java b/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java -index 3c8cc84..3f1a092 100644 ---- a/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java -+++ b/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java -@@ -43,10 +43,10 @@ package com.sun.tools.txw2; - import com.sun.codemodel.writer.FileCodeWriter; - import com.sun.codemodel.writer.SingleStreamCodeWriter; - import com.sun.tools.txw2.model.NodeSet; -+import org.kohsuke.args4j.Argument; -+import org.kohsuke.args4j.Option; - import org.kohsuke.args4j.CmdLineException; - import org.kohsuke.args4j.CmdLineParser; --import org.kohsuke.args4j.opts.BooleanOption; --import org.kohsuke.args4j.opts.StringOption; - import org.kohsuke.rngom.parse.IllegalSchemaException; - import org.kohsuke.rngom.parse.Parseable; - import org.kohsuke.rngom.parse.compact.CompactParseable; -@@ -60,6 +60,8 @@ import java.io.File; - import java.io.IOException; - import java.net.MalformedURLException; - import java.util.Properties; -+import java.util.List; -+import java.util.ArrayList; - - /** - * Programatic entry point to the TXW compiler. -@@ -73,26 +75,39 @@ public class Main { - this.opts = opts; - } - -- public static void main(String[] args) { -- System.exit(run(args)); -+ public static class Options { -+ @Argument -+ public List arguments = new ArrayList(); -+ -+ @Option(name="-o") -+ public String output; -+ -+ @Option(name="-p") -+ public String pkg; -+ -+ @Option(name="-c") -+ public boolean compact; -+ -+ @Option(name="-x") -+ public boolean xml; -+ -+ @Option(name="-xsd") -+ public boolean xsd; -+ -+ @Option(name="-h") -+ public boolean chain; - } - -- public static class Options { -- public StringOption output = new StringOption("-o"); -- public StringOption pkg = new StringOption("-p"); -- public BooleanOption compact = new BooleanOption("-c"); -- public BooleanOption xml = new BooleanOption("-x"); -- public BooleanOption xsd = new BooleanOption("-xsd"); -- public BooleanOption chain = new BooleanOption("-h"); -+ public static void main(String[] args) { -+ System.exit(run(args)); - } - - public static int run(String[] args) { - Options opts = new Options(); -- CmdLineParser parser = new CmdLineParser(); -- parser.addOptionClass(opts); -+ CmdLineParser parser = new CmdLineParser(opts); - - try { -- parser.parse(args); -+ parser.parseArgument(args); - } catch (CmdLineException e) { - System.out.println(e.getMessage()); - printUsage(); -@@ -102,9 +117,9 @@ public class Main { - TxwOptions topts = new TxwOptions(); - topts.errorListener = new ConsoleErrorReporter(System.out); - -- if(opts.output.value!=null) { -+ if(opts.output != null) { - try { -- topts.codeWriter = new FileCodeWriter(new File(opts.output.value)); -+ topts.codeWriter = new FileCodeWriter(new File(opts.output)); - } catch( IOException e ) { - System.out.println(e.getMessage()); - printUsage(); -@@ -114,12 +129,12 @@ public class Main { - topts.codeWriter = new SingleStreamCodeWriter(System.out); - } - -- if(opts.chain.isOn()) { -+ if(opts.chain) { - topts.chainMethod = true; - } - -- if(opts.pkg.value!=null) { -- topts._package = topts.codeModel._package(opts.pkg.value); -+ if(opts.pkg != null) { -+ topts._package = topts.codeModel._package(opts.pkg); - } else { - topts._package = topts.codeModel.rootPackage(); - } -@@ -146,21 +161,21 @@ public class Main { - * out of the specified schema file. - */ - private static SchemaBuilder makeSourceSchema(CmdLineParser parser, Options opts, ErrorHandler eh) throws MalformedURLException { -- File f = new File((String)parser.getArguments().get(0)); -+ File f = new File(opts.arguments.get(0)); - final InputSource in = new InputSource(f.toURL().toExternalForm()); - -- if(opts.xsd.isOff() && opts.xml.isOff() && opts.compact.isOff()) { -+ if(!opts.xsd && !opts.xml && !opts.compact) { - // auto detect - if(in.getSystemId().endsWith(".rnc")) -- opts.compact.value=true; -+ opts.compact = true; - else - if(in.getSystemId().endsWith(".rng")) -- opts.xml.value=true; -+ opts.xml = true; - else -- opts.xsd.value=true; -+ opts.xsd = true; - } - -- if(opts.xsd.isOn()) -+ if(opts.xsd) - return new XmlSchemaLoader(in); - - final Parseable parseable = makeRELAXNGSource(opts, in, eh, f); -@@ -169,10 +184,10 @@ public class Main { - } - - private static Parseable makeRELAXNGSource(Options opts, final InputSource in, ErrorHandler eh, File f) { -- if(opts.compact.isOn()) -+ if(opts.compact) - return new CompactParseable(in,eh); - -- if(opts.xml.isOn()) -+ if(opts.xml) - return new SAXParseable(in,eh); - - // otherwise sniff from the file extension From 89dc380985a931520f7d3c4c1057d05eac7a9532 Mon Sep 17 00:00:00 2001 From: Mohan Boddu Date: Mon, 15 Apr 2019 13:16:15 -0400 Subject: [PATCH 25/36] Revert "Orphaned for 6+ weeks" Unretirement for https://pagure.io/releng/issue/8278 This reverts commit db8edccc5c49690f252e2f5a07489d7093f4395c. --- .gitignore | 2 + dead.package | 1 - glassfish-jaxb.spec | 327 ++++++++++++++++++++++++++++++++++++++++++++ sources | 1 + txw2-args4j.patch | 147 ++++++++++++++++++++ 5 files changed, 477 insertions(+), 1 deletion(-) create mode 100644 .gitignore delete mode 100644 dead.package create mode 100644 glassfish-jaxb.spec create mode 100644 sources create mode 100644 txw2-args4j.patch diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..621ee41 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/glassfish-jaxb-2.2.5.tar.gz +/jaxb-ri-2.2.11.src.zip diff --git a/dead.package b/dead.package deleted file mode 100644 index 5204a84..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Orphaned for 6+ weeks diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec new file mode 100644 index 0000000..85dbc70 --- /dev/null +++ b/glassfish-jaxb.spec @@ -0,0 +1,327 @@ +Name: glassfish-jaxb +Version: 2.2.11 +Release: 11%{?dist} +Summary: JAXB Reference Implementation + +License: CDDL-1.1 and GPLv2 with exceptions +URL: http://jaxb.java.net + +Source0: https://jaxb.java.net/%{version}/jaxb-ri-%{version}.src.zip +Patch0: txw2-args4j.patch + +BuildRequires: maven-local +BuildRequires: mvn(args4j:args4j) +BuildRequires: mvn(com.sun.istack:istack-commons-runtime) +BuildRequires: mvn(com.sun.istack:istack-commons-tools) +BuildRequires: mvn(com.sun:tools) +BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser) +BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) +BuildRequires: mvn(com.sun.xsom:xsom) +BuildRequires: mvn(javax.xml.bind:jaxb-api) +BuildRequires: mvn(net.java.dev.msv:msv-core) +BuildRequires: mvn(net.java:jvnet-parent:pom:) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +BuildRequires: mvn(org.jvnet.staxex:stax-ex) +BuildRequires: mvn(relaxngDatatype:relaxngDatatype) + +Requires: glassfish-jaxb1-impl = %{version}-%{release} +Requires: %{name}-bom = %{version}-%{release} +Requires: %{name}-bom-ext = %{version}-%{release} +Requires: %{name}-codemodel = %{version}-%{release} +Requires: %{name}-codemodel-annotation-compiler = %{version}-%{release} +Requires: %{name}-codemodel-parent = %{version}-%{release} +Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-external-parent = %{version}-%{release} +Requires: %{name}-jxc = %{version}-%{release} +Requires: %{name}-parent = %{version}-%{release} +Requires: %{name}-rngom = %{version}-%{release} +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-runtime-parent = %{version}-%{release} +Requires: %{name}-txw2 = %{version}-%{release} +Requires: %{name}-txwc2 = %{version}-%{release} +Requires: %{name}-txw-parent = %{version}-%{release} +Requires: %{name}-xjc = %{version}-%{release} + +BuildArch: noarch + +%description +GlassFish JAXB Reference Implementation. + +%package codemodel +Summary: Codemodel Core + +%description codemodel +The core functionality of the CodeModel java source code generation +library. + +%package codemodel-annotation-compiler +Summary: Codemodel Annotation Compiler + +%description codemodel-annotation-compiler +The annotation compiler ant task for the CodeModel java source code +generation library. + +%package -n glassfish-jaxb1-impl +Summary: JAXB1 Runtime + +%description -n glassfish-jaxb1-impl +Runtime classes for JAXB1 runtime implementation. + +%package bom +Summary: JAXB BOM + +%description bom +JAXB Bill of Materials (BOM) + +%package bom-ext +Summary: JAXB BOM with all dependencies + +%description bom-ext +JAXB Bill of Materials (BOM) with all dependencies. + +%package codemodel-parent +Summary: Codemodel parent POM + +%description codemodel-parent +This package contains codemodel parent POM. + +%package core +Summary: JAXB Core + +%description core +JAXB Core module. Contains sources required by XJC, JXC and Runtime +modules. + +%package external-parent +Summary: JAXB External parent POM + +%description external-parent +JAXB External parent POM. + +%package jxc +Summary: JAXB schema generator + +%description jxc +The tool to generate XML schema based on java classes. + +%package parent +Summary: JAXB parent POM + +%description parent +This package contains parent POM. + +%package runtime +Summary: JAXB Runtime + +%description runtime +JAXB (JSR 222) Reference Implementation + +%package runtime-parent +Summary: JAXB Runtime parent POM + +%description runtime-parent +This package contains Runtime parent POM. + +%package txw-parent +Summary: JAXB TXW parent POM + +%description txw-parent +This package contains TXW parent POM. + +%package xjc +Summary: JAXB XJC + +%description xjc +JAXB Binding Compiler. Contains source code needed for binding +customization files into java sources. In other words: the tool to +generate java classes for the given xml representation. + +%package rngom +Summary: RELAX NG Object Model/Parser + +%description rngom +This package contains RELAX NG Object Model/Parser. + +%package txw2 +Summary: TXW2 Runtime + +%description txw2 +TXW is a library that allows you to write XML documents. + +%package txwc2 +Summary: TXW2 Compiler + +%description txwc2 +JAXB schema generator. The tool to generate XML schema based on java +classes. + +%package javadoc +Summary: Javadocs for %{name} + +%description javadoc +This package contains the API documentation for %{name}. + +%prep +%setup -q -c + +%patch0 -p1 + +%pom_disable_module bundles + +%pom_remove_dep com.sun:tools +%pom_add_dep_mgmt com.sun:tools +%pom_remove_dep com.sun:tools jxc +%pom_add_dep com.sun:tools jxc + +%pom_remove_dep com.sun.xml.bind:jaxb-release-documentation bundles/ri +%pom_remove_dep com.sun.xml.bind:jaxb-samples bundles/ri + +%pom_remove_plugin :gfnexus-maven-plugin +%pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :buildnumber-maven-plugin + +%mvn_alias org.glassfish.jaxb:jaxb-runtime "com.sun.xml.bind:jaxb-impl" +%mvn_alias org.glassfish.jaxb:jaxb-xjc "com.sun.xml.bind:jaxb-xjc" + +%build +%mvn_build -f -s -- -Ddev -DbuildNumber=unknown + +%install +%mvn_install + +%files +%doc License.txt licenceheader.txt License.html + +%files codemodel -f .mfiles-codemodel +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files codemodel-annotation-compiler -f .mfiles-codemodel-annotation-compiler +%dir %{_javadir}/%{name} + +%files -n glassfish-jaxb1-impl -f .mfiles-jaxb1-impl +%dir %{_javadir}/%{name} + +%files bom -f .mfiles-jaxb-bom +%doc License.txt licenceheader.txt License.html + +%files bom-ext -f .mfiles-jaxb-bom-ext + +%files codemodel-parent -f .mfiles-jaxb-codemodel-parent + +%files core -f .mfiles-jaxb-core +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files external-parent -f .mfiles-jaxb-external-parent + +%files jxc -f .mfiles-jaxb-jxc +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files parent -f .mfiles-jaxb-parent + +%files runtime -f .mfiles-jaxb-runtime +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files runtime-parent -f .mfiles-jaxb-runtime-parent + +%files txw-parent -f .mfiles-jaxb-txw-parent + +%files xjc -f .mfiles-jaxb-xjc +%dir %{_javadir}/%{name} + +%files rngom -f .mfiles-rngom +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files txw2 -f .mfiles-txw2 +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files txwc2 -f .mfiles-txwc2 +%dir %{_javadir}/%{name} +%doc License.txt licenceheader.txt License.html + +%files javadoc -f .mfiles-javadoc +%doc License.txt licenceheader.txt License.html + + +%changelog +* Thu Jan 31 2019 Fedora Release Engineering - 2.2.11-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 2.2.11-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri May 25 2018 Michael Simacek - 2.2.11-9 +- Reduce build deps + +* Wed Feb 07 2018 Fedora Release Engineering - 2.2.11-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Nov 09 2017 Michael Simacek - 2.2.11-7 +- Specify CDDL license version + +* Wed Jul 26 2017 Fedora Release Engineering - 2.2.11-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 2.2.11-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Wed Feb 03 2016 Fedora Release Engineering - 2.2.11-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 2.2.11-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Mar 20 2015 Michal Srb - 2.2.11-2 +- Split into subpackages (Resolves: rhbz#1204187) + +* Mon Jan 19 2015 Michal Srb - 2.2.11-1 +- Update to upstream version 2.2.11 + +* Mon Oct 27 2014 Michal Srb - 2.2.5-8 +- Fix FTBFS (Resolves: rhbz#1106636) +- Adapt to current packaging guidelines +- Remove R, add BR: javapackages-local (for %%mvn_artifact macro) + +* Sat Jun 07 2014 Fedora Release Engineering - 2.2.5-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Mar 28 2014 Michael Simacek - 2.2.5-6 +- Use Requires: java-headless rebuild (#1067528) + +* Sat Aug 03 2013 Fedora Release Engineering - 2.2.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 2.2.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Thu Jul 19 2012 Fedora Release Engineering - 2.2.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Tue Mar 13 2012 Juan Hernandez 2.2.5-2 +- Add missing xsom and rngom dependencies to the POM files + +* Sat Mar 10 2012 Juan Hernandez 2.2.5-1 +- Updated to upstream version 2.2.5 +- Removed classpath from manifest files + +* Wed Mar 7 2012 Juan Hernandez 2.2.4u1-4 +- Updated to reflect the change from glassfish-fi to glassfish-fastinfoset + +* Wed Feb 22 2012 Juan Hernandez 2.2.4u1-3 +- Updated to reflect the changes of the jar names in txw2 + +* Wed Feb 22 2012 Juan Hernandez 2.2.4u1-2 +- Cleanup of the spec file + +* Sat Jan 21 2012 Marek Goldmann 2.2.4u1-1 +- Initial packaging + diff --git a/sources b/sources new file mode 100644 index 0000000..a1b8830 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +bed496dd96e5b9efc4539fc5bdb69c69 jaxb-ri-2.2.11.src.zip diff --git a/txw2-args4j.patch b/txw2-args4j.patch new file mode 100644 index 0000000..df71f86 --- /dev/null +++ b/txw2-args4j.patch @@ -0,0 +1,147 @@ +diff --git a/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java b/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java +index 3c8cc84..3f1a092 100644 +--- a/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java ++++ b/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java +@@ -43,10 +43,10 @@ package com.sun.tools.txw2; + import com.sun.codemodel.writer.FileCodeWriter; + import com.sun.codemodel.writer.SingleStreamCodeWriter; + import com.sun.tools.txw2.model.NodeSet; ++import org.kohsuke.args4j.Argument; ++import org.kohsuke.args4j.Option; + import org.kohsuke.args4j.CmdLineException; + import org.kohsuke.args4j.CmdLineParser; +-import org.kohsuke.args4j.opts.BooleanOption; +-import org.kohsuke.args4j.opts.StringOption; + import org.kohsuke.rngom.parse.IllegalSchemaException; + import org.kohsuke.rngom.parse.Parseable; + import org.kohsuke.rngom.parse.compact.CompactParseable; +@@ -60,6 +60,8 @@ import java.io.File; + import java.io.IOException; + import java.net.MalformedURLException; + import java.util.Properties; ++import java.util.List; ++import java.util.ArrayList; + + /** + * Programatic entry point to the TXW compiler. +@@ -73,26 +75,39 @@ public class Main { + this.opts = opts; + } + +- public static void main(String[] args) { +- System.exit(run(args)); ++ public static class Options { ++ @Argument ++ public List arguments = new ArrayList(); ++ ++ @Option(name="-o") ++ public String output; ++ ++ @Option(name="-p") ++ public String pkg; ++ ++ @Option(name="-c") ++ public boolean compact; ++ ++ @Option(name="-x") ++ public boolean xml; ++ ++ @Option(name="-xsd") ++ public boolean xsd; ++ ++ @Option(name="-h") ++ public boolean chain; + } + +- public static class Options { +- public StringOption output = new StringOption("-o"); +- public StringOption pkg = new StringOption("-p"); +- public BooleanOption compact = new BooleanOption("-c"); +- public BooleanOption xml = new BooleanOption("-x"); +- public BooleanOption xsd = new BooleanOption("-xsd"); +- public BooleanOption chain = new BooleanOption("-h"); ++ public static void main(String[] args) { ++ System.exit(run(args)); + } + + public static int run(String[] args) { + Options opts = new Options(); +- CmdLineParser parser = new CmdLineParser(); +- parser.addOptionClass(opts); ++ CmdLineParser parser = new CmdLineParser(opts); + + try { +- parser.parse(args); ++ parser.parseArgument(args); + } catch (CmdLineException e) { + System.out.println(e.getMessage()); + printUsage(); +@@ -102,9 +117,9 @@ public class Main { + TxwOptions topts = new TxwOptions(); + topts.errorListener = new ConsoleErrorReporter(System.out); + +- if(opts.output.value!=null) { ++ if(opts.output != null) { + try { +- topts.codeWriter = new FileCodeWriter(new File(opts.output.value)); ++ topts.codeWriter = new FileCodeWriter(new File(opts.output)); + } catch( IOException e ) { + System.out.println(e.getMessage()); + printUsage(); +@@ -114,12 +129,12 @@ public class Main { + topts.codeWriter = new SingleStreamCodeWriter(System.out); + } + +- if(opts.chain.isOn()) { ++ if(opts.chain) { + topts.chainMethod = true; + } + +- if(opts.pkg.value!=null) { +- topts._package = topts.codeModel._package(opts.pkg.value); ++ if(opts.pkg != null) { ++ topts._package = topts.codeModel._package(opts.pkg); + } else { + topts._package = topts.codeModel.rootPackage(); + } +@@ -146,21 +161,21 @@ public class Main { + * out of the specified schema file. + */ + private static SchemaBuilder makeSourceSchema(CmdLineParser parser, Options opts, ErrorHandler eh) throws MalformedURLException { +- File f = new File((String)parser.getArguments().get(0)); ++ File f = new File(opts.arguments.get(0)); + final InputSource in = new InputSource(f.toURL().toExternalForm()); + +- if(opts.xsd.isOff() && opts.xml.isOff() && opts.compact.isOff()) { ++ if(!opts.xsd && !opts.xml && !opts.compact) { + // auto detect + if(in.getSystemId().endsWith(".rnc")) +- opts.compact.value=true; ++ opts.compact = true; + else + if(in.getSystemId().endsWith(".rng")) +- opts.xml.value=true; ++ opts.xml = true; + else +- opts.xsd.value=true; ++ opts.xsd = true; + } + +- if(opts.xsd.isOn()) ++ if(opts.xsd) + return new XmlSchemaLoader(in); + + final Parseable parseable = makeRELAXNGSource(opts, in, eh, f); +@@ -169,10 +184,10 @@ public class Main { + } + + private static Parseable makeRELAXNGSource(Options opts, final InputSource in, ErrorHandler eh, File f) { +- if(opts.compact.isOn()) ++ if(opts.compact) + return new CompactParseable(in,eh); + +- if(opts.xml.isOn()) ++ if(opts.xml) + return new SAXParseable(in,eh); + + // otherwise sniff from the file extension From 8517c711151582ed0f45a5068744aa9419a99b24 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 10 May 2019 00:32:41 +0100 Subject: [PATCH 26/36] Disable ancient jaxb1 runtime Enable OSGi bundle version of the runtime Spec file clean up --- glassfish-jaxb.spec | 87 ++++++++++++++++++++++++--------------------- 1 file changed, 47 insertions(+), 40 deletions(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 85dbc70..6466ff4 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,6 +1,6 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 11%{?dist} +Release: 12%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -18,17 +18,15 @@ BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser) BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) BuildRequires: mvn(com.sun.xsom:xsom) BuildRequires: mvn(javax.xml.bind:jaxb-api) -BuildRequires: mvn(net.java.dev.msv:msv-core) BuildRequires: mvn(net.java:jvnet-parent:pom:) BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-enforcer-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.jvnet.staxex:stax-ex) BuildRequires: mvn(relaxngDatatype:relaxngDatatype) -Requires: glassfish-jaxb1-impl = %{version}-%{release} Requires: %{name}-bom = %{version}-%{release} Requires: %{name}-bom-ext = %{version}-%{release} Requires: %{name}-codemodel = %{version}-%{release} @@ -46,6 +44,8 @@ Requires: %{name}-txwc2 = %{version}-%{release} Requires: %{name}-txw-parent = %{version}-%{release} Requires: %{name}-xjc = %{version}-%{release} +Obsoletes: glassfish-jaxb1-impl < 2.2.11-12 + BuildArch: noarch %description @@ -65,12 +65,6 @@ Summary: Codemodel Annotation Compiler The annotation compiler ant task for the CodeModel java source code generation library. -%package -n glassfish-jaxb1-impl -Summary: JAXB1 Runtime - -%description -n glassfish-jaxb1-impl -Runtime classes for JAXB1 runtime implementation. - %package bom Summary: JAXB BOM @@ -170,23 +164,43 @@ This package contains the API documentation for %{name}. %patch0 -p1 -%pom_disable_module bundles +# Disable unneeded OSGi bundles +%pom_disable_module xjc bundles +%pom_disable_module jxc bundles +%pom_disable_module ri bundles +%pom_disable_module osgi bundles +%pom_disable_module core bundles + +# Fix jar plug-in usage for OSGi bundles +%pom_xpath_replace "pom:useDefaultManifestFile" " + + \${project.build.outputDirectory}/META-INF/MANIFEST.MF +" bundles/core bundles/runtime + +# Disable ancient jaxb1 runtime +%pom_disable_module jaxb1 runtime %pom_remove_dep com.sun:tools %pom_add_dep_mgmt com.sun:tools %pom_remove_dep com.sun:tools jxc %pom_add_dep com.sun:tools jxc -%pom_remove_dep com.sun.xml.bind:jaxb-release-documentation bundles/ri -%pom_remove_dep com.sun.xml.bind:jaxb-samples bundles/ri - -%pom_remove_plugin :gfnexus-maven-plugin -%pom_remove_plugin :maven-site-plugin +# Plug-ins not useful for RPM builds %pom_remove_plugin :buildnumber-maven-plugin +%pom_remove_plugin :gfnexus-maven-plugin +%pom_remove_plugin :maven-enforcer-plugin +%pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-source-plugin jxc +%pom_remove_plugin :maven-source-plugin xjc -%mvn_alias org.glassfish.jaxb:jaxb-runtime "com.sun.xml.bind:jaxb-impl" %mvn_alias org.glassfish.jaxb:jaxb-xjc "com.sun.xml.bind:jaxb-xjc" +# Don't install bundles parent pom +%mvn_package com.sun.xml.bind.mvn:jaxb-bundles __noinstall + +# Package OSGi version of runtime with the non-OSGi version +%mvn_package com.sun.xml.bind:jaxb-impl jaxb-runtime + %build %mvn_build -f -s -- -Ddev -DbuildNumber=unknown @@ -194,65 +208,58 @@ This package contains the API documentation for %{name}. %mvn_install %files -%doc License.txt licenceheader.txt License.html +%license License.txt licenceheader.txt License.html %files codemodel -f .mfiles-codemodel -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html +%license License.txt licenceheader.txt License.html %files codemodel-annotation-compiler -f .mfiles-codemodel-annotation-compiler -%dir %{_javadir}/%{name} - -%files -n glassfish-jaxb1-impl -f .mfiles-jaxb1-impl -%dir %{_javadir}/%{name} %files bom -f .mfiles-jaxb-bom -%doc License.txt licenceheader.txt License.html +%license License.txt licenceheader.txt License.html %files bom-ext -f .mfiles-jaxb-bom-ext %files codemodel-parent -f .mfiles-jaxb-codemodel-parent %files core -f .mfiles-jaxb-core -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html +%license License.txt licenceheader.txt License.html %files external-parent -f .mfiles-jaxb-external-parent %files jxc -f .mfiles-jaxb-jxc -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html +%license License.txt licenceheader.txt License.html %files parent -f .mfiles-jaxb-parent %files runtime -f .mfiles-jaxb-runtime -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html +%license License.txt licenceheader.txt License.html %files runtime-parent -f .mfiles-jaxb-runtime-parent %files txw-parent -f .mfiles-jaxb-txw-parent %files xjc -f .mfiles-jaxb-xjc -%dir %{_javadir}/%{name} %files rngom -f .mfiles-rngom -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html +%license License.txt licenceheader.txt License.html %files txw2 -f .mfiles-txw2 -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html +%license License.txt licenceheader.txt License.html %files txwc2 -f .mfiles-txwc2 -%dir %{_javadir}/%{name} -%doc License.txt licenceheader.txt License.html +%license License.txt licenceheader.txt License.html %files javadoc -f .mfiles-javadoc -%doc License.txt licenceheader.txt License.html +%license License.txt licenceheader.txt License.html %changelog +* Thu May 09 2019 Mat Booth - 2.2.11-12 +- Disable ancient jaxb1 runtime +- Enable OSGi bundle version of the runtime +- Spec file clean up + * Thu Jan 31 2019 Fedora Release Engineering - 2.2.11-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From b3e941feb49a92fd7c9f7b103e997f81e25158ea Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 10 May 2019 11:40:56 +0100 Subject: [PATCH 27/36] Add conditional build for reduced dependency set --- ...id-unnecessary-dep-on-istack-commons.patch | 1611 +++++++++++++++++ ...002-Port-to-latest-version-of-args4j.patch | 12 + glassfish-jaxb.spec | 121 +- 3 files changed, 1703 insertions(+), 41 deletions(-) create mode 100644 0001-Avoid-unnecessary-dep-on-istack-commons.patch rename txw2-args4j.patch => 0002-Port-to-latest-version-of-args4j.patch (93%) diff --git a/0001-Avoid-unnecessary-dep-on-istack-commons.patch b/0001-Avoid-unnecessary-dep-on-istack-commons.patch new file mode 100644 index 0000000..498dde9 --- /dev/null +++ b/0001-Avoid-unnecessary-dep-on-istack-commons.patch @@ -0,0 +1,1611 @@ +From c8d1de91c950a80508e23b791c475bca9b377616 Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Fri, 10 May 2019 10:40:17 +0100 +Subject: [PATCH 1/2] Avoid unnecessary dep on istack-commons + +--- + core/pom.xml | 6 +- + .../sun/xml/bind/marshaller/SAX2DOMEx.java | 4 +- + .../v2/model/annotation/AnnotationReader.java | 4 - + .../xml/bind/v2/model/core/PropertyInfo.java | 3 +- + .../java/com/sun/xml/bind/api/Bridge.java | 54 ++++---- + .../com/sun/xml/bind/api/ClassResolver.java | 4 +- + .../com/sun/xml/bind/api/JAXBRIContext.java | 52 ++++--- + .../com/sun/xml/bind/v2/ContextFactory.java | 6 +- + .../v2/model/impl/ByteArrayDataSource.java | 95 +++++++++++++ + .../xml/bind/v2/model/impl/ClassInfoImpl.java | 8 +- + .../bind/v2/model/impl/ElementInfoImpl.java | 6 +- + .../model/impl/ElementPropertyInfoImpl.java | 4 +- + .../impl/RuntimeBuiltinLeafInfoImpl.java | 1 - + .../v2/model/impl/RuntimeClassInfoImpl.java | 3 +- + .../v2/model/impl/RuntimeModelBuilder.java | 3 +- + .../xml/bind/v2/runtime/BridgeAdapter.java | 11 +- + .../sun/xml/bind/v2/runtime/BridgeImpl.java | 9 +- + .../bind/v2/runtime/ClassBeanInfoImpl.java | 6 +- + .../v2/runtime/ContentHandlerAdaptor.java | 14 +- + .../xml/bind/v2/runtime/FilterTransducer.java | 3 +- + .../v2/runtime/InlineBinaryTransducer.java | 3 +- + .../xml/bind/v2/runtime/JAXBContextImpl.java | 16 +-- + .../sun/xml/bind/v2/runtime/JaxBeanInfo.java | 3 +- + .../bind/v2/runtime/NamespaceContext2.java | 3 +- + .../com/sun/xml/bind/v2/runtime/Pool.java | 131 ++++++++++++++++++ + .../sun/xml/bind/v2/runtime/Transducer.java | 7 +- + .../v2/runtime/ValueListBeanInfoImpl.java | 4 +- + .../xml/bind/v2/runtime/XMLSerializer.java | 12 +- + .../bind/v2/runtime/output/C14nXmlOutput.java | 4 +- + .../runtime/output/NamespaceContextImpl.java | 6 +- + .../xml/bind/v2/runtime/reflect/Accessor.java | 3 +- + .../xml/bind/v2/runtime/reflect/Lister.java | 4 +- + .../runtime/reflect/TransducedAccessor.java | 10 +- + .../v2/runtime/unmarshaller/Base64Data.java | 7 +- + .../unmarshaller/UnmarshallingContext.java | 12 +- + .../runtime/unmarshaller/XsiTypeLoader.java | 3 +- + .../bind/v2/schemagen/XmlSchemaGenerator.java | 6 +- + 37 files changed, 359 insertions(+), 171 deletions(-) + create mode 100644 runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java + create mode 100644 runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java + +diff --git a/core/pom.xml b/core/pom.xml +index 10be5d6..6330d8a 100644 +--- a/core/pom.xml ++++ b/core/pom.xml +@@ -67,10 +67,6 @@ holder. + txw2 + ${project.version} + +- +- com.sun.istack +- istack-commons-runtime +- + + +- +\ No newline at end of file ++ +diff --git a/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java b/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java +index fd63b6b..0b97a47 100644 +--- a/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java ++++ b/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java +@@ -46,7 +46,7 @@ import javax.xml.parsers.DocumentBuilderFactory; + import javax.xml.parsers.ParserConfigurationException; + + import com.sun.xml.bind.util.Which; +-import com.sun.istack.FinalArrayList; ++import java.util.ArrayList; + + import com.sun.xml.bind.v2.util.XmlFactory; + import org.w3c.dom.Document; +@@ -68,7 +68,7 @@ public class SAX2DOMEx implements ContentHandler { + private Node node = null; + private boolean isConsolidate; + protected final Stack nodeStack = new Stack(); +- private final FinalArrayList unprocessedNamespaces = new FinalArrayList(); ++ private final ArrayList unprocessedNamespaces = new ArrayList(); + /** + * Document object that owns the specified node. + */ +diff --git a/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java b/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java +index 744d806..a5e5623 100644 +--- a/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java ++++ b/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java +@@ -44,7 +44,6 @@ import java.lang.annotation.Annotation; + import java.lang.reflect.Field; + import java.lang.reflect.Method; + +-import com.sun.istack.Nullable; + import com.sun.xml.bind.v2.model.core.ErrorHandler; + + /** +@@ -140,20 +139,17 @@ public interface AnnotationReader { + * @return null + * if the annotation was not found. + */ +- @Nullable + A getMethodParameterAnnotation( + Class annotation, M method, int paramIndex, Locatable srcPos ); + + /** + * Reads an annotation on a class. + */ +- @Nullable + A getClassAnnotation(Class annotation, C clazz, Locatable srcpos) ; + + /** + * Reads an annotation on the package that the given class belongs to. + */ +- @Nullable + A getPackageAnnotation(Class annotation, C clazz, Locatable srcpos); + + /** +diff --git a/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java b/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java +index badcdd6..f483fea 100644 +--- a/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java ++++ b/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java +@@ -49,7 +49,6 @@ import javax.xml.bind.annotation.XmlType; + import javax.xml.bind.annotation.XmlSchemaType; + import javax.xml.namespace.QName; + +-import com.sun.istack.Nullable; + import com.sun.xml.bind.v2.model.annotation.AnnotationSource; + + /** +@@ -163,5 +162,5 @@ public interface PropertyInfo extends AnnotationSource { + * when this returns non-null, it overrides the type names of all types + * that are in this property.) + */ +- @Nullable QName getSchemaType(); ++ QName getSchemaType(); + } +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java b/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java +index 23a688b..e7aba9e 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java +@@ -54,8 +54,6 @@ import javax.xml.stream.XMLStreamWriter; + import javax.xml.transform.Result; + import javax.xml.transform.Source; + +-import com.sun.istack.NotNull; +-import com.sun.istack.Nullable; + import com.sun.xml.bind.v2.runtime.BridgeContextImpl; + import com.sun.xml.bind.v2.runtime.JAXBContextImpl; + +@@ -91,7 +89,7 @@ public abstract class Bridge { + * + * @since 2.1 + */ +- public @NotNull JAXBRIContext getContext() { ++ public JAXBRIContext getContext() { + return context; + } + +@@ -113,11 +111,11 @@ public abstract class Bridge { + context.marshallerPool.recycle(m); + } + +- public final void marshal(@NotNull BridgeContext context,T object,XMLStreamWriter output) throws JAXBException { ++ public final void marshal( BridgeContext context,T object,XMLStreamWriter output) throws JAXBException { + marshal( ((BridgeContextImpl)context).marshaller, object, output ); + } + +- public abstract void marshal(@NotNull Marshaller m,T object,XMLStreamWriter output) throws JAXBException; ++ public abstract void marshal( Marshaller m,T object,XMLStreamWriter output) throws JAXBException; + + + /** +@@ -147,11 +145,11 @@ public abstract class Bridge { + context.marshallerPool.recycle(m); + } + +- public final void marshal(@NotNull BridgeContext context,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException { ++ public final void marshal( BridgeContext context,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException { + marshal( ((BridgeContextImpl)context).marshaller, object, output, nsContext ); + } + +- public abstract void marshal(@NotNull Marshaller m,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException; ++ public abstract void marshal( Marshaller m,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException; + + + public final void marshal(T object,Node output) throws JAXBException { +@@ -160,11 +158,11 @@ public abstract class Bridge { + context.marshallerPool.recycle(m); + } + +- public final void marshal(@NotNull BridgeContext context,T object,Node output) throws JAXBException { ++ public final void marshal( BridgeContext context,T object,Node output) throws JAXBException { + marshal( ((BridgeContextImpl)context).marshaller, object, output ); + } + +- public abstract void marshal(@NotNull Marshaller m,T object,Node output) throws JAXBException; ++ public abstract void marshal( Marshaller m,T object,Node output) throws JAXBException; + + + /** +@@ -183,10 +181,10 @@ public abstract class Bridge { + m.setAttachmentMarshaller(null); + context.marshallerPool.recycle(m); + } +- public final void marshal(@NotNull BridgeContext context,T object, ContentHandler contentHandler) throws JAXBException { ++ public final void marshal( BridgeContext context,T object, ContentHandler contentHandler) throws JAXBException { + marshal( ((BridgeContextImpl)context).marshaller, object, contentHandler ); + } +- public abstract void marshal(@NotNull Marshaller m,T object, ContentHandler contentHandler) throws JAXBException; ++ public abstract void marshal( Marshaller m,T object, ContentHandler contentHandler) throws JAXBException; + + /** + * @since 2.0 EA4 +@@ -196,10 +194,10 @@ public abstract class Bridge { + marshal(m,object,result); + context.marshallerPool.recycle(m); + } +- public final void marshal(@NotNull BridgeContext context,T object, Result result) throws JAXBException { ++ public final void marshal( BridgeContext context,T object, Result result) throws JAXBException { + marshal( ((BridgeContextImpl)context).marshaller, object, result ); + } +- public abstract void marshal(@NotNull Marshaller m,T object, Result result) throws JAXBException; ++ public abstract void marshal( Marshaller m,T object, Result result) throws JAXBException; + + + +@@ -225,21 +223,21 @@ public abstract class Bridge { + * + * @since 2.0 EA1 + */ +- public final @NotNull T unmarshal(@NotNull XMLStreamReader in) throws JAXBException { ++ public final T unmarshal( XMLStreamReader in) throws JAXBException { + return unmarshal(in,null); + } + /** + * @since 2.0.3 + */ +- public final @NotNull T unmarshal(@NotNull XMLStreamReader in, @Nullable AttachmentUnmarshaller au) throws JAXBException { ++ public final T unmarshal( XMLStreamReader in, AttachmentUnmarshaller au) throws JAXBException { + Unmarshaller u = context.unmarshallerPool.take(); + u.setAttachmentUnmarshaller(au); + return exit(unmarshal(u,in),u); + } +- public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull XMLStreamReader in) throws JAXBException { ++ public final T unmarshal( BridgeContext context, XMLStreamReader in) throws JAXBException { + return unmarshal( ((BridgeContextImpl)context).unmarshaller, in ); + } +- public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull XMLStreamReader in) throws JAXBException; ++ public abstract T unmarshal( Unmarshaller u, XMLStreamReader in) throws JAXBException; + + /** + * Unmarshals the specified type object. +@@ -257,21 +255,21 @@ public abstract class Bridge { + * + * @since 2.0 EA1 + */ +- public final @NotNull T unmarshal(@NotNull Source in) throws JAXBException { ++ public final T unmarshal( Source in) throws JAXBException { + return unmarshal(in,null); + } + /** + * @since 2.0.3 + */ +- public final @NotNull T unmarshal(@NotNull Source in, @Nullable AttachmentUnmarshaller au) throws JAXBException { ++ public final T unmarshal( Source in, AttachmentUnmarshaller au) throws JAXBException { + Unmarshaller u = context.unmarshallerPool.take(); + u.setAttachmentUnmarshaller(au); + return exit(unmarshal(u,in),u); + } +- public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull Source in) throws JAXBException { ++ public final T unmarshal( BridgeContext context, Source in) throws JAXBException { + return unmarshal( ((BridgeContextImpl)context).unmarshaller, in ); + } +- public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull Source in) throws JAXBException; ++ public abstract T unmarshal( Unmarshaller u, Source in) throws JAXBException; + + /** + * Unmarshals the specified type object. +@@ -289,14 +287,14 @@ public abstract class Bridge { + * + * @since 2.0 EA1 + */ +- public final @NotNull T unmarshal(@NotNull InputStream in) throws JAXBException { ++ public final T unmarshal( InputStream in) throws JAXBException { + Unmarshaller u = context.unmarshallerPool.take(); + return exit(unmarshal(u,in),u); + } +- public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull InputStream in) throws JAXBException { ++ public final T unmarshal( BridgeContext context, InputStream in) throws JAXBException { + return unmarshal( ((BridgeContextImpl)context).unmarshaller, in ); + } +- public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull InputStream in) throws JAXBException; ++ public abstract T unmarshal( Unmarshaller u, InputStream in) throws JAXBException; + + /** + * Unmarshals the specified type object. +@@ -312,21 +310,21 @@ public abstract class Bridge { + * + * @since 2.0 FCS + */ +- public final @NotNull T unmarshal(@NotNull Node n) throws JAXBException { ++ public final T unmarshal( Node n) throws JAXBException { + return unmarshal(n,null); + } + /** + * @since 2.0.3 + */ +- public final @NotNull T unmarshal(@NotNull Node n, @Nullable AttachmentUnmarshaller au) throws JAXBException { ++ public final T unmarshal( Node n, AttachmentUnmarshaller au) throws JAXBException { + Unmarshaller u = context.unmarshallerPool.take(); + u.setAttachmentUnmarshaller(au); + return exit(unmarshal(u,n),u); + } +- public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull Node n) throws JAXBException { ++ public final T unmarshal( BridgeContext context, Node n) throws JAXBException { + return unmarshal( ((BridgeContextImpl)context).unmarshaller, n ); + } +- public abstract @NotNull T unmarshal(@NotNull Unmarshaller context, @NotNull Node n) throws JAXBException; ++ public abstract T unmarshal( Unmarshaller context, Node n) throws JAXBException; + + /** + * Gets the {@link TypeReference} from which this bridge was created. +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java b/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java +index 37bbf61..659f5a3 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java +@@ -45,8 +45,6 @@ import javax.xml.bind.Unmarshaller; + import javax.xml.bind.ValidationEventHandler; + import javax.xml.bind.annotation.XmlAnyElement; + +-import com.sun.istack.NotNull; +-import com.sun.istack.Nullable; + + /** + * Dynamically locates classes to represent elements discovered during the unmarshalling. +@@ -115,5 +113,5 @@ public abstract class ClassResolver { + * reproted to {@link ValidationEventHandler} (just like any other error + * during the unmarshalling.) + */ +- public abstract @Nullable Class resolveElementName(@NotNull String nsUri, @NotNull String localName) throws Exception; ++ public abstract Class resolveElementName( String nsUri, String localName) throws Exception; + } +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java b/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java +index 05a2b4d..814b291 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java +@@ -55,8 +55,6 @@ import javax.xml.bind.annotation.XmlAttachmentRef; + import javax.xml.namespace.QName; + import javax.xml.transform.Result; + +-import com.sun.istack.NotNull; +-import com.sun.istack.Nullable; + import com.sun.xml.bind.api.impl.NameConverter; + import com.sun.xml.bind.v2.ContextFactory; + import com.sun.xml.bind.v2.model.annotation.RuntimeAnnotationReader; +@@ -103,11 +101,11 @@ public abstract class JAXBRIContext extends JAXBContext { + * Can be null. + * @since JAXB 2.1 EA2 + */ +- public static JAXBRIContext newInstance(@NotNull Class[] classes, +- @Nullable Collection typeRefs, +- @Nullable Map subclassReplacements, +- @Nullable String defaultNamespaceRemap, boolean c14nSupport, +- @Nullable RuntimeAnnotationReader ar) throws JAXBException { ++ public static JAXBRIContext newInstance( Class[] classes, ++ Collection typeRefs, ++ Map subclassReplacements, ++ String defaultNamespaceRemap, boolean c14nSupport, ++ RuntimeAnnotationReader ar) throws JAXBException { + return newInstance(classes, typeRefs, subclassReplacements, + defaultNamespaceRemap, c14nSupport, ar, false, false, false, false); + } +@@ -145,11 +143,11 @@ public abstract class JAXBRIContext extends JAXBContext { + * @param supressAccessorWarnings + * See {@link #SUPRESS_ACCESSOR_WARNINGS} for the meaning of this parameter. + */ +- public static JAXBRIContext newInstance(@NotNull Class[] classes, +- @Nullable Collection typeRefs, +- @Nullable Map subclassReplacements, +- @Nullable String defaultNamespaceRemap, boolean c14nSupport, +- @Nullable RuntimeAnnotationReader ar, ++ public static JAXBRIContext newInstance( Class[] classes, ++ Collection typeRefs, ++ Map subclassReplacements, ++ String defaultNamespaceRemap, boolean c14nSupport, ++ RuntimeAnnotationReader ar, + boolean xmlAccessorFactorySupport, + boolean allNillable, + boolean retainPropertyInfo, +@@ -171,9 +169,9 @@ public abstract class JAXBRIContext extends JAXBContext { + * @deprecated + * Compatibility with older versions. + */ +- public static JAXBRIContext newInstance(@NotNull Class[] classes, +- @Nullable Collection typeRefs, +- @Nullable String defaultNamespaceRemap, boolean c14nSupport ) throws JAXBException { ++ public static JAXBRIContext newInstance( Class[] classes, ++ Collection typeRefs, ++ String defaultNamespaceRemap, boolean c14nSupport ) throws JAXBException { + return newInstance(classes,typeRefs, Collections.emptyMap(), + defaultNamespaceRemap,c14nSupport,null); + } +@@ -197,7 +195,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * + * @since 2.0 EA1 + */ +- public abstract @Nullable QName getElementName(@NotNull Object o) throws JAXBException; ++ public abstract QName getElementName( Object o) throws JAXBException; + + /** + * Allows to retrieve the element name based on Class. +@@ -206,7 +204,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * @throws javax.xml.bind.JAXBException + * @since 2.1.10 + */ +- public abstract @Nullable QName getElementName(@NotNull Class o) throws JAXBException; ++ public abstract QName getElementName( Class o) throws JAXBException; + + /** + * Creates a mini-marshaller/unmarshaller that can process a {@link TypeReference}. +@@ -216,7 +214,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * + * @since 2.0 EA1 + */ +- public abstract Bridge createBridge(@NotNull TypeReference ref); ++ public abstract Bridge createBridge( TypeReference ref); + + /** + * Creates a new {@link BridgeContext} instance. +@@ -226,7 +224,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * + * @since 2.0 EA1 + */ +- public abstract @NotNull BridgeContext createBridgeContext(); ++ public abstract BridgeContext createBridgeContext(); + + /** + * Gets a {@link RawAccessor} for the specified element property of the specified wrapper bean class. +@@ -274,7 +272,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * + * @since 2.0 EA2 + */ +- public abstract @NotNull List getKnownNamespaceURIs(); ++ public abstract List getKnownNamespaceURIs(); + + + /** +@@ -302,7 +300,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * if {@link SchemaOutputResolver} throws an {@link IOException}. + */ + @Override +- public abstract void generateSchema(@NotNull SchemaOutputResolver outputResolver) throws IOException; ++ public abstract void generateSchema( SchemaOutputResolver outputResolver) throws IOException; + + /** + * Returns the name of the XML Type bound to the +@@ -319,7 +317,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * @return null + * if the referenced type is an anonymous and therefore doesn't have a name. + */ +- public abstract QName getTypeName(@NotNull TypeReference tr); ++ public abstract QName getTypeName( TypeReference tr); + + /** + * Gets the build information of the JAXB runtime. +@@ -328,7 +326,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * may be null, if the runtime is loaded by a class loader that doesn't support + * the access to the manifest informatino. + */ +- public abstract @NotNull String getBuildId(); ++ public abstract String getBuildId(); + + /** + * Generates the episode file that represents the binding known to this {@link JAXBContext}, +@@ -372,7 +370,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * @return + * Typically, this method returns "nameLikeThis". + */ +- public static @NotNull String mangleNameToVariableName(@NotNull String localName) { ++ public static String mangleNameToVariableName( String localName) { + return NameConverter.standard.toVariableName(localName); + } + +@@ -385,7 +383,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * @return + * Typically, this method returns "NameLikeThis". + */ +- public static @NotNull String mangleNameToClassName(@NotNull String localName) { ++ public static String mangleNameToClassName( String localName) { + return NameConverter.standard.toClassName(localName); + } + +@@ -400,7 +398,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * @return + * Typically, this method returns "NameLikeThis". + */ +- public static @NotNull String mangleNameToPropertyName(@NotNull String localName) { ++ public static String mangleNameToPropertyName( String localName) { + return NameConverter.standard.toPropertyName(localName); + } + +@@ -430,7 +428,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * or null if the type is not assignable to the base type. + * @since 2.0 FCS + */ +- public static @Nullable Type getBaseType(@NotNull Type type, @NotNull Class baseType) { ++ public static Type getBaseType( Type type, Class baseType) { + return Utils.REFLECTION_NAVIGATOR.getBaseClass(type, baseType); + } + +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java +index 94dce69..879dedb 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java +@@ -55,7 +55,7 @@ import java.util.logging.Level; + import javax.xml.bind.JAXBContext; + import javax.xml.bind.JAXBException; + +-import com.sun.istack.FinalArrayList; ++import java.util.ArrayList; + import com.sun.xml.bind.Util; + import com.sun.xml.bind.api.JAXBRIContext; + import com.sun.xml.bind.api.TypeReference; +@@ -243,7 +243,7 @@ public class ContextFactory { + */ + public static JAXBContext createContext( String contextPath, + ClassLoader classLoader, Map properties ) throws JAXBException { +- FinalArrayList classes = new FinalArrayList(); ++ ArrayList classes = new ArrayList(); + StringTokenizer tokens = new StringTokenizer(contextPath,":"); + List indexedClasses; + +@@ -306,7 +306,7 @@ public class ContextFactory { + BufferedReader in = + new BufferedReader(new InputStreamReader(resourceAsStream, "UTF-8")); + try { +- FinalArrayList classes = new FinalArrayList(); ++ ArrayList classes = new ArrayList(); + String className = in.readLine(); + while (className != null) { + className = className.trim(); +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java +new file mode 100644 +index 0000000..9c46637 +--- /dev/null ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java +@@ -0,0 +1,95 @@ ++/* ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. ++ * ++ * Copyright (c) 1997-2014 Oracle and/or its affiliates. All rights reserved. ++ * ++ * The contents of this file are subject to the terms of either the GNU ++ * General Public License Version 2 only ("GPL") or the Common Development ++ * and Distribution License("CDDL") (collectively, the "License"). You ++ * may not use this file except in compliance with the License. You can ++ * obtain a copy of the License at ++ * http://glassfish.java.net/public/CDDL+GPL_1_1.html ++ * or packager/legal/LICENSE.txt. See the License for the specific ++ * language governing permissions and limitations under the License. ++ * ++ * When distributing the software, include this License Header Notice in each ++ * file and include the License file at packager/legal/LICENSE.txt. ++ * ++ * GPL Classpath Exception: ++ * Oracle designates this particular file as subject to the "Classpath" ++ * exception as provided by Oracle in the GPL Version 2 section of the License ++ * file that accompanied this code. ++ * ++ * Modifications: ++ * If applicable, add the following below the License Header, with the fields ++ * enclosed by brackets [] replaced by your own identifying information: ++ * "Portions Copyright [year] [name of copyright owner]" ++ * ++ * Contributor(s): ++ * If you wish your version of this file to be governed by only the CDDL or ++ * only the GPL Version 2, indicate your decision by adding "[Contributor] ++ * elects to include this software in this distribution under the [CDDL or GPL ++ * Version 2] license." If you don't indicate a single choice of license, a ++ * recipient has the option to distribute your version of this file under ++ * either the CDDL, the GPL Version 2 or to extend the choice of license to ++ * its licensees as provided above. However, if you add GPL Version 2 code ++ * and therefore, elected the GPL Version 2 license, then the option applies ++ * only if the new code is made subject to such option by the copyright ++ * holder. ++ */ ++ ++package com.sun.xml.bind.v2.model.impl; ++ ++import javax.activation.DataSource; ++import java.io.InputStream; ++import java.io.ByteArrayInputStream; ++import java.io.OutputStream; ++ ++/** ++ * {@link DataSource} backed by a byte buffer. ++ * ++ * @author Kohsuke Kawaguchi ++ */ ++public final class ByteArrayDataSource implements DataSource { ++ ++ private final String contentType; ++ private final byte[] buf; ++ private final int len; ++ ++ /** ++ * @param buf input buffer - the byte array isn't being copied; used directly ++ * @param contentType ++ */ ++ public ByteArrayDataSource(byte[] buf, String contentType) { ++ this(buf,buf.length,contentType); ++ } ++ ++ /** ++ * @param buf input buffer - the byte array isn't being copied; used directly ++ * @param length ++ * @param contentType ++ */ ++ public ByteArrayDataSource(byte[] buf, int length, String contentType) { ++ this.buf = buf; ++ this.len = length; ++ this.contentType = contentType; ++ } ++ ++ public String getContentType() { ++ if(contentType==null) ++ return "application/octet-stream"; ++ return contentType; ++ } ++ ++ public InputStream getInputStream() { ++ return new ByteArrayInputStream(buf,0,len); ++ } ++ ++ public String getName() { ++ return null; ++ } ++ ++ public OutputStream getOutputStream() { ++ throw new UnsupportedOperationException(); ++ } ++} +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java +index 7b092a5..d6dd439 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java +@@ -82,7 +82,7 @@ import javax.xml.bind.annotation.XmlValue; + import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import javax.xml.namespace.QName; + +-import com.sun.istack.FinalArrayList; ++import java.util.ArrayList; + import com.sun.xml.bind.annotation.OverrideAnnotationOf; + import com.sun.xml.bind.v2.model.annotation.Locatable; + import com.sun.xml.bind.v2.model.annotation.MethodLocatable; +@@ -124,7 +124,7 @@ public class ClassInfoImpl extends TypeInfoImpl + * + * @see #getProperties() + */ +- private FinalArrayList> properties; ++ private ArrayList> properties; + + /** + * The property order. +@@ -306,7 +306,7 @@ public class ClassInfoImpl extends TypeInfoImpl + // check the access type first + XmlAccessType at = getAccessType(); + +- properties = new FinalArrayList>(); ++ properties = new ArrayList>(); + + findFieldProperties(clazz,at); + +@@ -579,7 +579,7 @@ public class ClassInfoImpl extends TypeInfoImpl + } + + private static List makeSet( T... args ) { +- List l = new FinalArrayList(); ++ List l = new ArrayList(); + for( T arg : args ) + if(arg!=null) l.add(arg); + return l; +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java +index f20bf49..28994b5 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java +@@ -56,7 +56,7 @@ import javax.xml.bind.annotation.XmlSchema; + import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + import javax.xml.namespace.QName; + +-import com.sun.istack.FinalArrayList; ++import java.util.ArrayList; + import com.sun.xml.bind.v2.TODO; + import com.sun.xml.bind.v2.model.annotation.AnnotationSource; + import com.sun.xml.bind.v2.model.annotation.Locatable; +@@ -107,7 +107,7 @@ class ElementInfoImpl extends TypeInfoImpl implements ElementI + * This could be null. + * @see #link() + */ +- private FinalArrayList> substitutionMembers; ++ private ArrayList> substitutionMembers; + + /** + * The factory method from which this mapping was created. +@@ -435,7 +435,7 @@ class ElementInfoImpl extends TypeInfoImpl implements ElementI + + private void addSubstitutionMember(ElementInfoImpl child) { + if(substitutionMembers==null) +- substitutionMembers = new FinalArrayList>(); ++ substitutionMembers = new ArrayList>(); + substitutionMembers.add(child); + } + +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java +index 4a0169e..3693240 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java +@@ -49,7 +49,7 @@ import javax.xml.bind.annotation.XmlElements; + import javax.xml.bind.annotation.XmlList; + import javax.xml.namespace.QName; + +-import com.sun.istack.FinalArrayList; ++import java.util.ArrayList; + import com.sun.xml.bind.v2.model.core.ElementPropertyInfo; + import com.sun.xml.bind.v2.model.core.ID; + import com.sun.xml.bind.v2.model.core.PropertyKind; +@@ -105,7 +105,7 @@ class ElementPropertyInfoImpl + + public List> getTypes() { + if(types==null) { +- types = new FinalArrayList>(); ++ types = new ArrayList>(); + XmlElement[] ann=null; + + XmlElement xe = seed.readAnnotation(XmlElement.class); +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java +index 56aaa65..8c99fe4 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java +@@ -91,7 +91,6 @@ import javax.xml.transform.Transformer; + import javax.xml.transform.TransformerException; + import javax.xml.transform.stream.StreamResult; + +-import com.sun.istack.ByteArrayDataSource; + import com.sun.xml.bind.DatatypeConverterImpl; + import com.sun.xml.bind.WhiteSpaceProcessor; + import com.sun.xml.bind.api.AccessorException; +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java +index 370ba4f..5a75bde 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java +@@ -53,7 +53,6 @@ import javax.xml.bind.JAXBException; + import javax.xml.namespace.QName; + import javax.xml.stream.XMLStreamException; + +-import com.sun.istack.NotNull; + import com.sun.xml.bind.AccessorFactory; + import com.sun.xml.bind.AccessorFactoryImpl; + import com.sun.xml.bind.InternalAccessorFactory; +@@ -374,7 +373,7 @@ class RuntimeClassInfoImpl extends ClassInfoImpl + } + } + +- public @NotNull CharSequence print(BeanT o) throws AccessorException { ++ public CharSequence print(BeanT o) throws AccessorException { + try { + CharSequence value = xacc.print(o); + if(value==null) +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java +index aefa835..a5427ed 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java +@@ -65,7 +65,6 @@ import com.sun.xml.bind.v2.runtime.SchemaTypeTransducer; + import com.sun.xml.bind.v2.runtime.Transducer; + import com.sun.xml.bind.v2.runtime.JAXBContextImpl; + import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; +-import com.sun.istack.Nullable; + + import com.sun.xml.bind.v2.WellKnownNamespace; + import javax.xml.namespace.QName; +@@ -86,7 +85,7 @@ public class RuntimeModelBuilder extends ModelBuilder { + * The {@link JAXBContextImpl} for which the model is built. + * Null when created for reflection. + */ +- public final @Nullable JAXBContextImpl context; ++ public final JAXBContextImpl context; + + public RuntimeModelBuilder(JAXBContextImpl context, RuntimeAnnotationReader annotationReader, Map subclassReplacements, String defaultNamespaceRemap) { + super(annotationReader, Utils.REFLECTION_NAVIGATOR, subclassReplacements, defaultNamespaceRemap); +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java +index 0e1346c..1a5d6f6 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java +@@ -57,7 +57,6 @@ import javax.xml.stream.XMLStreamWriter; + import javax.xml.transform.Result; + import javax.xml.transform.Source; + +-import com.sun.istack.NotNull; + import com.sun.xml.bind.api.Bridge; + import com.sun.xml.bind.api.TypeReference; + import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallerImpl; +@@ -122,19 +121,19 @@ final class BridgeAdapter extends InternalBridge { + } + + +- public @NotNull InMemory unmarshal(Unmarshaller u, XMLStreamReader in) throws JAXBException { ++ public InMemory unmarshal(Unmarshaller u, XMLStreamReader in) throws JAXBException { + return adaptU(u, core.unmarshal(u,in)); + } + +- public @NotNull InMemory unmarshal(Unmarshaller u, Source in) throws JAXBException { ++ public InMemory unmarshal(Unmarshaller u, Source in) throws JAXBException { + return adaptU(u, core.unmarshal(u,in)); + } + +- public @NotNull InMemory unmarshal(Unmarshaller u, InputStream in) throws JAXBException { ++ public InMemory unmarshal(Unmarshaller u, InputStream in) throws JAXBException { + return adaptU(u, core.unmarshal(u,in)); + } + +- public @NotNull InMemory unmarshal(Unmarshaller u, Node n) throws JAXBException { ++ public InMemory unmarshal(Unmarshaller u, Node n) throws JAXBException { + return adaptU(u, core.unmarshal(u,n)); + } + +@@ -142,7 +141,7 @@ final class BridgeAdapter extends InternalBridge { + return core.getTypeReference(); + } + +- private @NotNull InMemory adaptU(Unmarshaller _u, OnWire v) throws JAXBException { ++ private InMemory adaptU(Unmarshaller _u, OnWire v) throws JAXBException { + UnmarshallerImpl u = (UnmarshallerImpl) _u; + XmlAdapter a = u.coordinator.getAdapter(adapter); + u.coordinator.pushCoordinator(); +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java +index 231f4d2..eb3d739 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java +@@ -55,7 +55,6 @@ import javax.xml.stream.XMLStreamWriter; + import javax.xml.transform.Result; + import javax.xml.transform.Source; + +-import com.sun.istack.NotNull; + import com.sun.xml.bind.api.Bridge; + import com.sun.xml.bind.api.TypeReference; + import com.sun.xml.bind.marshaller.SAX2DOMEx; +@@ -119,22 +118,22 @@ final class BridgeImpl extends InternalBridge { + m.write(tagName,bi,t, m.createXmlOutput(result),m.createPostInitAction(result)); + } + +- public @NotNull T unmarshal(Unmarshaller _u, XMLStreamReader in) throws JAXBException { ++ public T unmarshal(Unmarshaller _u, XMLStreamReader in) throws JAXBException { + UnmarshallerImpl u = (UnmarshallerImpl)_u; + return ((JAXBElement)u.unmarshal0(in,bi)).getValue(); + } + +- public @NotNull T unmarshal(Unmarshaller _u, Source in) throws JAXBException { ++ public T unmarshal(Unmarshaller _u, Source in) throws JAXBException { + UnmarshallerImpl u = (UnmarshallerImpl)_u; + return ((JAXBElement)u.unmarshal0(in,bi)).getValue(); + } + +- public @NotNull T unmarshal(Unmarshaller _u, InputStream in) throws JAXBException { ++ public T unmarshal(Unmarshaller _u, InputStream in) throws JAXBException { + UnmarshallerImpl u = (UnmarshallerImpl)_u; + return ((JAXBElement)u.unmarshal0(in,bi)).getValue(); + } + +- public @NotNull T unmarshal(Unmarshaller _u, Node n) throws JAXBException { ++ public T unmarshal(Unmarshaller _u, Node n) throws JAXBException { + UnmarshallerImpl u = (UnmarshallerImpl)_u; + return ((JAXBElement)u.unmarshal0(n,bi)).getValue(); + } +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java +index c7763bf..e1a5595 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java +@@ -57,7 +57,7 @@ import javax.xml.bind.helpers.ValidationEventImpl; + import javax.xml.namespace.QName; + import javax.xml.stream.XMLStreamException; + +-import com.sun.istack.FinalArrayList; ++import java.util.ArrayList; + import com.sun.xml.bind.Util; + import com.sun.xml.bind.api.AccessorException; + import com.sun.xml.bind.v2.ClassFactory; +@@ -237,8 +237,8 @@ public final class ClassBeanInfoImpl extends JaxBeanInfo implement + } + + // create a list of attribute/URI handlers +- List attProps = new FinalArrayList(); +- List uriProps = new FinalArrayList(); ++ List attProps = new ArrayList(); ++ List uriProps = new ArrayList(); + for (ClassBeanInfoImpl bi = this; bi != null; bi = bi.superClazz) { + for (int i = 0; i < bi.properties.length; i++) { + Property p = bi.properties[i]; +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java +index 81cceaf..4d57df7 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java +@@ -40,8 +40,8 @@ + + package com.sun.xml.bind.v2.runtime; + +-import com.sun.istack.FinalArrayList; +-import com.sun.istack.SAXException2; ++import java.util.ArrayList; ++import org.xml.sax.SAXException; + import org.xml.sax.Attributes; + import org.xml.sax.SAXException; + import org.xml.sax.helpers.DefaultHandler; +@@ -59,7 +59,7 @@ import java.io.IOException; + final class ContentHandlerAdaptor extends DefaultHandler { + + /** Stores newly declared prefix-URI mapping. */ +- private final FinalArrayList prefixMap = new FinalArrayList(); ++ private final ArrayList prefixMap = new ArrayList(); + + /** Events will be sent to this object. */ + private final XMLSerializer serializer; +@@ -136,9 +136,9 @@ final class ContentHandlerAdaptor extends DefaultHandler { + prefixMap.clear(); + serializer.endAttributes(); + } catch (IOException e) { +- throw new SAXException2(e); ++ throw new SAXException(e); + } catch (XMLStreamException e) { +- throw new SAXException2(e); ++ throw new SAXException(e); + } + } + +@@ -153,9 +153,9 @@ final class ContentHandlerAdaptor extends DefaultHandler { + flushText(); + serializer.endElement(); + } catch (IOException e) { +- throw new SAXException2(e); ++ throw new SAXException(e); + } catch (XMLStreamException e) { +- throw new SAXException2(e); ++ throw new SAXException(e); + } + } + +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java +index fa14713..4ee809a 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java +@@ -45,7 +45,6 @@ import java.io.IOException; + import javax.xml.namespace.QName; + import javax.xml.stream.XMLStreamException; + +-import com.sun.istack.NotNull; + import com.sun.xml.bind.api.AccessorException; + + import org.xml.sax.SAXException; +@@ -76,7 +75,7 @@ public abstract class FilterTransducer implements Transducer { + core.declareNamespace(o, w); + } + +- public @NotNull CharSequence print(@NotNull T o) throws AccessorException { ++ public CharSequence print( T o) throws AccessorException { + return core.print(o); + } + +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java +index a09ef5d..1bf7c49 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java +@@ -44,7 +44,6 @@ import java.io.IOException; + + import javax.xml.stream.XMLStreamException; + +-import com.sun.istack.NotNull; + import com.sun.xml.bind.api.AccessorException; + + import org.xml.sax.SAXException; +@@ -60,7 +59,7 @@ public class InlineBinaryTransducer extends FilterTransducer { + } + + @Override +- public @NotNull CharSequence print(@NotNull V o) throws AccessorException { ++ public CharSequence print( V o) throws AccessorException { + XMLSerializer w = XMLSerializer.getInstance(); + boolean old = w.setInlineBinaryFlag(true); + try { +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java +index c215971..6ade739 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java +@@ -83,8 +83,6 @@ import javax.xml.transform.TransformerFactory; + import javax.xml.transform.sax.SAXTransformerFactory; + import javax.xml.transform.sax.TransformerHandler; + +-import com.sun.istack.NotNull; +-import com.sun.istack.Pool; + import com.sun.xml.bind.v2.WellKnownNamespace; + import com.sun.xml.bind.api.AccessorException; + import com.sun.xml.bind.api.Bridge; +@@ -174,13 +172,13 @@ public final class JAXBContextImpl extends JAXBRIContext { + * Pool of {@link Marshaller}s. + */ + public final Pool marshallerPool = new Pool.Impl() { +- protected @NotNull Marshaller create() { ++ protected Marshaller create() { + return createMarshaller(); + } + }; + + public final Pool unmarshallerPool = new Pool.Impl() { +- protected @NotNull Unmarshaller create() { ++ protected Unmarshaller create() { + return createUnmarshaller(); + } + }; +@@ -241,10 +239,10 @@ public final class JAXBContextImpl extends JAXBRIContext { + + private WeakReference typeInfoSetCache; + +- private @NotNull RuntimeAnnotationReader annotationReader; ++ private RuntimeAnnotationReader annotationReader; + + private /*almost final*/ boolean hasSwaRef; +- private final @NotNull Map subclassReplacements; ++ private final Map subclassReplacements; + + /** + * If true, we aim for faster {@link JAXBContext} instantiation performance, +@@ -917,7 +915,7 @@ public final class JAXBContextImpl extends JAXBRIContext { + return bridges.get(ref); + } + +- public @NotNull BridgeContext createBridgeContext() { ++ public BridgeContext createBridgeContext() { + return new BridgeContextImpl(this); + } + +@@ -1030,8 +1028,8 @@ public final class JAXBContextImpl extends JAXBRIContext { + private boolean retainPropertyInfo = false; + private boolean supressAccessorWarnings = false; + private String defaultNsUri = ""; +- private @NotNull RuntimeAnnotationReader annotationReader = new RuntimeInlineAnnotationReader(); +- private @NotNull Map subclassReplacements = Collections.emptyMap(); ++ private RuntimeAnnotationReader annotationReader = new RuntimeInlineAnnotationReader(); ++ private Map subclassReplacements = Collections.emptyMap(); + private boolean c14nSupport = false; + private Class[] classes; + private Collection typeRefs; +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java +index a4bfc9e..eafcbf9 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java +@@ -58,7 +58,6 @@ import javax.xml.datatype.XMLGregorianCalendar; + import javax.xml.namespace.QName; + import javax.xml.stream.XMLStreamException; + +-import com.sun.istack.NotNull; + import com.sun.xml.bind.Util; + import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfo; + import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; +@@ -302,7 +301,7 @@ public abstract class JaxBeanInfo { + * instance, but there's a few exceptions (most notably {@link XMLGregorianCalendar}), + * so as a general rule we need an instance to determine it. + */ +- public QName getTypeName(@NotNull BeanT instance) { ++ public QName getTypeName( BeanT instance) { + if(typeName==null) return null; + if(typeName instanceof QName) return (QName)typeName; + return ((QName[])typeName)[0]; +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java +index a6205fb..7ac839a 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java +@@ -42,7 +42,6 @@ package com.sun.xml.bind.v2.runtime; + + import javax.xml.namespace.NamespaceContext; + +-import com.sun.istack.NotNull; + + /** + * Maintains namespace<->prefix bindings. +@@ -99,5 +98,5 @@ public interface NamespaceContext2 extends NamespaceContext + * simply returns the assigned prefix index. Otherwise a new + * declaration will be put. + */ +- int force(@NotNull String uri, @NotNull String prefix); ++ int force( String uri, String prefix); + } +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java +new file mode 100644 +index 0000000..71fea42 +--- /dev/null ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java +@@ -0,0 +1,131 @@ ++/* ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. ++ * ++ * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved. ++ * ++ * The contents of this file are subject to the terms of either the GNU ++ * General Public License Version 2 only ("GPL") or the Common Development ++ * and Distribution License("CDDL") (collectively, the "License"). You ++ * may not use this file except in compliance with the License. You can ++ * obtain a copy of the License at ++ * http://glassfish.java.net/public/CDDL+GPL_1_1.html ++ * or packager/legal/LICENSE.txt. See the License for the specific ++ * language governing permissions and limitations under the License. ++ * ++ * When distributing the software, include this License Header Notice in each ++ * file and include the License file at packager/legal/LICENSE.txt. ++ * ++ * GPL Classpath Exception: ++ * Oracle designates this particular file as subject to the "Classpath" ++ * exception as provided by Oracle in the GPL Version 2 section of the License ++ * file that accompanied this code. ++ * ++ * Modifications: ++ * If applicable, add the following below the License Header, with the fields ++ * enclosed by brackets [] replaced by your own identifying information: ++ * "Portions Copyright [year] [name of copyright owner]" ++ * ++ * Contributor(s): ++ * If you wish your version of this file to be governed by only the CDDL or ++ * only the GPL Version 2, indicate your decision by adding "[Contributor] ++ * elects to include this software in this distribution under the [CDDL or GPL ++ * Version 2] license." If you don't indicate a single choice of license, a ++ * recipient has the option to distribute your version of this file under ++ * either the CDDL, the GPL Version 2 or to extend the choice of license to ++ * its licensees as provided above. However, if you add GPL Version 2 code ++ * and therefore, elected the GPL Version 2 license, then the option applies ++ * only if the new code is made subject to such option by the copyright ++ * holder. ++ */ ++ ++package com.sun.xml.bind.v2.runtime; ++ ++import java.util.concurrent.ConcurrentLinkedQueue; ++import java.lang.ref.WeakReference; ++ ++/** ++ * Pool of reusable objects that are indistinguishable from each other, ++ * such as JAXB marshallers. ++ * ++ * @author Kohsuke Kawaguchi ++ */ ++public interface Pool { ++ ++ /** ++ * Gets a new object from the pool. ++ * ++ *

++ * If no object is available in the pool, this method creates a new one. ++ */ ++ T take(); ++ ++ /** ++ * Returns an object back to the pool. ++ */ ++ void recycle(T t); ++ ++ /** ++ * Default implementation that uses {@link ConcurrentLinkedQueue} ++ * as the data store. ++ * ++ *

Note for Implementors

++ *

++ * Don't rely on the fact that this class extends from {@link ConcurrentLinkedQueue}. ++ */ ++ public abstract class Impl implements Pool { ++ ++ private volatile WeakReference> queue; ++ ++ /** ++ * Gets a new object from the pool. ++ * ++ *

++ * If no object is available in the pool, this method creates a new one. ++ * ++ * @return ++ * always non-null. ++ */ ++ public final T take() { ++ T t = getQueue().poll(); ++ if(t==null) { ++ return create(); ++ } ++ return t; ++ } ++ ++ /** ++ * Returns an object back to the pool. ++ */ ++ public final void recycle(T t) { ++ getQueue().offer(t); ++ } ++ ++ private ConcurrentLinkedQueue getQueue() { ++ WeakReference> q = queue; ++ if (q != null) { ++ ConcurrentLinkedQueue d = q.get(); ++ if (d != null) { ++ return d; ++ } ++ } ++ // overwrite the queue ++ ConcurrentLinkedQueue d = new ConcurrentLinkedQueue(); ++ queue = new WeakReference>(d); ++ ++ return d; ++ } ++ ++ /** ++ * Creates a new instance of object. ++ * ++ *

++ * This method is used when someone wants to ++ * {@link #take() take} an object from an empty pool. ++ * ++ *

++ * Also note that multiple threads may call this method ++ * concurrently. ++ */ ++ protected abstract T create(); ++ } ++} +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java +index 55aa437..3b9f791 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java +@@ -47,7 +47,6 @@ import javax.xml.datatype.XMLGregorianCalendar; + import javax.xml.namespace.QName; + import javax.xml.stream.XMLStreamException; + +-import com.sun.istack.NotNull; + import com.sun.xml.bind.api.AccessorException; + import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; + import com.sun.xml.bind.v2.runtime.reflect.opt.OptimizedTransducedAccessorFactory; +@@ -104,7 +103,7 @@ public interface Transducer { + * @return + * always non-null valid lexical representation. + */ +- @NotNull CharSequence print(@NotNull ValueT o) throws AccessorException; ++ CharSequence print( ValueT o) throws AccessorException; + + /** + * Converts the lexical representation to a value object. +@@ -132,7 +131,7 @@ public interface Transducer { + * to one of the {@link XMLSerializer#leafElement(Name, String, String)} method. + * but with the best representation of the value, not necessarily String. + */ +- void writeLeafElement(XMLSerializer w, Name tagName, @NotNull ValueT o, String fieldName) throws IOException, SAXException, XMLStreamException, AccessorException; ++ void writeLeafElement(XMLSerializer w, Name tagName, ValueT o, String fieldName) throws IOException, SAXException, XMLStreamException, AccessorException; + + /** + * Transducers implicitly work against a single XML type, +@@ -145,5 +144,5 @@ public interface Transducer { + * Most of the time this method returns null, in which case + * the implicitly associated type will be used. + */ +- QName getTypeName(@NotNull ValueT instance); ++ QName getTypeName( ValueT instance); + } +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java +index 6574c1d..0af82ce 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java +@@ -49,7 +49,7 @@ import javax.xml.bind.ValidationEvent; + import javax.xml.bind.helpers.ValidationEventImpl; + import javax.xml.stream.XMLStreamException; + +-import com.sun.istack.FinalArrayList; ++import java.util.ArrayList; + import com.sun.xml.bind.WhiteSpaceProcessor; + import com.sun.xml.bind.api.AccessorException; + import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; +@@ -77,7 +77,7 @@ final class ValueListBeanInfoImpl extends JaxBeanInfo { + private final Loader loader = new Loader(true) { + @Override + public void text(UnmarshallingContext.State state, CharSequence text) throws SAXException { +- List r = new FinalArrayList(); ++ List r = new ArrayList(); + + int idx = 0; + int len = text.length(); +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java +index d4db0f4..05b3a53 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java +@@ -66,7 +66,7 @@ import javax.xml.transform.Transformer; + import javax.xml.transform.TransformerException; + import javax.xml.transform.sax.SAXResult; + +-import com.sun.istack.SAXException2; ++import org.xml.sax.SAXException; + import com.sun.xml.bind.CycleRecoverable; + import com.sun.xml.bind.api.AccessorException; + import com.sun.xml.bind.marshaller.NamespacePrefixMapper; +@@ -239,14 +239,14 @@ public final class XMLSerializer extends Coordinator { + try { + handler = marshaller.getEventHandler(); + } catch( JAXBException e ) { +- throw new SAXException2(e); ++ throw new SAXException(e); + } + + if(!handler.handleEvent(ve)) { + if(ve.getLinkedException() instanceof Exception) +- throw new SAXException2((Exception)ve.getLinkedException()); ++ throw new SAXException((Exception)ve.getLinkedException()); + else +- throw new SAXException2(ve.getMessage()); ++ throw new SAXException(ve.getMessage()); + } + } + +@@ -434,9 +434,9 @@ public final class XMLSerializer extends Coordinator { + try { + out.attribute(prefix,local,value); + } catch (IOException e) { +- throw new SAXException2(e); ++ throw new SAXException(e); + } catch (XMLStreamException e) { +- throw new SAXException2(e); ++ throw new SAXException(e); + } + } + +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java +index b570114..d9f6a49 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java +@@ -47,7 +47,7 @@ import java.util.Collections; + + import com.sun.xml.bind.api.JAXBRIContext; + import com.sun.xml.bind.v2.runtime.Name; +-import com.sun.istack.FinalArrayList; ++import java.util.ArrayList; + import com.sun.xml.bind.marshaller.CharacterEscapeHandler; + + /** +@@ -85,7 +85,7 @@ public class C14nXmlOutput extends UTF8XmlOutput { + * As long as this map is empty, there's no need for sorting. + * see {@link com.sun.xml.bind.api.C14nSupport_ArchitectureDocument} for more details. + */ +- private final FinalArrayList otherAttributes = new FinalArrayList(); ++ private final ArrayList otherAttributes = new ArrayList(); + + /** + * True if {@link JAXBRIContext} is created with c14n support on, +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java +index 90eb105..6085609 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java +@@ -47,8 +47,6 @@ import java.util.Iterator; + import javax.xml.XMLConstants; + import javax.xml.stream.XMLStreamException; + +-import com.sun.istack.NotNull; +-import com.sun.istack.Nullable; + import com.sun.xml.bind.marshaller.NamespacePrefixMapper; + import com.sun.xml.bind.v2.WellKnownNamespace; + import com.sun.xml.bind.v2.runtime.Name; +@@ -237,7 +235,7 @@ public final class NamespaceContextImpl implements NamespaceContext2 { + } + } + +- public int force(@NotNull String uri, @NotNull String prefix) { ++ public int force( String uri, String prefix) { + // check for the existing binding + + for( int i=size-1; i>=0; i-- ) { +@@ -265,7 +263,7 @@ public final class NamespaceContextImpl implements NamespaceContext2 { + * @return + * the index of this new binding. + */ +- public int put(@NotNull String uri, @Nullable String prefix) { ++ public int put( String uri, String prefix) { + if(size==nsUris.length) { + // reallocate + String[] u = new String[nsUris.length*2]; +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java +index a4e5ba2..8c1a46e 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java +@@ -55,7 +55,6 @@ import java.util.logging.Logger; + import javax.xml.bind.JAXBElement; + import javax.xml.bind.annotation.adapters.XmlAdapter; + +-import com.sun.istack.Nullable; + import com.sun.xml.bind.Util; + import com.sun.xml.bind.api.AccessorException; + import com.sun.xml.bind.api.JAXBRIContext; +@@ -104,7 +103,7 @@ public abstract class Accessor implements Receiver { + * (See {@link RuntimeModelBuilder#context}.) + * @return At least the implementation can return this. + */ +- public Accessor optimize(@Nullable JAXBContextImpl context) { ++ public Accessor optimize( JAXBContextImpl context) { + return this; + } + +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java +index 56ce1cb..3060979 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java +@@ -60,7 +60,7 @@ import java.util.concurrent.Callable; + + import javax.xml.bind.JAXBException; + +-import com.sun.istack.SAXException2; ++import org.xml.sax.SAXException; + import com.sun.xml.bind.api.AccessorException; + import com.sun.xml.bind.v2.ClassFactory; + import com.sun.xml.bind.v2.TODO; +@@ -405,7 +405,7 @@ public abstract class Lister { + } catch (SAXException e) { + throw e; + } catch (Exception e) { +- throw new SAXException2(e); ++ throw new SAXException(e); + } + + if(t==null) { +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java +index 171ce1d..af18dbc 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java +@@ -47,9 +47,7 @@ import javax.xml.bind.JAXBException; + import javax.xml.bind.annotation.XmlValue; + import javax.xml.stream.XMLStreamException; + +-import com.sun.istack.NotNull; +-import com.sun.istack.Nullable; +-import com.sun.istack.SAXException2; ++import org.xml.sax.SAXException; + import com.sun.xml.bind.WhiteSpaceProcessor; + import com.sun.xml.bind.api.AccessorException; + import com.sun.xml.bind.v2.model.core.ID; +@@ -110,7 +108,7 @@ public abstract class TransducedAccessor { + * @return + * if the accessor didn't yield a value, return null. + */ +- public abstract @Nullable CharSequence print(@NotNull BeanT o) throws AccessorException, SAXException; ++ public abstract CharSequence print( BeanT o) throws AccessorException, SAXException; + + /** + * Parses the text value into the responsible field of the given bean. +@@ -321,7 +319,7 @@ public abstract class TransducedAccessor { + } catch (RuntimeException e) {// from callable.call + throw e; + } catch (Exception e) {// from callable.call +- throw new SAXException2(e); ++ throw new SAXException(e); + } + if(t!=null) { + assign(bean,t,context); +@@ -344,7 +342,7 @@ public abstract class TransducedAccessor { + } catch (RuntimeException e) {// from callable.call + throw e; + } catch (Exception e) {// from callable.call +- throw new SAXException2(e); ++ throw new SAXException(e); + } + } + }); +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java +index ac479ec..8e61905 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java +@@ -55,7 +55,6 @@ import com.sun.xml.bind.v2.runtime.XMLSerializer; + import com.sun.xml.bind.v2.runtime.output.Pcdata; + import com.sun.xml.bind.v2.runtime.output.UTF8XmlOutput; + import com.sun.xml.bind.v2.util.ByteArrayOutputStreamEx; +-import com.sun.istack.Nullable; + + /** + * Fed to unmarshaller when the 'text' data is actually +@@ -90,7 +89,7 @@ public final class Base64Data extends Pcdata { + * Unused when {@link #dataHandler} is set. + * Use {@link DataHandler#getContentType()} in that case. + */ +- private @Nullable ++ private + String mimeType; + + /** +@@ -99,7 +98,7 @@ public final class Base64Data extends Pcdata { + * @param len + * data[0] to data[len-1] are treated as the data. + */ +- public void set(byte[] data, int len, @Nullable String mimeType) { ++ public void set(byte[] data, int len, String mimeType) { + this.data = data; + this.dataLen = len; + this.dataHandler = null; +@@ -112,7 +111,7 @@ public final class Base64Data extends Pcdata { + * @param data + * this buffer may be owned directly by the unmarshaleld JAXB object. + */ +- public void set(byte[] data, @Nullable String mimeType) { ++ public void set(byte[] data, String mimeType) { + set(data, data.length, mimeType); + } + +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java +index 265032d..35118e3 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java +@@ -64,9 +64,7 @@ import javax.xml.bind.helpers.ValidationEventImpl; + import javax.xml.namespace.NamespaceContext; + import javax.xml.namespace.QName; + +-import com.sun.istack.NotNull; +-import com.sun.istack.Nullable; +-import com.sun.istack.SAXParseException2; ++import org.xml.sax.SAXParseException; + import com.sun.xml.bind.IDResolver; + import com.sun.xml.bind.Util; + import com.sun.xml.bind.api.AccessorException; +@@ -119,7 +117,7 @@ public final class UnmarshallingContext extends Coordinator + DUMMY_INSTANCE = new LocatorExWrapper(loc); + } + +- private @NotNull LocatorEx locator = DUMMY_INSTANCE; ++ private LocatorEx locator = DUMMY_INSTANCE; + + /** Root object that is being unmarshalled. */ + private Object result; +@@ -190,13 +188,13 @@ public final class UnmarshallingContext extends Coordinator + /** + * Used to discover additional classes when we hit unknown elements/types. + */ +- public @Nullable ClassResolver classResolver; ++ public ClassResolver classResolver; + + /** + * User-supplied {@link ClassLoader} for converting name to {@link Class}. + * For backward compatibility, when null, use thread context classloader. + */ +- public @Nullable ClassLoader classLoader; ++ public ClassLoader classLoader; + + /** + * The variable introduced to avoid reporting n^10 similar errors. +@@ -737,7 +735,7 @@ public final class UnmarshallingContext extends Coordinator + if(!recover) aborted = true; + + if( !canRecover || !recover ) +- throw new SAXParseException2( event.getMessage(), locator, ++ throw new SAXParseException( event.getMessage(), locator, + new UnmarshalException( + event.getMessage(), + event.getLinkedException() ) ); +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java +index 4766583..3cbec32 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java +@@ -45,7 +45,6 @@ import javax.xml.namespace.QName; + import com.sun.xml.bind.DatatypeConverterImpl; + import com.sun.xml.bind.v2.WellKnownNamespace; + import com.sun.xml.bind.v2.runtime.JaxBeanInfo; +-import com.sun.istack.Nullable; + + import java.util.Collection; + import java.util.Collections; +@@ -80,7 +79,7 @@ public class XsiTypeLoader extends Loader { + loader.startElement(state,ea); + } + +- /*pacakge*/ static JaxBeanInfo parseXsiType(UnmarshallingContext.State state, TagName ea, @Nullable JaxBeanInfo defaultBeanInfo) throws SAXException { ++ /*pacakge*/ static JaxBeanInfo parseXsiType(UnmarshallingContext.State state, TagName ea, JaxBeanInfo defaultBeanInfo) throws SAXException { + UnmarshallingContext context = state.getContext(); + JaxBeanInfo beanInfo = null; + +diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java +index c8380a3..cc85be8 100644 +--- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java ++++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java +@@ -63,8 +63,6 @@ import javax.xml.namespace.QName; + import javax.xml.transform.Result; + import javax.xml.transform.stream.StreamResult; + +-import com.sun.istack.Nullable; +-import com.sun.istack.NotNull; + import com.sun.xml.bind.Util; + import com.sun.xml.bind.api.CompositeStructure; + import com.sun.xml.bind.api.ErrorListener; +@@ -504,7 +502,7 @@ public final class XmlSchemaGenerator { + * Schema components are organized per namespace. + */ + private class Namespace { +- final @NotNull String uri; ++ final String uri; + + /** + * Other {@link Namespace}s that this namespace depends on. +@@ -588,7 +586,7 @@ public final class XmlSchemaGenerator { + } + } + +- private void addDependencyTo(@Nullable QName qname) { ++ private void addDependencyTo( QName qname) { + // even though the Element interface says getElementName() returns non-null, + // ClassInfo always implements Element (even if an instance of ClassInfo might not be an Element). + // so this check is still necessary +-- +2.20.1 + diff --git a/txw2-args4j.patch b/0002-Port-to-latest-version-of-args4j.patch similarity index 93% rename from txw2-args4j.patch rename to 0002-Port-to-latest-version-of-args4j.patch index df71f86..3205210 100644 --- a/txw2-args4j.patch +++ b/0002-Port-to-latest-version-of-args4j.patch @@ -1,3 +1,12 @@ +From 23b7ecb1e748f79c28af927ae8dc4c7e66fe20cf Mon Sep 17 00:00:00 2001 +From: Mat Booth +Date: Fri, 10 May 2019 10:41:07 +0100 +Subject: [PATCH 2/2] Port to latest version of args4j + +--- + .../main/java/com/sun/tools/txw2/Main.java | 69 +++++++++++-------- + 1 file changed, 42 insertions(+), 27 deletions(-) + diff --git a/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java b/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java index 3c8cc84..3f1a092 100644 --- a/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java @@ -145,3 +154,6 @@ index 3c8cc84..3f1a092 100644 return new SAXParseable(in,eh); // otherwise sniff from the file extension +-- +2.20.1 + diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 6466ff4..25be432 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,15 +1,26 @@ +# Conditionally build with a minimal dependency set +%bcond_with jp_minimal + Name: glassfish-jaxb Version: 2.2.11 -Release: 12%{?dist} +Release: 13%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions URL: http://jaxb.java.net Source0: https://jaxb.java.net/%{version}/jaxb-ri-%{version}.src.zip -Patch0: txw2-args4j.patch +Patch0: 0001-Avoid-unnecessary-dep-on-istack-commons.patch +Patch1: 0002-Port-to-latest-version-of-args4j.patch BuildRequires: maven-local +BuildRequires: mvn(javax.xml.bind:jaxb-api) +BuildRequires: mvn(net.java:jvnet-parent:pom:) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +%if %{without jp_minimal} BuildRequires: mvn(args4j:args4j) BuildRequires: mvn(com.sun.istack:istack-commons-runtime) BuildRequires: mvn(com.sun.istack:istack-commons-tools) @@ -17,32 +28,29 @@ BuildRequires: mvn(com.sun:tools) BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser) BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) BuildRequires: mvn(com.sun.xsom:xsom) -BuildRequires: mvn(javax.xml.bind:jaxb-api) -BuildRequires: mvn(net.java:jvnet-parent:pom:) BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) BuildRequires: mvn(org.jvnet.staxex:stax-ex) BuildRequires: mvn(relaxngDatatype:relaxngDatatype) +%endif +Requires: %{name}-core = %{version}-%{release} +Requires: %{name}-runtime = %{version}-%{release} +Requires: %{name}-txw2 = %{version}-%{release} +%if %{without jp_minimal} Requires: %{name}-bom = %{version}-%{release} Requires: %{name}-bom-ext = %{version}-%{release} Requires: %{name}-codemodel = %{version}-%{release} Requires: %{name}-codemodel-annotation-compiler = %{version}-%{release} Requires: %{name}-codemodel-parent = %{version}-%{release} -Requires: %{name}-core = %{version}-%{release} Requires: %{name}-external-parent = %{version}-%{release} Requires: %{name}-jxc = %{version}-%{release} Requires: %{name}-parent = %{version}-%{release} Requires: %{name}-rngom = %{version}-%{release} -Requires: %{name}-runtime = %{version}-%{release} Requires: %{name}-runtime-parent = %{version}-%{release} -Requires: %{name}-txw2 = %{version}-%{release} Requires: %{name}-txwc2 = %{version}-%{release} Requires: %{name}-txw-parent = %{version}-%{release} Requires: %{name}-xjc = %{version}-%{release} +%endif Obsoletes: glassfish-jaxb1-impl < 2.2.11-12 @@ -51,6 +59,26 @@ BuildArch: noarch %description GlassFish JAXB Reference Implementation. +%package core +Summary: JAXB Core + +%description core +JAXB Core module. Contains sources required by XJC, JXC and Runtime +modules. + +%package runtime +Summary: JAXB Runtime + +%description runtime +JAXB (JSR 222) Reference Implementation + +%package txw2 +Summary: TXW2 Runtime + +%description txw2 +TXW is a library that allows you to write XML documents. + +%if %{without jp_minimal} %package codemodel Summary: Codemodel Core @@ -83,13 +111,6 @@ Summary: Codemodel parent POM %description codemodel-parent This package contains codemodel parent POM. -%package core -Summary: JAXB Core - -%description core -JAXB Core module. Contains sources required by XJC, JXC and Runtime -modules. - %package external-parent Summary: JAXB External parent POM @@ -108,12 +129,6 @@ Summary: JAXB parent POM %description parent This package contains parent POM. -%package runtime -Summary: JAXB Runtime - -%description runtime -JAXB (JSR 222) Reference Implementation - %package runtime-parent Summary: JAXB Runtime parent POM @@ -140,18 +155,13 @@ Summary: RELAX NG Object Model/Parser %description rngom This package contains RELAX NG Object Model/Parser. -%package txw2 -Summary: TXW2 Runtime - -%description txw2 -TXW is a library that allows you to write XML documents. - %package txwc2 Summary: TXW2 Compiler %description txwc2 JAXB schema generator. The tool to generate XML schema based on java classes. +%endif %package javadoc Summary: Javadocs for %{name} @@ -162,7 +172,10 @@ This package contains the API documentation for %{name}. %prep %setup -q -c +%if %{with jp_minimal} %patch0 -p1 +%endif +%patch1 -p1 # Disable unneeded OSGi bundles %pom_disable_module xjc bundles @@ -180,6 +193,7 @@ This package contains the API documentation for %{name}. # Disable ancient jaxb1 runtime %pom_disable_module jaxb1 runtime +# Fix hard-coded tools location %pom_remove_dep com.sun:tools %pom_add_dep_mgmt com.sun:tools %pom_remove_dep com.sun:tools jxc @@ -193,13 +207,33 @@ This package contains the API documentation for %{name}. %pom_remove_plugin :maven-source-plugin jxc %pom_remove_plugin :maven-source-plugin xjc +%if %{with jp_minimal} +# For minimal build disable all modules with extra deps +%pom_disable_module codemodel +%pom_disable_module external +%pom_disable_module jxc +%pom_disable_module compiler txw +%pom_disable_module xjc +# For minimal build of impl module, don't compile in support for extra deps +%pom_remove_dep org.jvnet.staxex:stax-ex runtime/impl +%pom_remove_dep com.sun.xml.fastinfoset:FastInfoset runtime/impl +rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/{FastInfoset,StAXEx}Connector.java +rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,StAXEx}StreamWriterOutput.java +%endif + %mvn_alias org.glassfish.jaxb:jaxb-xjc "com.sun.xml.bind:jaxb-xjc" +# Package OSGi version of runtime with the non-OSGi version +%mvn_package com.sun.xml.bind:jaxb-impl jaxb-runtime + # Don't install bundles parent pom %mvn_package com.sun.xml.bind.mvn:jaxb-bundles __noinstall -# Package OSGi version of runtime with the non-OSGi version -%mvn_package com.sun.xml.bind:jaxb-impl jaxb-runtime +%if %{with jp_minimal} +# Don't install aggregator poms or boms for minimal build +%mvn_package com.sun.xml.bind.mvn: __noinstall +%mvn_package :jaxb-bom* __noinstall +%endif %build %mvn_build -f -s -- -Ddev -DbuildNumber=unknown @@ -210,6 +244,16 @@ This package contains the API documentation for %{name}. %files %license License.txt licenceheader.txt License.html +%files core -f .mfiles-jaxb-core +%license License.txt licenceheader.txt License.html + +%files runtime -f .mfiles-jaxb-runtime +%license License.txt licenceheader.txt License.html + +%files txw2 -f .mfiles-txw2 +%license License.txt licenceheader.txt License.html + +%if %{without jp_minimal} %files codemodel -f .mfiles-codemodel %license License.txt licenceheader.txt License.html @@ -222,9 +266,6 @@ This package contains the API documentation for %{name}. %files codemodel-parent -f .mfiles-jaxb-codemodel-parent -%files core -f .mfiles-jaxb-core -%license License.txt licenceheader.txt License.html - %files external-parent -f .mfiles-jaxb-external-parent %files jxc -f .mfiles-jaxb-jxc @@ -232,9 +273,6 @@ This package contains the API documentation for %{name}. %files parent -f .mfiles-jaxb-parent -%files runtime -f .mfiles-jaxb-runtime -%license License.txt licenceheader.txt License.html - %files runtime-parent -f .mfiles-jaxb-runtime-parent %files txw-parent -f .mfiles-jaxb-txw-parent @@ -244,17 +282,18 @@ This package contains the API documentation for %{name}. %files rngom -f .mfiles-rngom %license License.txt licenceheader.txt License.html -%files txw2 -f .mfiles-txw2 -%license License.txt licenceheader.txt License.html - %files txwc2 -f .mfiles-txwc2 %license License.txt licenceheader.txt License.html +%endif %files javadoc -f .mfiles-javadoc %license License.txt licenceheader.txt License.html %changelog +* Fri May 10 2019 Mat Booth - 2.2.11-13 +- Add conditional build for reduced dependency set + * Thu May 09 2019 Mat Booth - 2.2.11-12 - Disable ancient jaxb1 runtime - Enable OSGi bundle version of the runtime From 1505704139e45875c6bb3665226af043d105088b Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 10 May 2019 17:50:19 +0100 Subject: [PATCH 28/36] Make javax.activation an optional dep in OSGi metadata --- glassfish-jaxb.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 25be432..889f100 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -3,7 +3,7 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 13%{?dist} +Release: 14%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -190,6 +190,10 @@ This package contains the API documentation for %{name}. \${project.build.outputDirectory}/META-INF/MANIFEST.MF " bundles/core bundles/runtime +# Make javax.activation an optional dep +%pom_xpath_inject "pom:configuration/pom:instructions" " +javax.activation;resolution:=optional,*" bundles/runtime + # Disable ancient jaxb1 runtime %pom_disable_module jaxb1 runtime @@ -291,6 +295,9 @@ rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,St %changelog +* Fri May 10 2019 Mat Booth - 2.2.11-14 +- Make javax.activation an optional dep in OSGi metadata + * Fri May 10 2019 Mat Booth - 2.2.11-13 - Add conditional build for reduced dependency set From 5ef5fac8980f17b1a84c3d23f7e51e26f50b9649 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 03:37:03 +0000 Subject: [PATCH 29/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 889f100..84cf595 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -3,7 +3,7 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 14%{?dist} +Release: 15%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -295,6 +295,9 @@ rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,St %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.2.11-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri May 10 2019 Mat Booth - 2.2.11-14 - Make javax.activation an optional dep in OSGi metadata From 5b9dd449b767a80fcc68851c256b44a4e4f63527 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 22:07:06 +0000 Subject: [PATCH 30/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 84cf595..5b38568 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -3,7 +3,7 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 15%{?dist} +Release: 16%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -295,6 +295,9 @@ rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,St %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 2.2.11-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Thu Jul 25 2019 Fedora Release Engineering - 2.2.11-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From c3a94372ddc42c07fcc14ab3ea96f7ad225fddf7 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sat, 18 Apr 2020 12:05:02 +0200 Subject: [PATCH 31/36] build with reduced functionality and dependencies --- glassfish-jaxb.spec | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 5b38568..c2acad4 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,9 +1,9 @@ # Conditionally build with a minimal dependency set -%bcond_with jp_minimal +%bcond_without jp_minimal Name: glassfish-jaxb Version: 2.2.11 -Release: 16%{?dist} +Release: 17%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -52,6 +52,23 @@ Requires: %{name}-txw-parent = %{version}-%{release} Requires: %{name}-xjc = %{version}-%{release} %endif +%if %{with jp_minimal} +%global obsolete_evr 2.2.11-17 +Obsoletes: %{name}-bom < %{obsolete_evr} +Obsoletes: %{name}-bom-ext < %{obsolete_evr} +Obsoletes: %{name}-codemodel < %{obsolete_evr} +Obsoletes: %{name}-codemodel-annotation-compiler < %{obsolete_evr} +Obsoletes: %{name}-codemodel-parent < %{obsolete_evr} +Obsoletes: %{name}-external-parent < %{obsolete_evr} +Obsoletes: %{name}-jxc < %{obsolete_evr} +Obsoletes: %{name}-parent < %{obsolete_evr} +Obsoletes: %{name}-rngom < %{obsolete_evr} +Obsoletes: %{name}-runtime-parent < %{obsolete_evr} +Obsoletes: %{name}-txwc2 < %{obsolete_evr} +Obsoletes: %{name}-txw-parent < %{obsolete_evr} +Obsoletes: %{name}-xjc < %{obsolete_evr} +%endif + Obsoletes: glassfish-jaxb1-impl < 2.2.11-12 BuildArch: noarch @@ -295,6 +312,9 @@ rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,St %changelog +* Sat Apr 18 2020 Fabio Valentini - 2.2.11-17 +- Build with reduced functionality and dependencies. + * Tue Jan 28 2020 Fedora Release Engineering - 2.2.11-16 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 23844bd9dfd38e052fa43bddd69bd8bc400d6aa4 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Mon, 11 May 2020 15:56:10 +0200 Subject: [PATCH 32/36] enable non-minimal build again --- glassfish-jaxb.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index c2acad4..1860dcf 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -1,9 +1,9 @@ # Conditionally build with a minimal dependency set -%bcond_without jp_minimal +%bcond_with jp_minimal Name: glassfish-jaxb Version: 2.2.11 -Release: 17%{?dist} +Release: 18%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -312,6 +312,9 @@ rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,St %changelog +* Mon May 11 2020 Fabio Valentini - 2.2.11-18 +- Enable non-minimal build again. + * Sat Apr 18 2020 Fabio Valentini - 2.2.11-17 - Build with reduced functionality and dependencies. From c144b22992e8a2658301fdb6dce9f70c44626f75 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 20:13:59 +0200 Subject: [PATCH 33/36] Rebuilt for JDK-11 --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 1860dcf..04e6ee7 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -3,7 +3,7 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 18%{?dist} +Release: 19%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -312,6 +312,9 @@ rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,St %changelog +* Fri Jul 10 2020 Jiri Vanek - 2.2.11-19 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + * Mon May 11 2020 Fabio Valentini - 2.2.11-18 - Enable non-minimal build again. From dba1440081bb7efadaf07f2854a3938f9c7f0edb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 20:11:18 +0000 Subject: [PATCH 34/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- glassfish-jaxb.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 04e6ee7..0e2e9f8 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -3,7 +3,7 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 19%{?dist} +Release: 20%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -312,6 +312,9 @@ rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,St %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 2.2.11-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Fri Jul 10 2020 Jiri Vanek - 2.2.11-19 - Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 From 2a2e0c137479f7b68be729c6531da48c8a39d8af Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 01:54:34 +0000 Subject: [PATCH 35/36] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- glassfish-jaxb.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec index 0e2e9f8..64a2160 100644 --- a/glassfish-jaxb.spec +++ b/glassfish-jaxb.spec @@ -3,7 +3,7 @@ Name: glassfish-jaxb Version: 2.2.11 -Release: 20%{?dist} +Release: 21%{?dist} Summary: JAXB Reference Implementation License: CDDL-1.1 and GPLv2 with exceptions @@ -312,6 +312,10 @@ rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,St %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 2.2.11-21 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 2.2.11-20 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 67ccf3d54d3d4ecab7361a732cec69b50571894a Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Mon, 10 Aug 2020 15:58:54 +0100 Subject: [PATCH 36/36] Update to latest upstream release Disable javadocs for now, due to https://github.com/fedora-java/xmvn/issues/58 Upstream moved to eclipse-ee4j and implementation license changed to BSD (EDL) Enable tests, don't unnecessarily ship parent poms Rename package from glassfish-jaxb --- .gitignore | 1 + ...pendency-on-istack-commons-from-main.patch | 1608 +++++++++-------- 0002-Port-to-latest-version-of-args4j.patch | 159 -- glassfish-jaxb.spec | 419 ----- jaxb.spec | 316 ++++ sources | 2 +- 6 files changed, 1124 insertions(+), 1381 deletions(-) rename 0001-Avoid-unnecessary-dep-on-istack-commons.patch => 0001-Avoid-runtime-dependency-on-istack-commons-from-main.patch (53%) delete mode 100644 0002-Port-to-latest-version-of-args4j.patch delete mode 100644 glassfish-jaxb.spec create mode 100644 jaxb.spec diff --git a/.gitignore b/.gitignore index 621ee41..e689ab6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /glassfish-jaxb-2.2.5.tar.gz /jaxb-ri-2.2.11.src.zip +/2.3.3-RI.tar.gz diff --git a/0001-Avoid-unnecessary-dep-on-istack-commons.patch b/0001-Avoid-runtime-dependency-on-istack-commons-from-main.patch similarity index 53% rename from 0001-Avoid-unnecessary-dep-on-istack-commons.patch rename to 0001-Avoid-runtime-dependency-on-istack-commons-from-main.patch index 498dde9..3dc8791 100644 --- a/0001-Avoid-unnecessary-dep-on-istack-commons.patch +++ b/0001-Avoid-runtime-dependency-on-istack-commons-from-main.patch @@ -1,94 +1,547 @@ -From c8d1de91c950a80508e23b791c475bca9b377616 Mon Sep 17 00:00:00 2001 +From d7988b7d7846fb9e6676c700ab21513903f68303 Mon Sep 17 00:00:00 2001 From: Mat Booth -Date: Fri, 10 May 2019 10:40:17 +0100 -Subject: [PATCH 1/2] Avoid unnecessary dep on istack-commons +Date: Tue, 11 Aug 2020 11:46:45 +0100 +Subject: [PATCH] Avoid runtime dependency on istack-commons from main impl jar --- - core/pom.xml | 6 +- - .../sun/xml/bind/marshaller/SAX2DOMEx.java | 4 +- + jaxb-ri/bundles/runtime/pom.xml | 9 +- + .../runtime/src/main/java/module-info.java | 3 - + jaxb-ri/runtime/impl/pom.xml | 4 - + .../java/com/sun/xml/bind/api/Bridge.java | 54 +++++----- + .../com/sun/xml/bind/api/ClassResolver.java | 4 +- + .../com/sun/xml/bind/api/JAXBRIContext.java | 52 +++++---- + .../sun/xml/bind/marshaller/SAX2DOMEx.java | 3 +- + .../com/sun/xml/bind/v2/ContextFactory.java | 5 +- .../v2/model/annotation/AnnotationReader.java | 4 - .../xml/bind/v2/model/core/PropertyInfo.java | 3 +- - .../java/com/sun/xml/bind/api/Bridge.java | 54 ++++---- - .../com/sun/xml/bind/api/ClassResolver.java | 4 +- - .../com/sun/xml/bind/api/JAXBRIContext.java | 52 ++++--- - .../com/sun/xml/bind/v2/ContextFactory.java | 6 +- - .../v2/model/impl/ByteArrayDataSource.java | 95 +++++++++++++ - .../xml/bind/v2/model/impl/ClassInfoImpl.java | 8 +- - .../bind/v2/model/impl/ElementInfoImpl.java | 6 +- - .../model/impl/ElementPropertyInfoImpl.java | 4 +- + .../v2/model/impl/ByteArrayDataSource.java | 65 +++++++++++ + .../xml/bind/v2/model/impl/ClassInfoImpl.java | 7 +- + .../bind/v2/model/impl/ElementInfoImpl.java | 5 +- + .../model/impl/ElementPropertyInfoImpl.java | 3 +- .../impl/RuntimeBuiltinLeafInfoImpl.java | 1 - .../v2/model/impl/RuntimeClassInfoImpl.java | 3 +- .../v2/model/impl/RuntimeModelBuilder.java | 3 +- .../xml/bind/v2/runtime/BridgeAdapter.java | 11 +- .../sun/xml/bind/v2/runtime/BridgeImpl.java | 9 +- - .../bind/v2/runtime/ClassBeanInfoImpl.java | 6 +- - .../v2/runtime/ContentHandlerAdaptor.java | 14 +- + .../bind/v2/runtime/ClassBeanInfoImpl.java | 5 +- + .../v2/runtime/ContentHandlerAdaptor.java | 12 +-- .../xml/bind/v2/runtime/FilterTransducer.java | 3 +- .../v2/runtime/InlineBinaryTransducer.java | 3 +- - .../xml/bind/v2/runtime/JAXBContextImpl.java | 16 +-- + .../xml/bind/v2/runtime/JAXBContextImpl.java | 16 ++- .../sun/xml/bind/v2/runtime/JaxBeanInfo.java | 3 +- .../bind/v2/runtime/NamespaceContext2.java | 3 +- - .../com/sun/xml/bind/v2/runtime/Pool.java | 131 ++++++++++++++++++ + .../com/sun/xml/bind/v2/runtime/Pool.java | 101 ++++++++++++++++++ .../sun/xml/bind/v2/runtime/Transducer.java | 7 +- - .../v2/runtime/ValueListBeanInfoImpl.java | 4 +- - .../xml/bind/v2/runtime/XMLSerializer.java | 12 +- - .../bind/v2/runtime/output/C14nXmlOutput.java | 4 +- + .../v2/runtime/ValueListBeanInfoImpl.java | 3 +- + .../xml/bind/v2/runtime/XMLSerializer.java | 11 +- + .../bind/v2/runtime/output/C14nXmlOutput.java | 3 +- .../runtime/output/NamespaceContextImpl.java | 6 +- .../xml/bind/v2/runtime/reflect/Accessor.java | 3 +- - .../xml/bind/v2/runtime/reflect/Lister.java | 4 +- - .../runtime/reflect/TransducedAccessor.java | 10 +- - .../v2/runtime/unmarshaller/Base64Data.java | 7 +- - .../unmarshaller/UnmarshallingContext.java | 12 +- + .../xml/bind/v2/runtime/reflect/Lister.java | 3 +- + .../runtime/reflect/TransducedAccessor.java | 9 +- + .../v2/runtime/unmarshaller/Base64Data.java | 8 +- + .../unmarshaller/UnmarshallingContext.java | 11 +- .../runtime/unmarshaller/XsiTypeLoader.java | 3 +- .../bind/v2/schemagen/XmlSchemaGenerator.java | 6 +- - 37 files changed, 359 insertions(+), 171 deletions(-) - create mode 100644 runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java - create mode 100644 runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java + .../impl/src/main/java/module-info.java | 1 - + jaxb-ri/xjc/pom.xml | 4 + + 41 files changed, 290 insertions(+), 182 deletions(-) + create mode 100644 jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java + create mode 100644 jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java -diff --git a/core/pom.xml b/core/pom.xml -index 10be5d6..6330d8a 100644 ---- a/core/pom.xml -+++ b/core/pom.xml -@@ -67,10 +67,6 @@ holder. +diff --git a/jaxb-ri/bundles/runtime/pom.xml b/jaxb-ri/bundles/runtime/pom.xml +index 9277e9b..5d481ed 100644 +--- a/jaxb-ri/bundles/runtime/pom.xml ++++ b/jaxb-ri/bundles/runtime/pom.xml +@@ -67,11 +67,6 @@ + txw2 + provided + +- +- com.sun.istack +- istack-commons-runtime +- provided +- + + + junit +@@ -129,7 +124,7 @@ + unpack-dependencies + + +- org.glassfish.jaxb,com.sun.istack ++ org.glassfish.jaxb + provided + sources + true +@@ -144,7 +139,7 @@ + unpack-dependencies + + +- org.glassfish.jaxb,com.sun.istack ++ org.glassfish.jaxb + provided + sources + true +diff --git a/jaxb-ri/bundles/runtime/src/main/java/module-info.java b/jaxb-ri/bundles/runtime/src/main/java/module-info.java +index 252fefe..2fa8190 100644 +--- a/jaxb-ri/bundles/runtime/src/main/java/module-info.java ++++ b/jaxb-ri/bundles/runtime/src/main/java/module-info.java +@@ -20,9 +20,6 @@ module com.sun.xml.bind { + requires static com.sun.xml.fastinfoset; + requires static org.jvnet.staxex; + +- exports com.sun.istack; +- exports com.sun.istack.localization; +- exports com.sun.istack.logging; + exports com.sun.xml.bind; + exports com.sun.xml.bind.annotation; + exports com.sun.xml.bind.api; +diff --git a/jaxb-ri/runtime/impl/pom.xml b/jaxb-ri/runtime/impl/pom.xml +index 67390ff..3b38efd 100644 +--- a/jaxb-ri/runtime/impl/pom.xml ++++ b/jaxb-ri/runtime/impl/pom.xml +@@ -56,10 +56,6 @@ + ${project.groupId} txw2 - ${project.version} - - com.sun.istack - istack-commons-runtime - - -- -\ No newline at end of file -+ -diff --git a/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java b/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java -index fd63b6b..0b97a47 100644 ---- a/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java -+++ b/core/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java -@@ -46,7 +46,7 @@ import javax.xml.parsers.DocumentBuilderFactory; + + org.jvnet.staxex +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java +index fb20366..5e7b035 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java +@@ -24,8 +24,6 @@ import javax.xml.stream.XMLStreamWriter; + import javax.xml.transform.Result; + import javax.xml.transform.Source; + +-import com.sun.istack.NotNull; +-import com.sun.istack.Nullable; + import com.sun.xml.bind.v2.runtime.BridgeContextImpl; + import com.sun.xml.bind.v2.runtime.JAXBContextImpl; + +@@ -61,7 +59,7 @@ public abstract class Bridge { + * + * @since 2.1 + */ +- public @NotNull JAXBRIContext getContext() { ++ public JAXBRIContext getContext() { + return context; + } + +@@ -83,11 +81,11 @@ public abstract class Bridge { + context.marshallerPool.recycle(m); + } + +- public final void marshal(@NotNull BridgeContext context,T object,XMLStreamWriter output) throws JAXBException { ++ public final void marshal(BridgeContext context,T object,XMLStreamWriter output) throws JAXBException { + marshal( ((BridgeContextImpl)context).marshaller, object, output ); + } + +- public abstract void marshal(@NotNull Marshaller m,T object,XMLStreamWriter output) throws JAXBException; ++ public abstract void marshal(Marshaller m,T object,XMLStreamWriter output) throws JAXBException; + + + /** +@@ -117,11 +115,11 @@ public abstract class Bridge { + context.marshallerPool.recycle(m); + } + +- public final void marshal(@NotNull BridgeContext context,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException { ++ public final void marshal(BridgeContext context,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException { + marshal( ((BridgeContextImpl)context).marshaller, object, output, nsContext ); + } + +- public abstract void marshal(@NotNull Marshaller m,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException; ++ public abstract void marshal(Marshaller m,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException; + + + public final void marshal(T object,Node output) throws JAXBException { +@@ -130,11 +128,11 @@ public abstract class Bridge { + context.marshallerPool.recycle(m); + } + +- public final void marshal(@NotNull BridgeContext context,T object,Node output) throws JAXBException { ++ public final void marshal(BridgeContext context,T object,Node output) throws JAXBException { + marshal( ((BridgeContextImpl)context).marshaller, object, output ); + } + +- public abstract void marshal(@NotNull Marshaller m,T object,Node output) throws JAXBException; ++ public abstract void marshal(Marshaller m,T object,Node output) throws JAXBException; + + + /** +@@ -153,10 +151,10 @@ public abstract class Bridge { + m.setAttachmentMarshaller(null); + context.marshallerPool.recycle(m); + } +- public final void marshal(@NotNull BridgeContext context,T object, ContentHandler contentHandler) throws JAXBException { ++ public final void marshal(BridgeContext context,T object, ContentHandler contentHandler) throws JAXBException { + marshal( ((BridgeContextImpl)context).marshaller, object, contentHandler ); + } +- public abstract void marshal(@NotNull Marshaller m,T object, ContentHandler contentHandler) throws JAXBException; ++ public abstract void marshal(Marshaller m,T object, ContentHandler contentHandler) throws JAXBException; + + /** + * @since 2.0 EA4 +@@ -166,10 +164,10 @@ public abstract class Bridge { + marshal(m,object,result); + context.marshallerPool.recycle(m); + } +- public final void marshal(@NotNull BridgeContext context,T object, Result result) throws JAXBException { ++ public final void marshal(BridgeContext context,T object, Result result) throws JAXBException { + marshal( ((BridgeContextImpl)context).marshaller, object, result ); + } +- public abstract void marshal(@NotNull Marshaller m,T object, Result result) throws JAXBException; ++ public abstract void marshal(Marshaller m,T object, Result result) throws JAXBException; + + + +@@ -195,21 +193,21 @@ public abstract class Bridge { + * + * @since 2.0 EA1 + */ +- public final @NotNull T unmarshal(@NotNull XMLStreamReader in) throws JAXBException { ++ public final T unmarshal(XMLStreamReader in) throws JAXBException { + return unmarshal(in,null); + } + /** + * @since 2.0.3 + */ +- public final @NotNull T unmarshal(@NotNull XMLStreamReader in, @Nullable AttachmentUnmarshaller au) throws JAXBException { ++ public final T unmarshal(XMLStreamReader in, AttachmentUnmarshaller au) throws JAXBException { + Unmarshaller u = context.unmarshallerPool.take(); + u.setAttachmentUnmarshaller(au); + return exit(unmarshal(u,in),u); + } +- public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull XMLStreamReader in) throws JAXBException { ++ public final T unmarshal(BridgeContext context, XMLStreamReader in) throws JAXBException { + return unmarshal( ((BridgeContextImpl)context).unmarshaller, in ); + } +- public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull XMLStreamReader in) throws JAXBException; ++ public abstract T unmarshal(Unmarshaller u, XMLStreamReader in) throws JAXBException; + + /** + * Unmarshals the specified type object. +@@ -227,21 +225,21 @@ public abstract class Bridge { + * + * @since 2.0 EA1 + */ +- public final @NotNull T unmarshal(@NotNull Source in) throws JAXBException { ++ public final T unmarshal(Source in) throws JAXBException { + return unmarshal(in,null); + } + /** + * @since 2.0.3 + */ +- public final @NotNull T unmarshal(@NotNull Source in, @Nullable AttachmentUnmarshaller au) throws JAXBException { ++ public final T unmarshal(Source in, AttachmentUnmarshaller au) throws JAXBException { + Unmarshaller u = context.unmarshallerPool.take(); + u.setAttachmentUnmarshaller(au); + return exit(unmarshal(u,in),u); + } +- public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull Source in) throws JAXBException { ++ public final T unmarshal(BridgeContext context, Source in) throws JAXBException { + return unmarshal( ((BridgeContextImpl)context).unmarshaller, in ); + } +- public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull Source in) throws JAXBException; ++ public abstract T unmarshal(Unmarshaller u, Source in) throws JAXBException; + + /** + * Unmarshals the specified type object. +@@ -259,14 +257,14 @@ public abstract class Bridge { + * + * @since 2.0 EA1 + */ +- public final @NotNull T unmarshal(@NotNull InputStream in) throws JAXBException { ++ public final T unmarshal(InputStream in) throws JAXBException { + Unmarshaller u = context.unmarshallerPool.take(); + return exit(unmarshal(u,in),u); + } +- public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull InputStream in) throws JAXBException { ++ public final T unmarshal(BridgeContext context, InputStream in) throws JAXBException { + return unmarshal( ((BridgeContextImpl)context).unmarshaller, in ); + } +- public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull InputStream in) throws JAXBException; ++ public abstract T unmarshal(Unmarshaller u, InputStream in) throws JAXBException; + + /** + * Unmarshals the specified type object. +@@ -282,21 +280,21 @@ public abstract class Bridge { + * + * @since 2.0 FCS + */ +- public final @NotNull T unmarshal(@NotNull Node n) throws JAXBException { ++ public final T unmarshal(Node n) throws JAXBException { + return unmarshal(n,null); + } + /** + * @since 2.0.3 + */ +- public final @NotNull T unmarshal(@NotNull Node n, @Nullable AttachmentUnmarshaller au) throws JAXBException { ++ public final T unmarshal(Node n, AttachmentUnmarshaller au) throws JAXBException { + Unmarshaller u = context.unmarshallerPool.take(); + u.setAttachmentUnmarshaller(au); + return exit(unmarshal(u,n),u); + } +- public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull Node n) throws JAXBException { ++ public final T unmarshal(BridgeContext context, Node n) throws JAXBException { + return unmarshal( ((BridgeContextImpl)context).unmarshaller, n ); + } +- public abstract @NotNull T unmarshal(@NotNull Unmarshaller context, @NotNull Node n) throws JAXBException; ++ public abstract T unmarshal(Unmarshaller context, Node n) throws JAXBException; + + /** + * Gets the {@link TypeReference} from which this bridge was created. +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java +index b184668..612f5a2 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java +@@ -15,8 +15,6 @@ import javax.xml.bind.Unmarshaller; + import javax.xml.bind.ValidationEventHandler; + import javax.xml.bind.annotation.XmlAnyElement; + +-import com.sun.istack.NotNull; +-import com.sun.istack.Nullable; + + /** + * Dynamically locates classes to represent elements discovered during the unmarshalling. +@@ -85,5 +83,5 @@ public abstract class ClassResolver { + * reproted to {@link ValidationEventHandler} (just like any other error + * during the unmarshalling.) + */ +- public abstract @Nullable Class resolveElementName(@NotNull String nsUri, @NotNull String localName) throws Exception; ++ public abstract Class resolveElementName(String nsUri, String localName) throws Exception; + } +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java +index c8611d9..1a28dc6 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java +@@ -25,8 +25,6 @@ import javax.xml.bind.annotation.XmlAttachmentRef; + import javax.xml.namespace.QName; + import javax.xml.transform.Result; + +-import com.sun.istack.NotNull; +-import com.sun.istack.Nullable; + import com.sun.xml.bind.api.impl.NameConverter; + import com.sun.xml.bind.v2.ContextFactory; + import com.sun.xml.bind.v2.model.annotation.RuntimeAnnotationReader; +@@ -73,11 +71,11 @@ public abstract class JAXBRIContext extends JAXBContext { + * Can be null. + * @since JAXB 2.1 EA2 + */ +- public static JAXBRIContext newInstance(@NotNull Class[] classes, +- @Nullable Collection typeRefs, +- @Nullable Map subclassReplacements, +- @Nullable String defaultNamespaceRemap, boolean c14nSupport, +- @Nullable RuntimeAnnotationReader ar) throws JAXBException { ++ public static JAXBRIContext newInstance(Class[] classes, ++ Collection typeRefs, ++ Map subclassReplacements, ++ String defaultNamespaceRemap, boolean c14nSupport, ++ RuntimeAnnotationReader ar) throws JAXBException { + return newInstance(classes, typeRefs, subclassReplacements, + defaultNamespaceRemap, c14nSupport, ar, false, false, false, false); + } +@@ -115,11 +113,11 @@ public abstract class JAXBRIContext extends JAXBContext { + * @param supressAccessorWarnings + * See {@link #SUPRESS_ACCESSOR_WARNINGS} for the meaning of this parameter. + */ +- public static JAXBRIContext newInstance(@NotNull Class[] classes, +- @Nullable Collection typeRefs, +- @Nullable Map subclassReplacements, +- @Nullable String defaultNamespaceRemap, boolean c14nSupport, +- @Nullable RuntimeAnnotationReader ar, ++ public static JAXBRIContext newInstance(Class[] classes, ++ Collection typeRefs, ++ Map subclassReplacements, ++ String defaultNamespaceRemap, boolean c14nSupport, ++ RuntimeAnnotationReader ar, + boolean xmlAccessorFactorySupport, + boolean allNillable, + boolean retainPropertyInfo, +@@ -141,9 +139,9 @@ public abstract class JAXBRIContext extends JAXBContext { + * @deprecated + * Compatibility with older versions. + */ +- public static JAXBRIContext newInstance(@NotNull Class[] classes, +- @Nullable Collection typeRefs, +- @Nullable String defaultNamespaceRemap, boolean c14nSupport ) throws JAXBException { ++ public static JAXBRIContext newInstance(Class[] classes, ++ Collection typeRefs, ++ String defaultNamespaceRemap, boolean c14nSupport ) throws JAXBException { + return newInstance(classes,typeRefs, Collections.emptyMap(), + defaultNamespaceRemap,c14nSupport,null); + } +@@ -167,7 +165,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * + * @since 2.0 EA1 + */ +- public abstract @Nullable QName getElementName(@NotNull Object o) throws JAXBException; ++ public abstract QName getElementName(Object o) throws JAXBException; + + /** + * Allows to retrieve the element name based on Class. +@@ -176,7 +174,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * @throws javax.xml.bind.JAXBException + * @since 2.1.10 + */ +- public abstract @Nullable QName getElementName(@NotNull Class o) throws JAXBException; ++ public abstract QName getElementName(Class o) throws JAXBException; + + /** + * Creates a mini-marshaller/unmarshaller that can process a {@link TypeReference}. +@@ -186,7 +184,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * + * @since 2.0 EA1 + */ +- public abstract Bridge createBridge(@NotNull TypeReference ref); ++ public abstract Bridge createBridge(TypeReference ref); + + /** + * Creates a new {@link BridgeContext} instance. +@@ -196,7 +194,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * + * @since 2.0 EA1 + */ +- public abstract @NotNull BridgeContext createBridgeContext(); ++ public abstract BridgeContext createBridgeContext(); + + /** + * Gets a {@link RawAccessor} for the specified element property of the specified wrapper bean class. +@@ -244,7 +242,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * + * @since 2.0 EA2 + */ +- public abstract @NotNull List getKnownNamespaceURIs(); ++ public abstract List getKnownNamespaceURIs(); + + + /** +@@ -272,7 +270,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * if {@link SchemaOutputResolver} throws an {@link IOException}. + */ + @Override +- public abstract void generateSchema(@NotNull SchemaOutputResolver outputResolver) throws IOException; ++ public abstract void generateSchema(SchemaOutputResolver outputResolver) throws IOException; + + /** + * Returns the name of the XML Type bound to the +@@ -289,7 +287,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * @return null + * if the referenced type is an anonymous and therefore doesn't have a name. + */ +- public abstract QName getTypeName(@NotNull TypeReference tr); ++ public abstract QName getTypeName(TypeReference tr); + + /** + * Gets the build information of the JAXB runtime. +@@ -298,7 +296,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * may be null, if the runtime is loaded by a class loader that doesn't support + * the access to the manifest informatino. + */ +- public abstract @NotNull String getBuildId(); ++ public abstract String getBuildId(); + + /** + * Generates the episode file that represents the binding known to this {@link JAXBContext}, +@@ -342,7 +340,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * @return + * Typically, this method returns "nameLikeThis". + */ +- public static @NotNull String mangleNameToVariableName(@NotNull String localName) { ++ public static String mangleNameToVariableName(String localName) { + return NameConverter.standard.toVariableName(localName); + } + +@@ -355,7 +353,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * @return + * Typically, this method returns "NameLikeThis". + */ +- public static @NotNull String mangleNameToClassName(@NotNull String localName) { ++ public static String mangleNameToClassName(String localName) { + return NameConverter.standard.toClassName(localName); + } + +@@ -370,7 +368,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * @return + * Typically, this method returns "NameLikeThis". + */ +- public static @NotNull String mangleNameToPropertyName(@NotNull String localName) { ++ public static String mangleNameToPropertyName(String localName) { + return NameConverter.standard.toPropertyName(localName); + } + +@@ -400,7 +398,7 @@ public abstract class JAXBRIContext extends JAXBContext { + * or null if the type is not assignable to the base type. + * @since 2.0 FCS + */ +- public static @Nullable Type getBaseType(@NotNull Type type, @NotNull Class baseType) { ++ public static Type getBaseType(Type type, Class baseType) { + return Utils.REFLECTION_NAVIGATOR.getBaseClass(type, baseType); + } + +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java +index a7e0dd0..65d9e0f 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/marshaller/SAX2DOMEx.java +@@ -16,7 +16,6 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import com.sun.xml.bind.util.Which; -import com.sun.istack.FinalArrayList; -+import java.util.ArrayList; import com.sun.xml.bind.v2.util.XmlFactory; import org.w3c.dom.Document; -@@ -68,7 +68,7 @@ public class SAX2DOMEx implements ContentHandler { +@@ -38,7 +37,7 @@ public class SAX2DOMEx implements ContentHandler { private Node node = null; private boolean isConsolidate; protected final Stack nodeStack = new Stack(); - private final FinalArrayList unprocessedNamespaces = new FinalArrayList(); -+ private final ArrayList unprocessedNamespaces = new ArrayList(); ++ private final java.util.ArrayList unprocessedNamespaces = new java.util.ArrayList(); /** * Document object that owns the specified node. */ -diff --git a/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java b/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java -index 744d806..a5e5623 100644 ---- a/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java -+++ b/core/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java -@@ -44,7 +44,6 @@ import java.lang.annotation.Annotation; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java +index a05635f..5ae425c 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java +@@ -25,7 +25,6 @@ import java.util.logging.Level; + import javax.xml.bind.JAXBContext; + import javax.xml.bind.JAXBException; + +-import com.sun.istack.FinalArrayList; + import com.sun.xml.bind.Utils; + import com.sun.xml.bind.api.JAXBRIContext; + import com.sun.xml.bind.api.TypeReference; +@@ -222,7 +221,7 @@ public class ContextFactory { + */ + public static JAXBContext createContext( String contextPath, + ClassLoader classLoader, Map properties ) throws JAXBException { +- FinalArrayList classes = new FinalArrayList(); ++ java.util.ArrayList classes = new java.util.ArrayList(); + StringTokenizer tokens = new StringTokenizer(contextPath,":"); + List indexedClasses; + +@@ -285,7 +284,7 @@ public class ContextFactory { + BufferedReader in = + new BufferedReader(new InputStreamReader(resourceAsStream, "UTF-8")); + try { +- FinalArrayList classes = new FinalArrayList(); ++ java.util.ArrayList classes = new java.util.ArrayList(); + String className = in.readLine(); + while (className != null) { + className = className.trim(); +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java +index cb097ae..06bd0d9 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/annotation/AnnotationReader.java +@@ -14,7 +14,6 @@ import java.lang.annotation.Annotation; import java.lang.reflect.Field; import java.lang.reflect.Method; @@ -96,7 +549,7 @@ index 744d806..a5e5623 100644 import com.sun.xml.bind.v2.model.core.ErrorHandler; /** -@@ -140,20 +139,17 @@ public interface AnnotationReader { +@@ -110,20 +109,17 @@ public interface AnnotationReader { * @return null * if the annotation was not found. */ @@ -117,11 +570,11 @@ index 744d806..a5e5623 100644 A getPackageAnnotation(Class annotation, C clazz, Locatable srcpos); /** -diff --git a/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java b/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java -index badcdd6..f483fea 100644 ---- a/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java -+++ b/core/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java -@@ -49,7 +49,6 @@ import javax.xml.bind.annotation.XmlType; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java +index af5431c..20c7524 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/core/PropertyInfo.java +@@ -19,7 +19,6 @@ import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlSchemaType; import javax.xml.namespace.QName; @@ -129,462 +582,27 @@ index badcdd6..f483fea 100644 import com.sun.xml.bind.v2.model.annotation.AnnotationSource; /** -@@ -163,5 +162,5 @@ public interface PropertyInfo extends AnnotationSource { +@@ -133,5 +132,5 @@ public interface PropertyInfo extends AnnotationSource { * when this returns non-null, it overrides the type names of all types * that are in this property.) */ - @Nullable QName getSchemaType(); + QName getSchemaType(); } -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java b/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java -index 23a688b..e7aba9e 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/api/Bridge.java -@@ -54,8 +54,6 @@ import javax.xml.stream.XMLStreamWriter; - import javax.xml.transform.Result; - import javax.xml.transform.Source; - --import com.sun.istack.NotNull; --import com.sun.istack.Nullable; - import com.sun.xml.bind.v2.runtime.BridgeContextImpl; - import com.sun.xml.bind.v2.runtime.JAXBContextImpl; - -@@ -91,7 +89,7 @@ public abstract class Bridge { - * - * @since 2.1 - */ -- public @NotNull JAXBRIContext getContext() { -+ public JAXBRIContext getContext() { - return context; - } - -@@ -113,11 +111,11 @@ public abstract class Bridge { - context.marshallerPool.recycle(m); - } - -- public final void marshal(@NotNull BridgeContext context,T object,XMLStreamWriter output) throws JAXBException { -+ public final void marshal( BridgeContext context,T object,XMLStreamWriter output) throws JAXBException { - marshal( ((BridgeContextImpl)context).marshaller, object, output ); - } - -- public abstract void marshal(@NotNull Marshaller m,T object,XMLStreamWriter output) throws JAXBException; -+ public abstract void marshal( Marshaller m,T object,XMLStreamWriter output) throws JAXBException; - - - /** -@@ -147,11 +145,11 @@ public abstract class Bridge { - context.marshallerPool.recycle(m); - } - -- public final void marshal(@NotNull BridgeContext context,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException { -+ public final void marshal( BridgeContext context,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException { - marshal( ((BridgeContextImpl)context).marshaller, object, output, nsContext ); - } - -- public abstract void marshal(@NotNull Marshaller m,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException; -+ public abstract void marshal( Marshaller m,T object,OutputStream output, NamespaceContext nsContext) throws JAXBException; - - - public final void marshal(T object,Node output) throws JAXBException { -@@ -160,11 +158,11 @@ public abstract class Bridge { - context.marshallerPool.recycle(m); - } - -- public final void marshal(@NotNull BridgeContext context,T object,Node output) throws JAXBException { -+ public final void marshal( BridgeContext context,T object,Node output) throws JAXBException { - marshal( ((BridgeContextImpl)context).marshaller, object, output ); - } - -- public abstract void marshal(@NotNull Marshaller m,T object,Node output) throws JAXBException; -+ public abstract void marshal( Marshaller m,T object,Node output) throws JAXBException; - - - /** -@@ -183,10 +181,10 @@ public abstract class Bridge { - m.setAttachmentMarshaller(null); - context.marshallerPool.recycle(m); - } -- public final void marshal(@NotNull BridgeContext context,T object, ContentHandler contentHandler) throws JAXBException { -+ public final void marshal( BridgeContext context,T object, ContentHandler contentHandler) throws JAXBException { - marshal( ((BridgeContextImpl)context).marshaller, object, contentHandler ); - } -- public abstract void marshal(@NotNull Marshaller m,T object, ContentHandler contentHandler) throws JAXBException; -+ public abstract void marshal( Marshaller m,T object, ContentHandler contentHandler) throws JAXBException; - - /** - * @since 2.0 EA4 -@@ -196,10 +194,10 @@ public abstract class Bridge { - marshal(m,object,result); - context.marshallerPool.recycle(m); - } -- public final void marshal(@NotNull BridgeContext context,T object, Result result) throws JAXBException { -+ public final void marshal( BridgeContext context,T object, Result result) throws JAXBException { - marshal( ((BridgeContextImpl)context).marshaller, object, result ); - } -- public abstract void marshal(@NotNull Marshaller m,T object, Result result) throws JAXBException; -+ public abstract void marshal( Marshaller m,T object, Result result) throws JAXBException; - - - -@@ -225,21 +223,21 @@ public abstract class Bridge { - * - * @since 2.0 EA1 - */ -- public final @NotNull T unmarshal(@NotNull XMLStreamReader in) throws JAXBException { -+ public final T unmarshal( XMLStreamReader in) throws JAXBException { - return unmarshal(in,null); - } - /** - * @since 2.0.3 - */ -- public final @NotNull T unmarshal(@NotNull XMLStreamReader in, @Nullable AttachmentUnmarshaller au) throws JAXBException { -+ public final T unmarshal( XMLStreamReader in, AttachmentUnmarshaller au) throws JAXBException { - Unmarshaller u = context.unmarshallerPool.take(); - u.setAttachmentUnmarshaller(au); - return exit(unmarshal(u,in),u); - } -- public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull XMLStreamReader in) throws JAXBException { -+ public final T unmarshal( BridgeContext context, XMLStreamReader in) throws JAXBException { - return unmarshal( ((BridgeContextImpl)context).unmarshaller, in ); - } -- public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull XMLStreamReader in) throws JAXBException; -+ public abstract T unmarshal( Unmarshaller u, XMLStreamReader in) throws JAXBException; - - /** - * Unmarshals the specified type object. -@@ -257,21 +255,21 @@ public abstract class Bridge { - * - * @since 2.0 EA1 - */ -- public final @NotNull T unmarshal(@NotNull Source in) throws JAXBException { -+ public final T unmarshal( Source in) throws JAXBException { - return unmarshal(in,null); - } - /** - * @since 2.0.3 - */ -- public final @NotNull T unmarshal(@NotNull Source in, @Nullable AttachmentUnmarshaller au) throws JAXBException { -+ public final T unmarshal( Source in, AttachmentUnmarshaller au) throws JAXBException { - Unmarshaller u = context.unmarshallerPool.take(); - u.setAttachmentUnmarshaller(au); - return exit(unmarshal(u,in),u); - } -- public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull Source in) throws JAXBException { -+ public final T unmarshal( BridgeContext context, Source in) throws JAXBException { - return unmarshal( ((BridgeContextImpl)context).unmarshaller, in ); - } -- public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull Source in) throws JAXBException; -+ public abstract T unmarshal( Unmarshaller u, Source in) throws JAXBException; - - /** - * Unmarshals the specified type object. -@@ -289,14 +287,14 @@ public abstract class Bridge { - * - * @since 2.0 EA1 - */ -- public final @NotNull T unmarshal(@NotNull InputStream in) throws JAXBException { -+ public final T unmarshal( InputStream in) throws JAXBException { - Unmarshaller u = context.unmarshallerPool.take(); - return exit(unmarshal(u,in),u); - } -- public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull InputStream in) throws JAXBException { -+ public final T unmarshal( BridgeContext context, InputStream in) throws JAXBException { - return unmarshal( ((BridgeContextImpl)context).unmarshaller, in ); - } -- public abstract @NotNull T unmarshal(@NotNull Unmarshaller u, @NotNull InputStream in) throws JAXBException; -+ public abstract T unmarshal( Unmarshaller u, InputStream in) throws JAXBException; - - /** - * Unmarshals the specified type object. -@@ -312,21 +310,21 @@ public abstract class Bridge { - * - * @since 2.0 FCS - */ -- public final @NotNull T unmarshal(@NotNull Node n) throws JAXBException { -+ public final T unmarshal( Node n) throws JAXBException { - return unmarshal(n,null); - } - /** - * @since 2.0.3 - */ -- public final @NotNull T unmarshal(@NotNull Node n, @Nullable AttachmentUnmarshaller au) throws JAXBException { -+ public final T unmarshal( Node n, AttachmentUnmarshaller au) throws JAXBException { - Unmarshaller u = context.unmarshallerPool.take(); - u.setAttachmentUnmarshaller(au); - return exit(unmarshal(u,n),u); - } -- public final @NotNull T unmarshal(@NotNull BridgeContext context, @NotNull Node n) throws JAXBException { -+ public final T unmarshal( BridgeContext context, Node n) throws JAXBException { - return unmarshal( ((BridgeContextImpl)context).unmarshaller, n ); - } -- public abstract @NotNull T unmarshal(@NotNull Unmarshaller context, @NotNull Node n) throws JAXBException; -+ public abstract T unmarshal( Unmarshaller context, Node n) throws JAXBException; - - /** - * Gets the {@link TypeReference} from which this bridge was created. -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java b/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java -index 37bbf61..659f5a3 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/api/ClassResolver.java -@@ -45,8 +45,6 @@ import javax.xml.bind.Unmarshaller; - import javax.xml.bind.ValidationEventHandler; - import javax.xml.bind.annotation.XmlAnyElement; - --import com.sun.istack.NotNull; --import com.sun.istack.Nullable; - - /** - * Dynamically locates classes to represent elements discovered during the unmarshalling. -@@ -115,5 +113,5 @@ public abstract class ClassResolver { - * reproted to {@link ValidationEventHandler} (just like any other error - * during the unmarshalling.) - */ -- public abstract @Nullable Class resolveElementName(@NotNull String nsUri, @NotNull String localName) throws Exception; -+ public abstract Class resolveElementName( String nsUri, String localName) throws Exception; - } -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java b/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java -index 05a2b4d..814b291 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/api/JAXBRIContext.java -@@ -55,8 +55,6 @@ import javax.xml.bind.annotation.XmlAttachmentRef; - import javax.xml.namespace.QName; - import javax.xml.transform.Result; - --import com.sun.istack.NotNull; --import com.sun.istack.Nullable; - import com.sun.xml.bind.api.impl.NameConverter; - import com.sun.xml.bind.v2.ContextFactory; - import com.sun.xml.bind.v2.model.annotation.RuntimeAnnotationReader; -@@ -103,11 +101,11 @@ public abstract class JAXBRIContext extends JAXBContext { - * Can be null. - * @since JAXB 2.1 EA2 - */ -- public static JAXBRIContext newInstance(@NotNull Class[] classes, -- @Nullable Collection typeRefs, -- @Nullable Map subclassReplacements, -- @Nullable String defaultNamespaceRemap, boolean c14nSupport, -- @Nullable RuntimeAnnotationReader ar) throws JAXBException { -+ public static JAXBRIContext newInstance( Class[] classes, -+ Collection typeRefs, -+ Map subclassReplacements, -+ String defaultNamespaceRemap, boolean c14nSupport, -+ RuntimeAnnotationReader ar) throws JAXBException { - return newInstance(classes, typeRefs, subclassReplacements, - defaultNamespaceRemap, c14nSupport, ar, false, false, false, false); - } -@@ -145,11 +143,11 @@ public abstract class JAXBRIContext extends JAXBContext { - * @param supressAccessorWarnings - * See {@link #SUPRESS_ACCESSOR_WARNINGS} for the meaning of this parameter. - */ -- public static JAXBRIContext newInstance(@NotNull Class[] classes, -- @Nullable Collection typeRefs, -- @Nullable Map subclassReplacements, -- @Nullable String defaultNamespaceRemap, boolean c14nSupport, -- @Nullable RuntimeAnnotationReader ar, -+ public static JAXBRIContext newInstance( Class[] classes, -+ Collection typeRefs, -+ Map subclassReplacements, -+ String defaultNamespaceRemap, boolean c14nSupport, -+ RuntimeAnnotationReader ar, - boolean xmlAccessorFactorySupport, - boolean allNillable, - boolean retainPropertyInfo, -@@ -171,9 +169,9 @@ public abstract class JAXBRIContext extends JAXBContext { - * @deprecated - * Compatibility with older versions. - */ -- public static JAXBRIContext newInstance(@NotNull Class[] classes, -- @Nullable Collection typeRefs, -- @Nullable String defaultNamespaceRemap, boolean c14nSupport ) throws JAXBException { -+ public static JAXBRIContext newInstance( Class[] classes, -+ Collection typeRefs, -+ String defaultNamespaceRemap, boolean c14nSupport ) throws JAXBException { - return newInstance(classes,typeRefs, Collections.emptyMap(), - defaultNamespaceRemap,c14nSupport,null); - } -@@ -197,7 +195,7 @@ public abstract class JAXBRIContext extends JAXBContext { - * - * @since 2.0 EA1 - */ -- public abstract @Nullable QName getElementName(@NotNull Object o) throws JAXBException; -+ public abstract QName getElementName( Object o) throws JAXBException; - - /** - * Allows to retrieve the element name based on Class. -@@ -206,7 +204,7 @@ public abstract class JAXBRIContext extends JAXBContext { - * @throws javax.xml.bind.JAXBException - * @since 2.1.10 - */ -- public abstract @Nullable QName getElementName(@NotNull Class o) throws JAXBException; -+ public abstract QName getElementName( Class o) throws JAXBException; - - /** - * Creates a mini-marshaller/unmarshaller that can process a {@link TypeReference}. -@@ -216,7 +214,7 @@ public abstract class JAXBRIContext extends JAXBContext { - * - * @since 2.0 EA1 - */ -- public abstract Bridge createBridge(@NotNull TypeReference ref); -+ public abstract Bridge createBridge( TypeReference ref); - - /** - * Creates a new {@link BridgeContext} instance. -@@ -226,7 +224,7 @@ public abstract class JAXBRIContext extends JAXBContext { - * - * @since 2.0 EA1 - */ -- public abstract @NotNull BridgeContext createBridgeContext(); -+ public abstract BridgeContext createBridgeContext(); - - /** - * Gets a {@link RawAccessor} for the specified element property of the specified wrapper bean class. -@@ -274,7 +272,7 @@ public abstract class JAXBRIContext extends JAXBContext { - * - * @since 2.0 EA2 - */ -- public abstract @NotNull List getKnownNamespaceURIs(); -+ public abstract List getKnownNamespaceURIs(); - - - /** -@@ -302,7 +300,7 @@ public abstract class JAXBRIContext extends JAXBContext { - * if {@link SchemaOutputResolver} throws an {@link IOException}. - */ - @Override -- public abstract void generateSchema(@NotNull SchemaOutputResolver outputResolver) throws IOException; -+ public abstract void generateSchema( SchemaOutputResolver outputResolver) throws IOException; - - /** - * Returns the name of the XML Type bound to the -@@ -319,7 +317,7 @@ public abstract class JAXBRIContext extends JAXBContext { - * @return null - * if the referenced type is an anonymous and therefore doesn't have a name. - */ -- public abstract QName getTypeName(@NotNull TypeReference tr); -+ public abstract QName getTypeName( TypeReference tr); - - /** - * Gets the build information of the JAXB runtime. -@@ -328,7 +326,7 @@ public abstract class JAXBRIContext extends JAXBContext { - * may be null, if the runtime is loaded by a class loader that doesn't support - * the access to the manifest informatino. - */ -- public abstract @NotNull String getBuildId(); -+ public abstract String getBuildId(); - - /** - * Generates the episode file that represents the binding known to this {@link JAXBContext}, -@@ -372,7 +370,7 @@ public abstract class JAXBRIContext extends JAXBContext { - * @return - * Typically, this method returns "nameLikeThis". - */ -- public static @NotNull String mangleNameToVariableName(@NotNull String localName) { -+ public static String mangleNameToVariableName( String localName) { - return NameConverter.standard.toVariableName(localName); - } - -@@ -385,7 +383,7 @@ public abstract class JAXBRIContext extends JAXBContext { - * @return - * Typically, this method returns "NameLikeThis". - */ -- public static @NotNull String mangleNameToClassName(@NotNull String localName) { -+ public static String mangleNameToClassName( String localName) { - return NameConverter.standard.toClassName(localName); - } - -@@ -400,7 +398,7 @@ public abstract class JAXBRIContext extends JAXBContext { - * @return - * Typically, this method returns "NameLikeThis". - */ -- public static @NotNull String mangleNameToPropertyName(@NotNull String localName) { -+ public static String mangleNameToPropertyName( String localName) { - return NameConverter.standard.toPropertyName(localName); - } - -@@ -430,7 +428,7 @@ public abstract class JAXBRIContext extends JAXBContext { - * or null if the type is not assignable to the base type. - * @since 2.0 FCS - */ -- public static @Nullable Type getBaseType(@NotNull Type type, @NotNull Class baseType) { -+ public static Type getBaseType( Type type, Class baseType) { - return Utils.REFLECTION_NAVIGATOR.getBaseClass(type, baseType); - } - -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java -index 94dce69..879dedb 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/ContextFactory.java -@@ -55,7 +55,7 @@ import java.util.logging.Level; - import javax.xml.bind.JAXBContext; - import javax.xml.bind.JAXBException; - --import com.sun.istack.FinalArrayList; -+import java.util.ArrayList; - import com.sun.xml.bind.Util; - import com.sun.xml.bind.api.JAXBRIContext; - import com.sun.xml.bind.api.TypeReference; -@@ -243,7 +243,7 @@ public class ContextFactory { - */ - public static JAXBContext createContext( String contextPath, - ClassLoader classLoader, Map properties ) throws JAXBException { -- FinalArrayList classes = new FinalArrayList(); -+ ArrayList classes = new ArrayList(); - StringTokenizer tokens = new StringTokenizer(contextPath,":"); - List indexedClasses; - -@@ -306,7 +306,7 @@ public class ContextFactory { - BufferedReader in = - new BufferedReader(new InputStreamReader(resourceAsStream, "UTF-8")); - try { -- FinalArrayList classes = new FinalArrayList(); -+ ArrayList classes = new ArrayList(); - String className = in.readLine(); - while (className != null) { - className = className.trim(); -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java new file mode 100644 -index 0000000..9c46637 +index 0000000..4e19c60 --- /dev/null -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java -@@ -0,0 +1,95 @@ ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ByteArrayDataSource.java +@@ -0,0 +1,65 @@ +/* -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. ++ * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * -+ * Copyright (c) 1997-2014 Oracle and/or its affiliates. All rights reserved. ++ * This program and the accompanying materials are made available under the ++ * terms of the Eclipse Distribution License v. 1.0, which is available at ++ * http://www.eclipse.org/org/documents/edl-v10.php. + * -+ * The contents of this file are subject to the terms of either the GNU -+ * General Public License Version 2 only ("GPL") or the Common Development -+ * and Distribution License("CDDL") (collectively, the "License"). You -+ * may not use this file except in compliance with the License. You can -+ * obtain a copy of the License at -+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html -+ * or packager/legal/LICENSE.txt. See the License for the specific -+ * language governing permissions and limitations under the License. -+ * -+ * When distributing the software, include this License Header Notice in each -+ * file and include the License file at packager/legal/LICENSE.txt. -+ * -+ * GPL Classpath Exception: -+ * Oracle designates this particular file as subject to the "Classpath" -+ * exception as provided by Oracle in the GPL Version 2 section of the License -+ * file that accompanied this code. -+ * -+ * Modifications: -+ * If applicable, add the following below the License Header, with the fields -+ * enclosed by brackets [] replaced by your own identifying information: -+ * "Portions Copyright [year] [name of copyright owner]" -+ * -+ * Contributor(s): -+ * If you wish your version of this file to be governed by only the CDDL or -+ * only the GPL Version 2, indicate your decision by adding "[Contributor] -+ * elects to include this software in this distribution under the [CDDL or GPL -+ * Version 2] license." If you don't indicate a single choice of license, a -+ * recipient has the option to distribute your version of this file under -+ * either the CDDL, the GPL Version 2 or to extend the choice of license to -+ * its licensees as provided above. However, if you add GPL Version 2 code -+ * and therefore, elected the GPL Version 2 license, then the option applies -+ * only if the new code is made subject to such option by the copyright -+ * holder. ++ * SPDX-License-Identifier: BSD-3-Clause + */ + +package com.sun.xml.bind.v2.model.impl; @@ -642,104 +660,101 @@ index 0000000..9c46637 + throw new UnsupportedOperationException(); + } +} -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java -index 7b092a5..d6dd439 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java -@@ -82,7 +82,7 @@ import javax.xml.bind.annotation.XmlValue; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java +index 91bf82c..5115643 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ClassInfoImpl.java +@@ -52,7 +52,6 @@ import javax.xml.bind.annotation.XmlValue; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; -import com.sun.istack.FinalArrayList; -+import java.util.ArrayList; import com.sun.xml.bind.annotation.OverrideAnnotationOf; import com.sun.xml.bind.v2.model.annotation.Locatable; import com.sun.xml.bind.v2.model.annotation.MethodLocatable; -@@ -124,7 +124,7 @@ public class ClassInfoImpl extends TypeInfoImpl +@@ -94,7 +93,7 @@ public class ClassInfoImpl extends TypeInfoImpl * * @see #getProperties() */ - private FinalArrayList> properties; -+ private ArrayList> properties; ++ private java.util.ArrayList> properties; /** * The property order. -@@ -306,7 +306,7 @@ public class ClassInfoImpl extends TypeInfoImpl +@@ -276,7 +275,7 @@ public class ClassInfoImpl extends TypeInfoImpl // check the access type first XmlAccessType at = getAccessType(); - properties = new FinalArrayList>(); -+ properties = new ArrayList>(); ++ properties = new java.util.ArrayList>(); findFieldProperties(clazz,at); -@@ -579,7 +579,7 @@ public class ClassInfoImpl extends TypeInfoImpl +@@ -549,7 +548,7 @@ public class ClassInfoImpl extends TypeInfoImpl } private static List makeSet( T... args ) { - List l = new FinalArrayList(); -+ List l = new ArrayList(); ++ List l = new java.util.ArrayList(); for( T arg : args ) if(arg!=null) l.add(arg); return l; -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java -index f20bf49..28994b5 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java -@@ -56,7 +56,7 @@ import javax.xml.bind.annotation.XmlSchema; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java +index a1dcb05..176fb9d 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementInfoImpl.java +@@ -26,7 +26,6 @@ import javax.xml.bind.annotation.XmlSchema; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import javax.xml.namespace.QName; -import com.sun.istack.FinalArrayList; -+import java.util.ArrayList; import com.sun.xml.bind.v2.TODO; import com.sun.xml.bind.v2.model.annotation.AnnotationSource; import com.sun.xml.bind.v2.model.annotation.Locatable; -@@ -107,7 +107,7 @@ class ElementInfoImpl extends TypeInfoImpl implements ElementI +@@ -77,7 +76,7 @@ class ElementInfoImpl extends TypeInfoImpl implements ElementI * This could be null. * @see #link() */ - private FinalArrayList> substitutionMembers; -+ private ArrayList> substitutionMembers; ++ private java.util.ArrayList> substitutionMembers; /** * The factory method from which this mapping was created. -@@ -435,7 +435,7 @@ class ElementInfoImpl extends TypeInfoImpl implements ElementI +@@ -405,7 +404,7 @@ class ElementInfoImpl extends TypeInfoImpl implements ElementI private void addSubstitutionMember(ElementInfoImpl child) { if(substitutionMembers==null) - substitutionMembers = new FinalArrayList>(); -+ substitutionMembers = new ArrayList>(); ++ substitutionMembers = new java.util.ArrayList>(); substitutionMembers.add(child); } -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java -index 4a0169e..3693240 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java -@@ -49,7 +49,7 @@ import javax.xml.bind.annotation.XmlElements; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java +index e9a1dcb..8e90a71 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/ElementPropertyInfoImpl.java +@@ -19,7 +19,6 @@ import javax.xml.bind.annotation.XmlElements; import javax.xml.bind.annotation.XmlList; import javax.xml.namespace.QName; -import com.sun.istack.FinalArrayList; -+import java.util.ArrayList; import com.sun.xml.bind.v2.model.core.ElementPropertyInfo; import com.sun.xml.bind.v2.model.core.ID; import com.sun.xml.bind.v2.model.core.PropertyKind; -@@ -105,7 +105,7 @@ class ElementPropertyInfoImpl +@@ -75,7 +74,7 @@ class ElementPropertyInfoImpl public List> getTypes() { if(types==null) { - types = new FinalArrayList>(); -+ types = new ArrayList>(); ++ types = new java.util.ArrayList>(); XmlElement[] ann=null; XmlElement xe = seed.readAnnotation(XmlElement.class); -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java -index 56aaa65..8c99fe4 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java -@@ -91,7 +91,6 @@ import javax.xml.transform.Transformer; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java +index fc412ee..c64a3bb 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeBuiltinLeafInfoImpl.java +@@ -61,7 +61,6 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.stream.StreamResult; @@ -747,11 +762,11 @@ index 56aaa65..8c99fe4 100644 import com.sun.xml.bind.DatatypeConverterImpl; import com.sun.xml.bind.WhiteSpaceProcessor; import com.sun.xml.bind.api.AccessorException; -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java -index 370ba4f..5a75bde 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java -@@ -53,7 +53,6 @@ import javax.xml.bind.JAXBException; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java +index 50f0085..95d4cf7 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeClassInfoImpl.java +@@ -23,7 +23,6 @@ import javax.xml.bind.JAXBException; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; @@ -759,20 +774,20 @@ index 370ba4f..5a75bde 100644 import com.sun.xml.bind.AccessorFactory; import com.sun.xml.bind.AccessorFactoryImpl; import com.sun.xml.bind.InternalAccessorFactory; -@@ -374,7 +373,7 @@ class RuntimeClassInfoImpl extends ClassInfoImpl +@@ -344,7 +343,7 @@ class RuntimeClassInfoImpl extends ClassInfoImpl } } - public @NotNull CharSequence print(BeanT o) throws AccessorException { -+ public CharSequence print(BeanT o) throws AccessorException { ++ public CharSequence print(BeanT o) throws AccessorException { try { CharSequence value = xacc.print(o); if(value==null) -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java -index aefa835..a5427ed 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java -@@ -65,7 +65,6 @@ import com.sun.xml.bind.v2.runtime.SchemaTypeTransducer; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java +index 0b8b889..0b47be1 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/model/impl/RuntimeModelBuilder.java +@@ -35,7 +35,6 @@ import com.sun.xml.bind.v2.runtime.SchemaTypeTransducer; import com.sun.xml.bind.v2.runtime.Transducer; import com.sun.xml.bind.v2.runtime.JAXBContextImpl; import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallingContext; @@ -780,20 +795,20 @@ index aefa835..a5427ed 100644 import com.sun.xml.bind.v2.WellKnownNamespace; import javax.xml.namespace.QName; -@@ -86,7 +85,7 @@ public class RuntimeModelBuilder extends ModelBuilder { +@@ -56,7 +55,7 @@ public class RuntimeModelBuilder extends ModelBuilder { * The {@link JAXBContextImpl} for which the model is built. * Null when created for reflection. */ - public final @Nullable JAXBContextImpl context; -+ public final JAXBContextImpl context; ++ public final JAXBContextImpl context; public RuntimeModelBuilder(JAXBContextImpl context, RuntimeAnnotationReader annotationReader, Map subclassReplacements, String defaultNamespaceRemap) { super(annotationReader, Utils.REFLECTION_NAVIGATOR, subclassReplacements, defaultNamespaceRemap); -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java -index 0e1346c..1a5d6f6 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java -@@ -57,7 +57,6 @@ import javax.xml.stream.XMLStreamWriter; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java +index 22740bf..98b4677 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeAdapter.java +@@ -27,7 +27,6 @@ import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.Result; import javax.xml.transform.Source; @@ -801,44 +816,44 @@ index 0e1346c..1a5d6f6 100644 import com.sun.xml.bind.api.Bridge; import com.sun.xml.bind.api.TypeReference; import com.sun.xml.bind.v2.runtime.unmarshaller.UnmarshallerImpl; -@@ -122,19 +121,19 @@ final class BridgeAdapter extends InternalBridge { +@@ -92,19 +91,19 @@ final class BridgeAdapter extends InternalBridge { } - public @NotNull InMemory unmarshal(Unmarshaller u, XMLStreamReader in) throws JAXBException { -+ public InMemory unmarshal(Unmarshaller u, XMLStreamReader in) throws JAXBException { ++ public InMemory unmarshal(Unmarshaller u, XMLStreamReader in) throws JAXBException { return adaptU(u, core.unmarshal(u,in)); } - public @NotNull InMemory unmarshal(Unmarshaller u, Source in) throws JAXBException { -+ public InMemory unmarshal(Unmarshaller u, Source in) throws JAXBException { ++ public InMemory unmarshal(Unmarshaller u, Source in) throws JAXBException { return adaptU(u, core.unmarshal(u,in)); } - public @NotNull InMemory unmarshal(Unmarshaller u, InputStream in) throws JAXBException { -+ public InMemory unmarshal(Unmarshaller u, InputStream in) throws JAXBException { ++ public InMemory unmarshal(Unmarshaller u, InputStream in) throws JAXBException { return adaptU(u, core.unmarshal(u,in)); } - public @NotNull InMemory unmarshal(Unmarshaller u, Node n) throws JAXBException { -+ public InMemory unmarshal(Unmarshaller u, Node n) throws JAXBException { ++ public InMemory unmarshal(Unmarshaller u, Node n) throws JAXBException { return adaptU(u, core.unmarshal(u,n)); } -@@ -142,7 +141,7 @@ final class BridgeAdapter extends InternalBridge { +@@ -112,7 +111,7 @@ final class BridgeAdapter extends InternalBridge { return core.getTypeReference(); } - private @NotNull InMemory adaptU(Unmarshaller _u, OnWire v) throws JAXBException { -+ private InMemory adaptU(Unmarshaller _u, OnWire v) throws JAXBException { ++ private InMemory adaptU(Unmarshaller _u, OnWire v) throws JAXBException { UnmarshallerImpl u = (UnmarshallerImpl) _u; XmlAdapter a = u.coordinator.getAdapter(adapter); u.coordinator.pushCoordinator(); -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java -index 231f4d2..eb3d739 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java -@@ -55,7 +55,6 @@ import javax.xml.stream.XMLStreamWriter; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java +index 416dc8d..ebdc6f5 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/BridgeImpl.java +@@ -25,7 +25,6 @@ import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.Result; import javax.xml.transform.Source; @@ -846,110 +861,107 @@ index 231f4d2..eb3d739 100644 import com.sun.xml.bind.api.Bridge; import com.sun.xml.bind.api.TypeReference; import com.sun.xml.bind.marshaller.SAX2DOMEx; -@@ -119,22 +118,22 @@ final class BridgeImpl extends InternalBridge { +@@ -89,22 +88,22 @@ final class BridgeImpl extends InternalBridge { m.write(tagName,bi,t, m.createXmlOutput(result),m.createPostInitAction(result)); } - public @NotNull T unmarshal(Unmarshaller _u, XMLStreamReader in) throws JAXBException { -+ public T unmarshal(Unmarshaller _u, XMLStreamReader in) throws JAXBException { ++ public T unmarshal(Unmarshaller _u, XMLStreamReader in) throws JAXBException { UnmarshallerImpl u = (UnmarshallerImpl)_u; return ((JAXBElement)u.unmarshal0(in,bi)).getValue(); } - public @NotNull T unmarshal(Unmarshaller _u, Source in) throws JAXBException { -+ public T unmarshal(Unmarshaller _u, Source in) throws JAXBException { ++ public T unmarshal(Unmarshaller _u, Source in) throws JAXBException { UnmarshallerImpl u = (UnmarshallerImpl)_u; return ((JAXBElement)u.unmarshal0(in,bi)).getValue(); } - public @NotNull T unmarshal(Unmarshaller _u, InputStream in) throws JAXBException { -+ public T unmarshal(Unmarshaller _u, InputStream in) throws JAXBException { ++ public T unmarshal(Unmarshaller _u, InputStream in) throws JAXBException { UnmarshallerImpl u = (UnmarshallerImpl)_u; return ((JAXBElement)u.unmarshal0(in,bi)).getValue(); } - public @NotNull T unmarshal(Unmarshaller _u, Node n) throws JAXBException { -+ public T unmarshal(Unmarshaller _u, Node n) throws JAXBException { ++ public T unmarshal(Unmarshaller _u, Node n) throws JAXBException { UnmarshallerImpl u = (UnmarshallerImpl)_u; return ((JAXBElement)u.unmarshal0(n,bi)).getValue(); } -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java -index c7763bf..e1a5595 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java -@@ -57,7 +57,7 @@ import javax.xml.bind.helpers.ValidationEventImpl; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java +index 2f220d3..d89af76 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ClassBeanInfoImpl.java +@@ -27,7 +27,6 @@ import javax.xml.bind.helpers.ValidationEventImpl; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; -import com.sun.istack.FinalArrayList; -+import java.util.ArrayList; - import com.sun.xml.bind.Util; import com.sun.xml.bind.api.AccessorException; import com.sun.xml.bind.v2.ClassFactory; -@@ -237,8 +237,8 @@ public final class ClassBeanInfoImpl extends JaxBeanInfo implement + import com.sun.xml.bind.v2.WellKnownNamespace; +@@ -206,8 +205,8 @@ public final class ClassBeanInfoImpl extends JaxBeanInfo implement } // create a list of attribute/URI handlers - List attProps = new FinalArrayList(); - List uriProps = new FinalArrayList(); -+ List attProps = new ArrayList(); -+ List uriProps = new ArrayList(); ++ List attProps = new java.util.ArrayList(); ++ List uriProps = new java.util.ArrayList(); for (ClassBeanInfoImpl bi = this; bi != null; bi = bi.superClazz) { for (int i = 0; i < bi.properties.length; i++) { Property p = bi.properties[i]; -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java -index 81cceaf..4d57df7 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java -@@ -40,8 +40,8 @@ +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java +index e8f554b..f93f9ac 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ContentHandlerAdaptor.java +@@ -10,8 +10,6 @@ package com.sun.xml.bind.v2.runtime; -import com.sun.istack.FinalArrayList; -import com.sun.istack.SAXException2; -+import java.util.ArrayList; -+import org.xml.sax.SAXException; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; -@@ -59,7 +59,7 @@ import java.io.IOException; +@@ -29,7 +27,7 @@ import java.io.IOException; final class ContentHandlerAdaptor extends DefaultHandler { /** Stores newly declared prefix-URI mapping. */ - private final FinalArrayList prefixMap = new FinalArrayList(); -+ private final ArrayList prefixMap = new ArrayList(); ++ private final java.util.ArrayList prefixMap = new java.util.ArrayList(); /** Events will be sent to this object. */ private final XMLSerializer serializer; -@@ -136,9 +136,9 @@ final class ContentHandlerAdaptor extends DefaultHandler { +@@ -106,9 +104,9 @@ final class ContentHandlerAdaptor extends DefaultHandler { prefixMap.clear(); serializer.endAttributes(); } catch (IOException e) { - throw new SAXException2(e); -+ throw new SAXException(e); ++ throw new org.xml.sax.SAXException(e); } catch (XMLStreamException e) { - throw new SAXException2(e); -+ throw new SAXException(e); ++ throw new org.xml.sax.SAXException(e); } } -@@ -153,9 +153,9 @@ final class ContentHandlerAdaptor extends DefaultHandler { +@@ -123,9 +121,9 @@ final class ContentHandlerAdaptor extends DefaultHandler { flushText(); serializer.endElement(); } catch (IOException e) { - throw new SAXException2(e); -+ throw new SAXException(e); ++ throw new org.xml.sax.SAXException(e); } catch (XMLStreamException e) { - throw new SAXException2(e); -+ throw new SAXException(e); ++ throw new org.xml.sax.SAXException(e); } } -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java -index fa14713..4ee809a 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java -@@ -45,7 +45,6 @@ import java.io.IOException; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java +index e68cad7..c9678e9 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/FilterTransducer.java +@@ -15,7 +15,6 @@ import java.io.IOException; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; @@ -957,20 +969,20 @@ index fa14713..4ee809a 100644 import com.sun.xml.bind.api.AccessorException; import org.xml.sax.SAXException; -@@ -76,7 +75,7 @@ public abstract class FilterTransducer implements Transducer { +@@ -46,7 +45,7 @@ public abstract class FilterTransducer implements Transducer { core.declareNamespace(o, w); } - public @NotNull CharSequence print(@NotNull T o) throws AccessorException { -+ public CharSequence print( T o) throws AccessorException { ++ public CharSequence print(T o) throws AccessorException { return core.print(o); } -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java -index a09ef5d..1bf7c49 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java -@@ -44,7 +44,6 @@ import java.io.IOException; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java +index 83eb7da..018f311 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/InlineBinaryTransducer.java +@@ -14,7 +14,6 @@ import java.io.IOException; import javax.xml.stream.XMLStreamException; @@ -978,20 +990,20 @@ index a09ef5d..1bf7c49 100644 import com.sun.xml.bind.api.AccessorException; import org.xml.sax.SAXException; -@@ -60,7 +59,7 @@ public class InlineBinaryTransducer extends FilterTransducer { +@@ -30,7 +29,7 @@ public class InlineBinaryTransducer extends FilterTransducer { } @Override - public @NotNull CharSequence print(@NotNull V o) throws AccessorException { -+ public CharSequence print( V o) throws AccessorException { ++ public CharSequence print(V o) throws AccessorException { XMLSerializer w = XMLSerializer.getInstance(); boolean old = w.setInlineBinaryFlag(true); try { -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java -index c215971..6ade739 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java -@@ -83,8 +83,6 @@ import javax.xml.transform.TransformerFactory; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java +index 3e7f327..f69c22a 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JAXBContextImpl.java +@@ -53,8 +53,6 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TransformerHandler; @@ -1000,139 +1012,109 @@ index c215971..6ade739 100644 import com.sun.xml.bind.v2.WellKnownNamespace; import com.sun.xml.bind.api.AccessorException; import com.sun.xml.bind.api.Bridge; -@@ -174,13 +172,13 @@ public final class JAXBContextImpl extends JAXBRIContext { +@@ -144,13 +142,13 @@ public final class JAXBContextImpl extends JAXBRIContext { * Pool of {@link Marshaller}s. */ public final Pool marshallerPool = new Pool.Impl() { - protected @NotNull Marshaller create() { -+ protected Marshaller create() { ++ protected Marshaller create() { return createMarshaller(); } }; public final Pool unmarshallerPool = new Pool.Impl() { - protected @NotNull Unmarshaller create() { -+ protected Unmarshaller create() { ++ protected Unmarshaller create() { return createUnmarshaller(); } }; -@@ -241,10 +239,10 @@ public final class JAXBContextImpl extends JAXBRIContext { +@@ -211,10 +209,10 @@ public final class JAXBContextImpl extends JAXBRIContext { private WeakReference typeInfoSetCache; - private @NotNull RuntimeAnnotationReader annotationReader; -+ private RuntimeAnnotationReader annotationReader; ++ private RuntimeAnnotationReader annotationReader; private /*almost final*/ boolean hasSwaRef; - private final @NotNull Map subclassReplacements; -+ private final Map subclassReplacements; ++ private final Map subclassReplacements; /** * If true, we aim for faster {@link JAXBContext} instantiation performance, -@@ -917,7 +915,7 @@ public final class JAXBContextImpl extends JAXBRIContext { +@@ -907,7 +905,7 @@ public final class JAXBContextImpl extends JAXBRIContext { return bridges.get(ref); } - public @NotNull BridgeContext createBridgeContext() { -+ public BridgeContext createBridgeContext() { ++ public BridgeContext createBridgeContext() { return new BridgeContextImpl(this); } -@@ -1030,8 +1028,8 @@ public final class JAXBContextImpl extends JAXBRIContext { +@@ -1020,8 +1018,8 @@ public final class JAXBContextImpl extends JAXBRIContext { private boolean retainPropertyInfo = false; private boolean supressAccessorWarnings = false; private String defaultNsUri = ""; - private @NotNull RuntimeAnnotationReader annotationReader = new RuntimeInlineAnnotationReader(); - private @NotNull Map subclassReplacements = Collections.emptyMap(); -+ private RuntimeAnnotationReader annotationReader = new RuntimeInlineAnnotationReader(); -+ private Map subclassReplacements = Collections.emptyMap(); ++ private RuntimeAnnotationReader annotationReader = new RuntimeInlineAnnotationReader(); ++ private Map subclassReplacements = Collections.emptyMap(); private boolean c14nSupport = false; private Class[] classes; private Collection typeRefs; -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java -index a4bfc9e..eafcbf9 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java -@@ -58,7 +58,6 @@ import javax.xml.datatype.XMLGregorianCalendar; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java +index 53da7d9..1b57e0c 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/JaxBeanInfo.java +@@ -28,7 +28,6 @@ import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; -import com.sun.istack.NotNull; - import com.sun.xml.bind.Util; + import com.sun.xml.bind.Utils; import com.sun.xml.bind.v2.model.runtime.RuntimeTypeInfo; import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -@@ -302,7 +301,7 @@ public abstract class JaxBeanInfo { +@@ -272,7 +271,7 @@ public abstract class JaxBeanInfo { * instance, but there's a few exceptions (most notably {@link XMLGregorianCalendar}), * so as a general rule we need an instance to determine it. */ - public QName getTypeName(@NotNull BeanT instance) { -+ public QName getTypeName( BeanT instance) { ++ public QName getTypeName(BeanT instance) { if(typeName==null) return null; if(typeName instanceof QName) return (QName)typeName; return ((QName[])typeName)[0]; -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java -index a6205fb..7ac839a 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java -@@ -42,7 +42,6 @@ package com.sun.xml.bind.v2.runtime; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java +index 328df5c..71d7867 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/NamespaceContext2.java +@@ -12,7 +12,6 @@ package com.sun.xml.bind.v2.runtime; import javax.xml.namespace.NamespaceContext; -import com.sun.istack.NotNull; /** - * Maintains namespace<->prefix bindings. -@@ -99,5 +98,5 @@ public interface NamespaceContext2 extends NamespaceContext + * Maintains {@code namespace <-> prefix} bindings. +@@ -69,5 +68,5 @@ public interface NamespaceContext2 extends NamespaceContext * simply returns the assigned prefix index. Otherwise a new * declaration will be put. */ - int force(@NotNull String uri, @NotNull String prefix); -+ int force( String uri, String prefix); ++ int force(String uri, String prefix); } -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java new file mode 100644 -index 0000000..71fea42 +index 0000000..cbcb10d --- /dev/null -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java -@@ -0,0 +1,131 @@ ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Pool.java +@@ -0,0 +1,101 @@ +/* -+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. ++ * Copyright (c) 1997, 2018 Oracle and/or its affiliates. All rights reserved. + * -+ * Copyright (c) 1997-2012 Oracle and/or its affiliates. All rights reserved. ++ * This program and the accompanying materials are made available under the ++ * terms of the Eclipse Distribution License v. 1.0, which is available at ++ * http://www.eclipse.org/org/documents/edl-v10.php. + * -+ * The contents of this file are subject to the terms of either the GNU -+ * General Public License Version 2 only ("GPL") or the Common Development -+ * and Distribution License("CDDL") (collectively, the "License"). You -+ * may not use this file except in compliance with the License. You can -+ * obtain a copy of the License at -+ * http://glassfish.java.net/public/CDDL+GPL_1_1.html -+ * or packager/legal/LICENSE.txt. See the License for the specific -+ * language governing permissions and limitations under the License. -+ * -+ * When distributing the software, include this License Header Notice in each -+ * file and include the License file at packager/legal/LICENSE.txt. -+ * -+ * GPL Classpath Exception: -+ * Oracle designates this particular file as subject to the "Classpath" -+ * exception as provided by Oracle in the GPL Version 2 section of the License -+ * file that accompanied this code. -+ * -+ * Modifications: -+ * If applicable, add the following below the License Header, with the fields -+ * enclosed by brackets [] replaced by your own identifying information: -+ * "Portions Copyright [year] [name of copyright owner]" -+ * -+ * Contributor(s): -+ * If you wish your version of this file to be governed by only the CDDL or -+ * only the GPL Version 2, indicate your decision by adding "[Contributor] -+ * elects to include this software in this distribution under the [CDDL or GPL -+ * Version 2] license." If you don't indicate a single choice of license, a -+ * recipient has the option to distribute your version of this file under -+ * either the CDDL, the GPL Version 2 or to extend the choice of license to -+ * its licensees as provided above. However, if you add GPL Version 2 code -+ * and therefore, elected the GPL Version 2 license, then the option applies -+ * only if the new code is made subject to such option by the copyright -+ * holder. ++ * SPDX-License-Identifier: BSD-3-Clause + */ + +package com.sun.xml.bind.v2.runtime; @@ -1226,11 +1208,11 @@ index 0000000..71fea42 + protected abstract T create(); + } +} -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java -index 55aa437..3b9f791 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java -@@ -47,7 +47,6 @@ import javax.xml.datatype.XMLGregorianCalendar; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java +index d95d3d2..f9c9f4d 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/Transducer.java +@@ -17,7 +17,6 @@ import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; @@ -1238,123 +1220,120 @@ index 55aa437..3b9f791 100644 import com.sun.xml.bind.api.AccessorException; import com.sun.xml.bind.v2.model.runtime.RuntimePropertyInfo; import com.sun.xml.bind.v2.runtime.reflect.opt.OptimizedTransducedAccessorFactory; -@@ -104,7 +103,7 @@ public interface Transducer { +@@ -74,7 +73,7 @@ public interface Transducer { * @return * always non-null valid lexical representation. */ - @NotNull CharSequence print(@NotNull ValueT o) throws AccessorException; -+ CharSequence print( ValueT o) throws AccessorException; ++ CharSequence print(ValueT o) throws AccessorException; /** * Converts the lexical representation to a value object. -@@ -132,7 +131,7 @@ public interface Transducer { +@@ -102,7 +101,7 @@ public interface Transducer { * to one of the {@link XMLSerializer#leafElement(Name, String, String)} method. * but with the best representation of the value, not necessarily String. */ - void writeLeafElement(XMLSerializer w, Name tagName, @NotNull ValueT o, String fieldName) throws IOException, SAXException, XMLStreamException, AccessorException; -+ void writeLeafElement(XMLSerializer w, Name tagName, ValueT o, String fieldName) throws IOException, SAXException, XMLStreamException, AccessorException; ++ void writeLeafElement(XMLSerializer w, Name tagName, ValueT o, String fieldName) throws IOException, SAXException, XMLStreamException, AccessorException; /** * Transducers implicitly work against a single XML type, -@@ -145,5 +144,5 @@ public interface Transducer { +@@ -115,5 +114,5 @@ public interface Transducer { * Most of the time this method returns null, in which case * the implicitly associated type will be used. */ - QName getTypeName(@NotNull ValueT instance); -+ QName getTypeName( ValueT instance); ++ QName getTypeName(ValueT instance); } -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java -index 6574c1d..0af82ce 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java -@@ -49,7 +49,7 @@ import javax.xml.bind.ValidationEvent; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java +index 869a3c4..5bd5c1c 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/ValueListBeanInfoImpl.java +@@ -19,7 +19,6 @@ import javax.xml.bind.ValidationEvent; import javax.xml.bind.helpers.ValidationEventImpl; import javax.xml.stream.XMLStreamException; -import com.sun.istack.FinalArrayList; -+import java.util.ArrayList; import com.sun.xml.bind.WhiteSpaceProcessor; import com.sun.xml.bind.api.AccessorException; import com.sun.xml.bind.v2.runtime.unmarshaller.Loader; -@@ -77,7 +77,7 @@ final class ValueListBeanInfoImpl extends JaxBeanInfo { +@@ -47,7 +46,7 @@ final class ValueListBeanInfoImpl extends JaxBeanInfo { private final Loader loader = new Loader(true) { @Override public void text(UnmarshallingContext.State state, CharSequence text) throws SAXException { - List r = new FinalArrayList(); -+ List r = new ArrayList(); ++ List r = new java.util.ArrayList(); int idx = 0; int len = text.length(); -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java -index d4db0f4..05b3a53 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java -@@ -66,7 +66,7 @@ import javax.xml.transform.Transformer; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java +index 9ede39f..a8df571 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/XMLSerializer.java +@@ -36,7 +36,6 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.sax.SAXResult; -import com.sun.istack.SAXException2; -+import org.xml.sax.SAXException; import com.sun.xml.bind.CycleRecoverable; import com.sun.xml.bind.api.AccessorException; import com.sun.xml.bind.marshaller.NamespacePrefixMapper; -@@ -239,14 +239,14 @@ public final class XMLSerializer extends Coordinator { +@@ -209,14 +208,14 @@ public final class XMLSerializer extends Coordinator { try { handler = marshaller.getEventHandler(); } catch( JAXBException e ) { - throw new SAXException2(e); -+ throw new SAXException(e); ++ throw new org.xml.sax.SAXException(e); } if(!handler.handleEvent(ve)) { if(ve.getLinkedException() instanceof Exception) - throw new SAXException2((Exception)ve.getLinkedException()); -+ throw new SAXException((Exception)ve.getLinkedException()); ++ throw new org.xml.sax.SAXException((Exception)ve.getLinkedException()); else - throw new SAXException2(ve.getMessage()); -+ throw new SAXException(ve.getMessage()); ++ throw new org.xml.sax.SAXException(ve.getMessage()); } } -@@ -434,9 +434,9 @@ public final class XMLSerializer extends Coordinator { +@@ -404,9 +403,9 @@ public final class XMLSerializer extends Coordinator { try { out.attribute(prefix,local,value); } catch (IOException e) { - throw new SAXException2(e); -+ throw new SAXException(e); ++ throw new org.xml.sax.SAXException(e); } catch (XMLStreamException e) { - throw new SAXException2(e); -+ throw new SAXException(e); ++ throw new org.xml.sax.SAXException(e); } } -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java -index b570114..d9f6a49 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java -@@ -47,7 +47,7 @@ import java.util.Collections; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java +index 6d38d96..4a900ff 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/C14nXmlOutput.java +@@ -17,7 +17,6 @@ import java.util.Collections; import com.sun.xml.bind.api.JAXBRIContext; import com.sun.xml.bind.v2.runtime.Name; -import com.sun.istack.FinalArrayList; -+import java.util.ArrayList; import com.sun.xml.bind.marshaller.CharacterEscapeHandler; /** -@@ -85,7 +85,7 @@ public class C14nXmlOutput extends UTF8XmlOutput { +@@ -53,7 +52,7 @@ public class C14nXmlOutput extends UTF8XmlOutput { + * * As long as this map is empty, there's no need for sorting. - * see {@link com.sun.xml.bind.api.C14nSupport_ArchitectureDocument} for more details. */ - private final FinalArrayList otherAttributes = new FinalArrayList(); -+ private final ArrayList otherAttributes = new ArrayList(); ++ private final java.util.ArrayList otherAttributes = new java.util.ArrayList(); /** * True if {@link JAXBRIContext} is created with c14n support on, -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java -index 90eb105..6085609 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java -@@ -47,8 +47,6 @@ import java.util.Iterator; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java +index 50ad0b0..bef072e 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/NamespaceContextImpl.java +@@ -17,8 +17,6 @@ import java.util.Iterator; import javax.xml.XMLConstants; import javax.xml.stream.XMLStreamException; @@ -1363,59 +1342,58 @@ index 90eb105..6085609 100644 import com.sun.xml.bind.marshaller.NamespacePrefixMapper; import com.sun.xml.bind.v2.WellKnownNamespace; import com.sun.xml.bind.v2.runtime.Name; -@@ -237,7 +235,7 @@ public final class NamespaceContextImpl implements NamespaceContext2 { +@@ -207,7 +205,7 @@ public final class NamespaceContextImpl implements NamespaceContext2 { } } - public int force(@NotNull String uri, @NotNull String prefix) { -+ public int force( String uri, String prefix) { ++ public int force(String uri, String prefix) { // check for the existing binding for( int i=size-1; i>=0; i-- ) { -@@ -265,7 +263,7 @@ public final class NamespaceContextImpl implements NamespaceContext2 { +@@ -235,7 +233,7 @@ public final class NamespaceContextImpl implements NamespaceContext2 { * @return * the index of this new binding. */ - public int put(@NotNull String uri, @Nullable String prefix) { -+ public int put( String uri, String prefix) { ++ public int put(String uri, String prefix) { if(size==nsUris.length) { // reallocate String[] u = new String[nsUris.length*2]; -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java -index a4e5ba2..8c1a46e 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java -@@ -55,7 +55,6 @@ import java.util.logging.Logger; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java +index 410ace8..ecdd993 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Accessor.java +@@ -25,7 +25,6 @@ import java.util.logging.Logger; import javax.xml.bind.JAXBElement; import javax.xml.bind.annotation.adapters.XmlAdapter; -import com.sun.istack.Nullable; - import com.sun.xml.bind.Util; import com.sun.xml.bind.api.AccessorException; import com.sun.xml.bind.api.JAXBRIContext; -@@ -104,7 +103,7 @@ public abstract class Accessor implements Receiver { + import com.sun.xml.bind.v2.model.core.Adapter; +@@ -73,7 +72,7 @@ public abstract class Accessor implements Receiver { * (See {@link RuntimeModelBuilder#context}.) - * @return At least the implementation can return this. + * @return At least the implementation can return {@code this}. */ - public Accessor optimize(@Nullable JAXBContextImpl context) { -+ public Accessor optimize( JAXBContextImpl context) { ++ public Accessor optimize(JAXBContextImpl context) { return this; } -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java -index 56ce1cb..3060979 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java -@@ -60,7 +60,7 @@ import java.util.concurrent.Callable; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java +index f25fe3f..5658985 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/Lister.java +@@ -30,7 +30,6 @@ import java.util.concurrent.Callable; import javax.xml.bind.JAXBException; -import com.sun.istack.SAXException2; -+import org.xml.sax.SAXException; import com.sun.xml.bind.api.AccessorException; import com.sun.xml.bind.v2.ClassFactory; import com.sun.xml.bind.v2.TODO; -@@ -405,7 +405,7 @@ public abstract class Lister { +@@ -375,7 +374,7 @@ public abstract class Lister { } catch (SAXException e) { throw e; } catch (Exception e) { @@ -1424,31 +1402,30 @@ index 56ce1cb..3060979 100644 } if(t==null) { -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java -index 171ce1d..af18dbc 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java -@@ -47,9 +47,7 @@ import javax.xml.bind.JAXBException; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java +index 29746be..fea1e2c 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/reflect/TransducedAccessor.java +@@ -17,9 +17,6 @@ import javax.xml.bind.JAXBException; import javax.xml.bind.annotation.XmlValue; import javax.xml.stream.XMLStreamException; -import com.sun.istack.NotNull; -import com.sun.istack.Nullable; -import com.sun.istack.SAXException2; -+import org.xml.sax.SAXException; import com.sun.xml.bind.WhiteSpaceProcessor; import com.sun.xml.bind.api.AccessorException; import com.sun.xml.bind.v2.model.core.ID; -@@ -110,7 +108,7 @@ public abstract class TransducedAccessor { +@@ -80,7 +77,7 @@ public abstract class TransducedAccessor { * @return * if the accessor didn't yield a value, return null. */ - public abstract @Nullable CharSequence print(@NotNull BeanT o) throws AccessorException, SAXException; -+ public abstract CharSequence print( BeanT o) throws AccessorException, SAXException; ++ public abstract CharSequence print(BeanT o) throws AccessorException, SAXException; /** * Parses the text value into the responsible field of the given bean. -@@ -321,7 +319,7 @@ public abstract class TransducedAccessor { +@@ -293,7 +290,7 @@ public abstract class TransducedAccessor { } catch (RuntimeException e) {// from callable.call throw e; } catch (Exception e) {// from callable.call @@ -1457,7 +1434,7 @@ index 171ce1d..af18dbc 100644 } if(t!=null) { assign(bean,t,context); -@@ -344,7 +342,7 @@ public abstract class TransducedAccessor { +@@ -316,7 +313,7 @@ public abstract class TransducedAccessor { } catch (RuntimeException e) {// from callable.call throw e; } catch (Exception e) {// from callable.call @@ -1466,11 +1443,11 @@ index 171ce1d..af18dbc 100644 } } }); -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java -index ac479ec..8e61905 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java -@@ -55,7 +55,6 @@ import com.sun.xml.bind.v2.runtime.XMLSerializer; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java +index 00d5e70..93d2035 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/Base64Data.java +@@ -26,7 +26,6 @@ import com.sun.xml.bind.v2.runtime.XMLSerializer; import com.sun.xml.bind.v2.runtime.output.Pcdata; import com.sun.xml.bind.v2.runtime.output.UTF8XmlOutput; import com.sun.xml.bind.v2.util.ByteArrayOutputStreamEx; @@ -1478,87 +1455,87 @@ index ac479ec..8e61905 100644 /** * Fed to unmarshaller when the 'text' data is actually -@@ -90,7 +89,7 @@ public final class Base64Data extends Pcdata { +@@ -61,8 +60,7 @@ public final class Base64Data extends Pcdata { * Unused when {@link #dataHandler} is set. * Use {@link DataHandler#getContentType()} in that case. */ - private @Nullable -+ private - String mimeType; +- String mimeType; ++ private String mimeType; /** -@@ -99,7 +98,7 @@ public final class Base64Data extends Pcdata { + * Fills in the data object by a portion of the byte[]. +@@ -70,7 +68,7 @@ public final class Base64Data extends Pcdata { * @param len * data[0] to data[len-1] are treated as the data. */ - public void set(byte[] data, int len, @Nullable String mimeType) { -+ public void set(byte[] data, int len, String mimeType) { ++ public void set(byte[] data, int len, String mimeType) { this.data = data; this.dataLen = len; this.dataHandler = null; -@@ -112,7 +111,7 @@ public final class Base64Data extends Pcdata { +@@ -83,7 +81,7 @@ public final class Base64Data extends Pcdata { * @param data * this buffer may be owned directly by the unmarshaleld JAXB object. */ - public void set(byte[] data, @Nullable String mimeType) { -+ public void set(byte[] data, String mimeType) { ++ public void set(byte[] data, String mimeType) { set(data, data.length, mimeType); } -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java -index 265032d..35118e3 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java -@@ -64,9 +64,7 @@ import javax.xml.bind.helpers.ValidationEventImpl; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java +index b2f72b9..d467f6a 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/UnmarshallingContext.java +@@ -34,9 +34,6 @@ import javax.xml.bind.helpers.ValidationEventImpl; import javax.xml.namespace.NamespaceContext; import javax.xml.namespace.QName; -import com.sun.istack.NotNull; -import com.sun.istack.Nullable; -import com.sun.istack.SAXParseException2; -+import org.xml.sax.SAXParseException; import com.sun.xml.bind.IDResolver; - import com.sun.xml.bind.Util; import com.sun.xml.bind.api.AccessorException; -@@ -119,7 +117,7 @@ public final class UnmarshallingContext extends Coordinator + import com.sun.xml.bind.api.ClassResolver; +@@ -87,7 +84,7 @@ public final class UnmarshallingContext extends Coordinator DUMMY_INSTANCE = new LocatorExWrapper(loc); } - private @NotNull LocatorEx locator = DUMMY_INSTANCE; -+ private LocatorEx locator = DUMMY_INSTANCE; ++ private LocatorEx locator = DUMMY_INSTANCE; /** Root object that is being unmarshalled. */ private Object result; -@@ -190,13 +188,13 @@ public final class UnmarshallingContext extends Coordinator +@@ -158,13 +155,13 @@ public final class UnmarshallingContext extends Coordinator /** * Used to discover additional classes when we hit unknown elements/types. */ - public @Nullable ClassResolver classResolver; -+ public ClassResolver classResolver; ++ public ClassResolver classResolver; /** * User-supplied {@link ClassLoader} for converting name to {@link Class}. * For backward compatibility, when null, use thread context classloader. */ - public @Nullable ClassLoader classLoader; -+ public ClassLoader classLoader; ++ public ClassLoader classLoader; /** * The variable introduced to avoid reporting n^10 similar errors. -@@ -737,7 +735,7 @@ public final class UnmarshallingContext extends Coordinator +@@ -706,7 +703,7 @@ public final class UnmarshallingContext extends Coordinator if(!recover) aborted = true; if( !canRecover || !recover ) - throw new SAXParseException2( event.getMessage(), locator, -+ throw new SAXParseException( event.getMessage(), locator, ++ throw new org.xml.sax.SAXParseException( event.getMessage(), locator, new UnmarshalException( event.getMessage(), event.getLinkedException() ) ); -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java -index 4766583..3cbec32 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java -@@ -45,7 +45,6 @@ import javax.xml.namespace.QName; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java +index 1450d5e..6733f5e 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/XsiTypeLoader.java +@@ -15,7 +15,6 @@ import javax.xml.namespace.QName; import com.sun.xml.bind.DatatypeConverterImpl; import com.sun.xml.bind.v2.WellKnownNamespace; import com.sun.xml.bind.v2.runtime.JaxBeanInfo; @@ -1566,46 +1543,73 @@ index 4766583..3cbec32 100644 import java.util.Collection; import java.util.Collections; -@@ -80,7 +79,7 @@ public class XsiTypeLoader extends Loader { +@@ -50,7 +49,7 @@ public class XsiTypeLoader extends Loader { loader.startElement(state,ea); } - /*pacakge*/ static JaxBeanInfo parseXsiType(UnmarshallingContext.State state, TagName ea, @Nullable JaxBeanInfo defaultBeanInfo) throws SAXException { -+ /*pacakge*/ static JaxBeanInfo parseXsiType(UnmarshallingContext.State state, TagName ea, JaxBeanInfo defaultBeanInfo) throws SAXException { ++ /*pacakge*/ static JaxBeanInfo parseXsiType(UnmarshallingContext.State state, TagName ea, JaxBeanInfo defaultBeanInfo) throws SAXException { UnmarshallingContext context = state.getContext(); JaxBeanInfo beanInfo = null; -diff --git a/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java b/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java -index c8380a3..cc85be8 100644 ---- a/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java -+++ b/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java -@@ -63,8 +63,6 @@ import javax.xml.namespace.QName; +diff --git a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java +index 3428aa5..3bd61f7 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java ++++ b/jaxb-ri/runtime/impl/src/main/java/com/sun/xml/bind/v2/schemagen/XmlSchemaGenerator.java +@@ -33,8 +33,6 @@ import javax.xml.namespace.QName; import javax.xml.transform.Result; import javax.xml.transform.stream.StreamResult; -import com.sun.istack.Nullable; -import com.sun.istack.NotNull; - import com.sun.xml.bind.Util; + import com.sun.xml.bind.Utils; import com.sun.xml.bind.api.CompositeStructure; import com.sun.xml.bind.api.ErrorListener; -@@ -504,7 +502,7 @@ public final class XmlSchemaGenerator { +@@ -477,7 +475,7 @@ public final class XmlSchemaGenerator { * Schema components are organized per namespace. */ private class Namespace { - final @NotNull String uri; -+ final String uri; ++ final String uri; /** * Other {@link Namespace}s that this namespace depends on. -@@ -588,7 +586,7 @@ public final class XmlSchemaGenerator { +@@ -573,7 +571,7 @@ public final class XmlSchemaGenerator { } } - private void addDependencyTo(@Nullable QName qname) { -+ private void addDependencyTo( QName qname) { ++ private void addDependencyTo(QName qname) { // even though the Element interface says getElementName() returns non-null, // ClassInfo always implements Element (even if an instance of ClassInfo might not be an Element). // so this check is still necessary +diff --git a/jaxb-ri/runtime/impl/src/main/java/module-info.java b/jaxb-ri/runtime/impl/src/main/java/module-info.java +index a6a8508..248417b 100644 +--- a/jaxb-ri/runtime/impl/src/main/java/module-info.java ++++ b/jaxb-ri/runtime/impl/src/main/java/module-info.java +@@ -26,7 +26,6 @@ module org.glassfish.jaxb.runtime { + requires transitive com.sun.xml.txw2; + requires static com.sun.xml.fastinfoset; + requires static org.jvnet.staxex; +- requires transitive com.sun.istack.runtime; + + exports com.sun.xml.bind; + exports com.sun.xml.bind.annotation; +diff --git a/jaxb-ri/xjc/pom.xml b/jaxb-ri/xjc/pom.xml +index a8119c6..53a0a48 100644 +--- a/jaxb-ri/xjc/pom.xml ++++ b/jaxb-ri/xjc/pom.xml +@@ -83,6 +83,10 @@ + com.sun.istack + istack-commons-tools + ++ ++ com.sun.istack ++ istack-commons-runtime ++ + + org.apache.ant + ant -- -2.20.1 +2.26.2 diff --git a/0002-Port-to-latest-version-of-args4j.patch b/0002-Port-to-latest-version-of-args4j.patch deleted file mode 100644 index 3205210..0000000 --- a/0002-Port-to-latest-version-of-args4j.patch +++ /dev/null @@ -1,159 +0,0 @@ -From 23b7ecb1e748f79c28af927ae8dc4c7e66fe20cf Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Fri, 10 May 2019 10:41:07 +0100 -Subject: [PATCH 2/2] Port to latest version of args4j - ---- - .../main/java/com/sun/tools/txw2/Main.java | 69 +++++++++++-------- - 1 file changed, 42 insertions(+), 27 deletions(-) - -diff --git a/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java b/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java -index 3c8cc84..3f1a092 100644 ---- a/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java -+++ b/txw/compiler/src/main/java/com/sun/tools/txw2/Main.java -@@ -43,10 +43,10 @@ package com.sun.tools.txw2; - import com.sun.codemodel.writer.FileCodeWriter; - import com.sun.codemodel.writer.SingleStreamCodeWriter; - import com.sun.tools.txw2.model.NodeSet; -+import org.kohsuke.args4j.Argument; -+import org.kohsuke.args4j.Option; - import org.kohsuke.args4j.CmdLineException; - import org.kohsuke.args4j.CmdLineParser; --import org.kohsuke.args4j.opts.BooleanOption; --import org.kohsuke.args4j.opts.StringOption; - import org.kohsuke.rngom.parse.IllegalSchemaException; - import org.kohsuke.rngom.parse.Parseable; - import org.kohsuke.rngom.parse.compact.CompactParseable; -@@ -60,6 +60,8 @@ import java.io.File; - import java.io.IOException; - import java.net.MalformedURLException; - import java.util.Properties; -+import java.util.List; -+import java.util.ArrayList; - - /** - * Programatic entry point to the TXW compiler. -@@ -73,26 +75,39 @@ public class Main { - this.opts = opts; - } - -- public static void main(String[] args) { -- System.exit(run(args)); -+ public static class Options { -+ @Argument -+ public List arguments = new ArrayList(); -+ -+ @Option(name="-o") -+ public String output; -+ -+ @Option(name="-p") -+ public String pkg; -+ -+ @Option(name="-c") -+ public boolean compact; -+ -+ @Option(name="-x") -+ public boolean xml; -+ -+ @Option(name="-xsd") -+ public boolean xsd; -+ -+ @Option(name="-h") -+ public boolean chain; - } - -- public static class Options { -- public StringOption output = new StringOption("-o"); -- public StringOption pkg = new StringOption("-p"); -- public BooleanOption compact = new BooleanOption("-c"); -- public BooleanOption xml = new BooleanOption("-x"); -- public BooleanOption xsd = new BooleanOption("-xsd"); -- public BooleanOption chain = new BooleanOption("-h"); -+ public static void main(String[] args) { -+ System.exit(run(args)); - } - - public static int run(String[] args) { - Options opts = new Options(); -- CmdLineParser parser = new CmdLineParser(); -- parser.addOptionClass(opts); -+ CmdLineParser parser = new CmdLineParser(opts); - - try { -- parser.parse(args); -+ parser.parseArgument(args); - } catch (CmdLineException e) { - System.out.println(e.getMessage()); - printUsage(); -@@ -102,9 +117,9 @@ public class Main { - TxwOptions topts = new TxwOptions(); - topts.errorListener = new ConsoleErrorReporter(System.out); - -- if(opts.output.value!=null) { -+ if(opts.output != null) { - try { -- topts.codeWriter = new FileCodeWriter(new File(opts.output.value)); -+ topts.codeWriter = new FileCodeWriter(new File(opts.output)); - } catch( IOException e ) { - System.out.println(e.getMessage()); - printUsage(); -@@ -114,12 +129,12 @@ public class Main { - topts.codeWriter = new SingleStreamCodeWriter(System.out); - } - -- if(opts.chain.isOn()) { -+ if(opts.chain) { - topts.chainMethod = true; - } - -- if(opts.pkg.value!=null) { -- topts._package = topts.codeModel._package(opts.pkg.value); -+ if(opts.pkg != null) { -+ topts._package = topts.codeModel._package(opts.pkg); - } else { - topts._package = topts.codeModel.rootPackage(); - } -@@ -146,21 +161,21 @@ public class Main { - * out of the specified schema file. - */ - private static SchemaBuilder makeSourceSchema(CmdLineParser parser, Options opts, ErrorHandler eh) throws MalformedURLException { -- File f = new File((String)parser.getArguments().get(0)); -+ File f = new File(opts.arguments.get(0)); - final InputSource in = new InputSource(f.toURL().toExternalForm()); - -- if(opts.xsd.isOff() && opts.xml.isOff() && opts.compact.isOff()) { -+ if(!opts.xsd && !opts.xml && !opts.compact) { - // auto detect - if(in.getSystemId().endsWith(".rnc")) -- opts.compact.value=true; -+ opts.compact = true; - else - if(in.getSystemId().endsWith(".rng")) -- opts.xml.value=true; -+ opts.xml = true; - else -- opts.xsd.value=true; -+ opts.xsd = true; - } - -- if(opts.xsd.isOn()) -+ if(opts.xsd) - return new XmlSchemaLoader(in); - - final Parseable parseable = makeRELAXNGSource(opts, in, eh, f); -@@ -169,10 +184,10 @@ public class Main { - } - - private static Parseable makeRELAXNGSource(Options opts, final InputSource in, ErrorHandler eh, File f) { -- if(opts.compact.isOn()) -+ if(opts.compact) - return new CompactParseable(in,eh); - -- if(opts.xml.isOn()) -+ if(opts.xml) - return new SAXParseable(in,eh); - - // otherwise sniff from the file extension --- -2.20.1 - diff --git a/glassfish-jaxb.spec b/glassfish-jaxb.spec deleted file mode 100644 index 64a2160..0000000 --- a/glassfish-jaxb.spec +++ /dev/null @@ -1,419 +0,0 @@ -# Conditionally build with a minimal dependency set -%bcond_with jp_minimal - -Name: glassfish-jaxb -Version: 2.2.11 -Release: 21%{?dist} -Summary: JAXB Reference Implementation - -License: CDDL-1.1 and GPLv2 with exceptions -URL: http://jaxb.java.net - -Source0: https://jaxb.java.net/%{version}/jaxb-ri-%{version}.src.zip -Patch0: 0001-Avoid-unnecessary-dep-on-istack-commons.patch -Patch1: 0002-Port-to-latest-version-of-args4j.patch - -BuildRequires: maven-local -BuildRequires: mvn(javax.xml.bind:jaxb-api) -BuildRequires: mvn(net.java:jvnet-parent:pom:) -BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) -BuildRequires: mvn(org.apache.maven.plugins:maven-shade-plugin) -BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) -%if %{without jp_minimal} -BuildRequires: mvn(args4j:args4j) -BuildRequires: mvn(com.sun.istack:istack-commons-runtime) -BuildRequires: mvn(com.sun.istack:istack-commons-tools) -BuildRequires: mvn(com.sun:tools) -BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser) -BuildRequires: mvn(com.sun.xml.fastinfoset:FastInfoset) -BuildRequires: mvn(com.sun.xsom:xsom) -BuildRequires: mvn(org.apache.ant:ant) -BuildRequires: mvn(org.jvnet.staxex:stax-ex) -BuildRequires: mvn(relaxngDatatype:relaxngDatatype) -%endif - -Requires: %{name}-core = %{version}-%{release} -Requires: %{name}-runtime = %{version}-%{release} -Requires: %{name}-txw2 = %{version}-%{release} -%if %{without jp_minimal} -Requires: %{name}-bom = %{version}-%{release} -Requires: %{name}-bom-ext = %{version}-%{release} -Requires: %{name}-codemodel = %{version}-%{release} -Requires: %{name}-codemodel-annotation-compiler = %{version}-%{release} -Requires: %{name}-codemodel-parent = %{version}-%{release} -Requires: %{name}-external-parent = %{version}-%{release} -Requires: %{name}-jxc = %{version}-%{release} -Requires: %{name}-parent = %{version}-%{release} -Requires: %{name}-rngom = %{version}-%{release} -Requires: %{name}-runtime-parent = %{version}-%{release} -Requires: %{name}-txwc2 = %{version}-%{release} -Requires: %{name}-txw-parent = %{version}-%{release} -Requires: %{name}-xjc = %{version}-%{release} -%endif - -%if %{with jp_minimal} -%global obsolete_evr 2.2.11-17 -Obsoletes: %{name}-bom < %{obsolete_evr} -Obsoletes: %{name}-bom-ext < %{obsolete_evr} -Obsoletes: %{name}-codemodel < %{obsolete_evr} -Obsoletes: %{name}-codemodel-annotation-compiler < %{obsolete_evr} -Obsoletes: %{name}-codemodel-parent < %{obsolete_evr} -Obsoletes: %{name}-external-parent < %{obsolete_evr} -Obsoletes: %{name}-jxc < %{obsolete_evr} -Obsoletes: %{name}-parent < %{obsolete_evr} -Obsoletes: %{name}-rngom < %{obsolete_evr} -Obsoletes: %{name}-runtime-parent < %{obsolete_evr} -Obsoletes: %{name}-txwc2 < %{obsolete_evr} -Obsoletes: %{name}-txw-parent < %{obsolete_evr} -Obsoletes: %{name}-xjc < %{obsolete_evr} -%endif - -Obsoletes: glassfish-jaxb1-impl < 2.2.11-12 - -BuildArch: noarch - -%description -GlassFish JAXB Reference Implementation. - -%package core -Summary: JAXB Core - -%description core -JAXB Core module. Contains sources required by XJC, JXC and Runtime -modules. - -%package runtime -Summary: JAXB Runtime - -%description runtime -JAXB (JSR 222) Reference Implementation - -%package txw2 -Summary: TXW2 Runtime - -%description txw2 -TXW is a library that allows you to write XML documents. - -%if %{without jp_minimal} -%package codemodel -Summary: Codemodel Core - -%description codemodel -The core functionality of the CodeModel java source code generation -library. - -%package codemodel-annotation-compiler -Summary: Codemodel Annotation Compiler - -%description codemodel-annotation-compiler -The annotation compiler ant task for the CodeModel java source code -generation library. - -%package bom -Summary: JAXB BOM - -%description bom -JAXB Bill of Materials (BOM) - -%package bom-ext -Summary: JAXB BOM with all dependencies - -%description bom-ext -JAXB Bill of Materials (BOM) with all dependencies. - -%package codemodel-parent -Summary: Codemodel parent POM - -%description codemodel-parent -This package contains codemodel parent POM. - -%package external-parent -Summary: JAXB External parent POM - -%description external-parent -JAXB External parent POM. - -%package jxc -Summary: JAXB schema generator - -%description jxc -The tool to generate XML schema based on java classes. - -%package parent -Summary: JAXB parent POM - -%description parent -This package contains parent POM. - -%package runtime-parent -Summary: JAXB Runtime parent POM - -%description runtime-parent -This package contains Runtime parent POM. - -%package txw-parent -Summary: JAXB TXW parent POM - -%description txw-parent -This package contains TXW parent POM. - -%package xjc -Summary: JAXB XJC - -%description xjc -JAXB Binding Compiler. Contains source code needed for binding -customization files into java sources. In other words: the tool to -generate java classes for the given xml representation. - -%package rngom -Summary: RELAX NG Object Model/Parser - -%description rngom -This package contains RELAX NG Object Model/Parser. - -%package txwc2 -Summary: TXW2 Compiler - -%description txwc2 -JAXB schema generator. The tool to generate XML schema based on java -classes. -%endif - -%package javadoc -Summary: Javadocs for %{name} - -%description javadoc -This package contains the API documentation for %{name}. - -%prep -%setup -q -c - -%if %{with jp_minimal} -%patch0 -p1 -%endif -%patch1 -p1 - -# Disable unneeded OSGi bundles -%pom_disable_module xjc bundles -%pom_disable_module jxc bundles -%pom_disable_module ri bundles -%pom_disable_module osgi bundles -%pom_disable_module core bundles - -# Fix jar plug-in usage for OSGi bundles -%pom_xpath_replace "pom:useDefaultManifestFile" " - - \${project.build.outputDirectory}/META-INF/MANIFEST.MF -" bundles/core bundles/runtime - -# Make javax.activation an optional dep -%pom_xpath_inject "pom:configuration/pom:instructions" " -javax.activation;resolution:=optional,*" bundles/runtime - -# Disable ancient jaxb1 runtime -%pom_disable_module jaxb1 runtime - -# Fix hard-coded tools location -%pom_remove_dep com.sun:tools -%pom_add_dep_mgmt com.sun:tools -%pom_remove_dep com.sun:tools jxc -%pom_add_dep com.sun:tools jxc - -# Plug-ins not useful for RPM builds -%pom_remove_plugin :buildnumber-maven-plugin -%pom_remove_plugin :gfnexus-maven-plugin -%pom_remove_plugin :maven-enforcer-plugin -%pom_remove_plugin :maven-site-plugin -%pom_remove_plugin :maven-source-plugin jxc -%pom_remove_plugin :maven-source-plugin xjc - -%if %{with jp_minimal} -# For minimal build disable all modules with extra deps -%pom_disable_module codemodel -%pom_disable_module external -%pom_disable_module jxc -%pom_disable_module compiler txw -%pom_disable_module xjc -# For minimal build of impl module, don't compile in support for extra deps -%pom_remove_dep org.jvnet.staxex:stax-ex runtime/impl -%pom_remove_dep com.sun.xml.fastinfoset:FastInfoset runtime/impl -rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/{FastInfoset,StAXEx}Connector.java -rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,StAXEx}StreamWriterOutput.java -%endif - -%mvn_alias org.glassfish.jaxb:jaxb-xjc "com.sun.xml.bind:jaxb-xjc" - -# Package OSGi version of runtime with the non-OSGi version -%mvn_package com.sun.xml.bind:jaxb-impl jaxb-runtime - -# Don't install bundles parent pom -%mvn_package com.sun.xml.bind.mvn:jaxb-bundles __noinstall - -%if %{with jp_minimal} -# Don't install aggregator poms or boms for minimal build -%mvn_package com.sun.xml.bind.mvn: __noinstall -%mvn_package :jaxb-bom* __noinstall -%endif - -%build -%mvn_build -f -s -- -Ddev -DbuildNumber=unknown - -%install -%mvn_install - -%files -%license License.txt licenceheader.txt License.html - -%files core -f .mfiles-jaxb-core -%license License.txt licenceheader.txt License.html - -%files runtime -f .mfiles-jaxb-runtime -%license License.txt licenceheader.txt License.html - -%files txw2 -f .mfiles-txw2 -%license License.txt licenceheader.txt License.html - -%if %{without jp_minimal} -%files codemodel -f .mfiles-codemodel -%license License.txt licenceheader.txt License.html - -%files codemodel-annotation-compiler -f .mfiles-codemodel-annotation-compiler - -%files bom -f .mfiles-jaxb-bom -%license License.txt licenceheader.txt License.html - -%files bom-ext -f .mfiles-jaxb-bom-ext - -%files codemodel-parent -f .mfiles-jaxb-codemodel-parent - -%files external-parent -f .mfiles-jaxb-external-parent - -%files jxc -f .mfiles-jaxb-jxc -%license License.txt licenceheader.txt License.html - -%files parent -f .mfiles-jaxb-parent - -%files runtime-parent -f .mfiles-jaxb-runtime-parent - -%files txw-parent -f .mfiles-jaxb-txw-parent - -%files xjc -f .mfiles-jaxb-xjc - -%files rngom -f .mfiles-rngom -%license License.txt licenceheader.txt License.html - -%files txwc2 -f .mfiles-txwc2 -%license License.txt licenceheader.txt License.html -%endif - -%files javadoc -f .mfiles-javadoc -%license License.txt licenceheader.txt License.html - - -%changelog -* Sat Aug 01 2020 Fedora Release Engineering - 2.2.11-21 -- Second attempt - Rebuilt for - https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 2.2.11-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri Jul 10 2020 Jiri Vanek - 2.2.11-19 -- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 - -* Mon May 11 2020 Fabio Valentini - 2.2.11-18 -- Enable non-minimal build again. - -* Sat Apr 18 2020 Fabio Valentini - 2.2.11-17 -- Build with reduced functionality and dependencies. - -* Tue Jan 28 2020 Fedora Release Engineering - 2.2.11-16 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 2.2.11-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri May 10 2019 Mat Booth - 2.2.11-14 -- Make javax.activation an optional dep in OSGi metadata - -* Fri May 10 2019 Mat Booth - 2.2.11-13 -- Add conditional build for reduced dependency set - -* Thu May 09 2019 Mat Booth - 2.2.11-12 -- Disable ancient jaxb1 runtime -- Enable OSGi bundle version of the runtime -- Spec file clean up - -* Thu Jan 31 2019 Fedora Release Engineering - 2.2.11-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jul 13 2018 Fedora Release Engineering - 2.2.11-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri May 25 2018 Michael Simacek - 2.2.11-9 -- Reduce build deps - -* Wed Feb 07 2018 Fedora Release Engineering - 2.2.11-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Nov 09 2017 Michael Simacek - 2.2.11-7 -- Specify CDDL license version - -* Wed Jul 26 2017 Fedora Release Engineering - 2.2.11-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 2.2.11-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Wed Feb 03 2016 Fedora Release Engineering - 2.2.11-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 2.2.11-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Mar 20 2015 Michal Srb - 2.2.11-2 -- Split into subpackages (Resolves: rhbz#1204187) - -* Mon Jan 19 2015 Michal Srb - 2.2.11-1 -- Update to upstream version 2.2.11 - -* Mon Oct 27 2014 Michal Srb - 2.2.5-8 -- Fix FTBFS (Resolves: rhbz#1106636) -- Adapt to current packaging guidelines -- Remove R, add BR: javapackages-local (for %%mvn_artifact macro) - -* Sat Jun 07 2014 Fedora Release Engineering - 2.2.5-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 2.2.5-6 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Aug 03 2013 Fedora Release Engineering - 2.2.5-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 2.2.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Thu Jul 19 2012 Fedora Release Engineering - 2.2.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Tue Mar 13 2012 Juan Hernandez 2.2.5-2 -- Add missing xsom and rngom dependencies to the POM files - -* Sat Mar 10 2012 Juan Hernandez 2.2.5-1 -- Updated to upstream version 2.2.5 -- Removed classpath from manifest files - -* Wed Mar 7 2012 Juan Hernandez 2.2.4u1-4 -- Updated to reflect the change from glassfish-fi to glassfish-fastinfoset - -* Wed Feb 22 2012 Juan Hernandez 2.2.4u1-3 -- Updated to reflect the changes of the jar names in txw2 - -* Wed Feb 22 2012 Juan Hernandez 2.2.4u1-2 -- Cleanup of the spec file - -* Sat Jan 21 2012 Marek Goldmann 2.2.4u1-1 -- Initial packaging - diff --git a/jaxb.spec b/jaxb.spec new file mode 100644 index 0000000..f80cba9 --- /dev/null +++ b/jaxb.spec @@ -0,0 +1,316 @@ +# Conditionally build with a minimal dependency set +%bcond_with jp_minimal + +Name: jaxb +Version: 2.3.3 +Release: 1%{?dist} +Summary: JAXB Reference Implementation +# EDL-1.0 license is BSD-3-clause +License: BSD +URL: https://github.com/eclipse-ee4j/jaxb-ri +Source0: https://github.com/eclipse-ee4j/jaxb-ri/archive/%{version}-RI.tar.gz + +# Avoid hard runtime dep on istack-commons from the main implementation jar +Patch0: 0001-Avoid-runtime-dependency-on-istack-commons-from-main.patch + +BuildRequires: maven-local +BuildRequires: mvn(com.sun.activation:jakarta.activation) +BuildRequires: mvn(jakarta.activation:jakarta.activation-api) +BuildRequires: mvn(jakarta.xml.bind:jakarta.xml.bind-api) +BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-dependency-plugin) +BuildRequires: mvn(org.apache.maven.plugins:maven-source-plugin) +BuildRequires: mvn(org.codehaus.mojo:build-helper-maven-plugin) +%if %{without jp_minimal} +BuildRequires: mvn(com.sun.istack:istack-commons-runtime) +BuildRequires: mvn(com.sun.istack:istack-commons-tools) +BuildRequires: mvn(com.sun.xml.dtd-parser:dtd-parser) +BuildRequires: mvn(junit:junit) +BuildRequires: mvn(org.apache.ant:ant) +BuildRequires: mvn(org.apache.maven.plugins:maven-failsafe-plugin) +BuildRequires: mvn(xml-resolver:xml-resolver) +BuildRequires: mvn(xmlunit:xmlunit) +%endif + +%global obs_vr 2.3.3-1 + +BuildArch: noarch + +%description +GlassFish JAXB Reference Implementation. + +%package runtime +Summary: JAXB Runtime +# Package renamed from glassfish-jaxb with version 2.3.3-1 in F33 +Provides: glassfish-jaxb = %{version}-%{release} +Obsoletes: glassfish-jaxb < %{obs_vr} +Provides: glassfish-jaxb-runtime = %{version}-%{release} +Obsoletes: glassfish-jaxb-runtime < %{obs_vr} +# -core subpackage was merged into -runtime during F33 +Provides: glassfish-jaxb-core = %{version}-%{release} +Obsoletes: glassfish-jaxb-core < %{obs_vr} +# Obsolete module gone away for good +Obsoletes: glassfish-jaxb1-impl < %{obs_vr} +# Unable to ship any longer due to missing dep: org.checkerframework:compiler +Obsoletes: glassfish-jaxb-jxc < %{obs_vr} +# Disable javadocs for now, due to https://github.com/fedora-java/xmvn/issues/58 +Obsoletes: glassfish-jaxb-javadoc < %{obs_vr} +# No longer shipping parent pom packages +Obsoletes: glassfish-jaxb-codemodel-parent < %{obs_vr} +Obsoletes: glassfish-jaxb-external-parent < %{obs_vr} +Obsoletes: glassfish-jaxb-parent < %{obs_vr} +Obsoletes: glassfish-jaxb-runtime-parent < %{obs_vr} +Obsoletes: glassfish-jaxb-txw-parent < %{obs_vr} + +%if %{with jp_minimal} +# Obsolete packages that are not shipped in the minimal build +Obsoletes: glassfish-jaxb-bom < %{obs_vr} +Obsoletes: glassfish-jaxb-bom-ext < %{obs_vr} +Obsoletes: glassfish-jaxb-codemodel < %{obs_vr} +Obsoletes: glassfish-jaxb-codemodel-annotation-compiler < %{obs_vr} +Obsoletes: glassfish-jaxb-rngom < %{obs_vr} +Obsoletes: glassfish-jaxb-txwc2 < %{obs_vr} +Obsoletes: glassfish-jaxb-xjc < %{obs_vr} +Obsoletes: %{name}-bom < %{obs_vr} +Obsoletes: %{name}-bom-ext < %{obs_vr} +Obsoletes: %{name}-codemodel < %{obs_vr} +Obsoletes: %{name}-codemodel-annotation-compiler < %{obs_vr} +Obsoletes: %{name}-rngom < %{obs_vr} +Obsoletes: %{name}-txwc2 < %{obs_vr} +Obsoletes: %{name}-xjc < %{obs_vr} +Obsoletes: %{name}-xsom < %{obs_vr} +Obsoletes: %{name}-relaxng-datatype < %{obs_vr} +%endif + +%description runtime +JAXB (JSR 222) Reference Implementation + +%package txw2 +Summary: TXW2 Runtime +# Package renamed from glassfish-jaxb with version 2.3.3-1 in F33 +Provides: glassfish-jaxb-txw2 = %{version}-%{release} +Obsoletes: glassfish-jaxb-txw2 < %{obs_vr} + +%description txw2 +TXW is a library that allows you to write XML documents. + +%package impl +Summary: Old JAXB Runtime + +%description impl +Old JAXB Runtime module. Contains sources required for runtime processing. +Standalone bundle suitable for use in OSGi runtimes. + +%if %{without jp_minimal} +%package codemodel +Summary: Codemodel Core +# Package renamed from glassfish-jaxb with version 2.3.3-1 in F33 +Provides: glassfish-jaxb-codemodel = %{version}-%{release} +Obsoletes: glassfish-jaxb-codemodel < %{obs_vr} + +%description codemodel +The core functionality of the CodeModel java source code generation +library. + +%package codemodel-annotation-compiler +Summary: Codemodel Annotation Compiler +# Package renamed from glassfish-jaxb with version 2.3.3-1 in F33 +Provides: glassfish-jaxb-codemodel-annotation-compiler = %{version}-%{release} +Obsoletes: glassfish-jaxb-codemodel-annotation-compiler < %{obs_vr} + +%description codemodel-annotation-compiler +The annotation compiler ant task for the CodeModel java source code +generation library. + +%package bom +Summary: JAXB BOM +# Package renamed from glassfish-jaxb with version 2.3.3-1 in F33 +Provides: glassfish-jaxb-bom = %{version}-%{release} +Obsoletes: glassfish-jaxb-bom < %{obs_vr} + +%description bom +JAXB Bill of Materials (BOM) + +%package bom-ext +Summary: JAXB BOM with all dependencies +# Package renamed from glassfish-jaxb with version 2.3.3-1 in F33 +Provides: glassfish-jaxb-bom-ext = %{version}-%{release} +Obsoletes: glassfish-jaxb-bom-ext < %{obs_vr} + +%description bom-ext +JAXB Bill of Materials (BOM) with all dependencies. + +%package xjc +Summary: JAXB XJC +# Package renamed from glassfish-jaxb with version 2.3.3-1 in F33 +Provides: glassfish-jaxb-xjc = %{version}-%{release} +Obsoletes: glassfish-jaxb-xjc < %{obs_vr} + +%description xjc +JAXB Binding Compiler. Contains source code needed for binding +customization files into java sources. In other words: the tool to +generate java classes for the given xml representation. + +%package rngom +Summary: RELAX NG Object Model/Parser +# Package renamed from glassfish-jaxb with version 2.3.3-1 in F33 +Provides: glassfish-jaxb-rngom = %{version}-%{release} +Obsoletes: glassfish-jaxb-rngom < %{obs_vr} + +%description rngom +This package contains RELAX NG Object Model/Parser. + +%package txwc2 +Summary: TXW2 Compiler +# Package renamed from glassfish-jaxb with version 2.3.3-1 in F33 +Provides: glassfish-jaxb-txwc2 = %{version}-%{release} +Obsoletes: glassfish-jaxb-txwc2 < %{obs_vr} + +%description txwc2 +JAXB schema generator. The tool to generate XML schema based on java +classes. + +%package xsom +Summary: XML Schema Object Model + +%description xsom +XML Schema Object Model (XSOM) is a Java library that allows applications to +easily parse XML Schema documents and inspect information in them. It is +expected to be useful for applications that need to take XML Schema as an +input. + +%package relaxng-datatype +Summary: RelaxNG Datatype + +%description relaxng-datatype +RelaxNG Datatype library. +%endif + +%prep +%setup -q -n jaxb-ri-%{version}-RI + +# Avoid unnecessary runtime dependency on istack commons +%patch0 -p1 + +pushd jaxb-ri + +# Remove unnecessary dep on ee4j parent pom (it adds nothing to our downstream builds) +%pom_remove_parent boms/bom codemodel external xsom + +# Fix dep on xml resolver +%pom_change_dep -r com.sun.org.apache.xml.internal:resolver xml-resolver:xml-resolver:1.2 +sed -i -e 's/com\.sun\.org\.apache\.xml\.internal\.resolver/org.apache.xml.resolver/' xjc/src/main/java/com/sun/tools/xjc/CatalogUtil.java + +# Plug-ins not useful for RPM builds +%pom_remove_plugin -r :buildnumber-maven-plugin +%pom_remove_plugin -r :maven-enforcer-plugin + +# Disable unneeded extra OSGi bundles +%pom_disable_module xjc bundles +%pom_disable_module jxc bundles +%pom_disable_module ri bundles +%pom_disable_module osgi bundles + +# Missing dep in Fedora: org.checkerframework:compiler +%pom_disable_module jxc + +%if %{with jp_minimal} +# For minimal build disable all modules with extra deps +%pom_disable_module external +%pom_disable_module compiler txw +%pom_disable_module xjc +%pom_disable_module xsom +%pom_disable_module codemodel +# Don't run tests for minimal build +%pom_remove_plugin -r :maven-failsafe-plugin +%endif + +# These packages not yet proper JPMS modules in Fedora +# TODO: remove this when staxex, fastinfoset are updated +%pom_remove_dep org.jvnet.staxex:stax-ex runtime/impl bundles/runtime +%pom_remove_dep com.sun.xml.fastinfoset:FastInfoset runtime/impl bundles/runtime +rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/unmarshaller/{FastInfoset,StAXEx}Connector.java +rm runtime/impl/src/main/java/com/sun/xml/bind/v2/runtime/output/{FastInfoset,StAXEx}StreamWriterOutput.java +sed -i -e '/org.jvnet.staxex/d' -e '/com.sun.xml.fastinfoset/d' runtime/impl/src/main/java/module-info.java bundles/runtime/src/main/java/module-info.java + +# Ignore tests that require Internet connections +sed -i -e 's/void testParse/void ignoreTestParse/' xsom/src/test/java/XSOMParserTest.java +# Ignore tests that require an ancient version of javaparser (version in Fedora is too new) +%pom_remove_dep com.google.code.javaparser:javaparser codemodel/codemodel +rm codemodel/codemodel/src/test/java/com/sun/codemodel/tests/JDefinedClassInstanceInitTest.java +# Ignore tests requiring org.jmockit:jmockit which is not in Fedora +%pom_remove_dep -r org.jmockit:jmockit +rm xjc/src/test/java/com/sun/tools/xjc/addon/code_injector/PluginImplTest.java +# Missing test dep for OSGi tests +%pom_remove_plugin org.apache.felix:maven-junit4osgi-plugin bundles/runtime + +# Compatibility aliases +%mvn_alias org.glassfish.jaxb:jaxb-xjc "com.sun.xml.bind:jaxb-xjc" +%mvn_alias org.glassfish.jaxb:jaxb-runtime org.glassfish.jaxb:jaxb-core + +# Don't install aggregator and parent poms +%mvn_package com.sun.xml.bind.mvn: __noinstall +%mvn_package :::sources __noinstall + +%if %{with jp_minimal} +# Don't install aggregator poms or boms for minimal build +%mvn_package :jaxb-bom* __noinstall +%endif +popd + +%build +pushd jaxb-ri +%if %{with jp_minimal} +# Don't run tests for minimal build +%mvn_build -j -s -f -- -Ddev -DbuildNumber=unknown -Drelaxng.version=%{version} +%else +%mvn_build -j -s -- -Ddev -DbuildNumber=unknown -Drelaxng.version=%{version} +%endif +popd + +%install +pushd jaxb-ri +%mvn_install +popd + +%files runtime -f jaxb-ri/.mfiles-jaxb-runtime +%license LICENSE.md NOTICE.md + +%files txw2 -f jaxb-ri/.mfiles-txw2 +%license LICENSE.md NOTICE.md + +%files impl -f jaxb-ri/.mfiles-jaxb-impl +%license LICENSE.md NOTICE.md + +%if %{without jp_minimal} +%files codemodel -f jaxb-ri/.mfiles-codemodel +%license LICENSE.md NOTICE.md + +%files codemodel-annotation-compiler -f jaxb-ri/.mfiles-codemodel-annotation-compiler + +%files bom -f jaxb-ri/.mfiles-jaxb-bom +%license LICENSE.md NOTICE.md + +%files bom-ext -f jaxb-ri/.mfiles-jaxb-bom-ext + +%files xjc -f jaxb-ri/.mfiles-jaxb-xjc + +%files rngom -f jaxb-ri/.mfiles-rngom +%license LICENSE.md NOTICE.md + +%files txwc2 -f jaxb-ri/.mfiles-txwc2 +%license LICENSE.md NOTICE.md + +%files xsom -f jaxb-ri/.mfiles-xsom + +%files relaxng-datatype -f jaxb-ri/.mfiles-relaxng-datatype +%endif + +%changelog +* Tue Aug 04 2020 Mat Booth - 2.3.3-1 +- Update to latest upstream release +- Disable javadocs for now, due to https://github.com/fedora-java/xmvn/issues/58 +- Upstream moved to eclipse-ee4j and implementation license changed to BSD (EDL) +- Enable tests, don't unnecessarily ship parent poms +- Rename package from glassfish-jaxb + diff --git a/sources b/sources index a1b8830..3f0dbeb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bed496dd96e5b9efc4539fc5bdb69c69 jaxb-ri-2.2.11.src.zip +SHA512 (2.3.3-RI.tar.gz) = 32d9e5fe93aa60113c467a1561da47815510ff276d5a6aa793f247520026ce9ffb944b5f7c1e1e1ea55f8743dbe5ee8da9cc1eea4f490522621a85ef2400036c