.gitignore

@@ -1 +1 @@
-SOURCES/jaxb-4.0.2.tar.gz
+SOURCES/jaxb-4.0.4.tar.gz

.jaxb.metadata

@@ -1 +1 @@
-3bf3515784e9f84a71fed962b08b5f57942c7e5a SOURCES/jaxb-4.0.2.tar.gz
+b4e6700301f5c0942dec905386f0b9d01f83dbb4 SOURCES/jaxb-4.0.4.tar.gz

SPECS/jaxb.spec

@@ -1,28 +1,39 @@
+%bcond_with bootstrap
+
 Name:           jaxb
-Version:        4.0.2
+Version:        4.0.4
-Release:        1%{?dist}
+Release:        5%{?dist}
 Summary:        JAXB Reference Implementation
-# EDL-1.0 license is BSD-3-clause
+License:        BSD-3-Clause
-License:        BSD
 URL:            https://github.com/eclipse-ee4j/jaxb-ri
 BuildArch:      noarch
+ExclusiveArch:  %{java_arches} noarch
 
 Source0:        %{url}/archive/%{version}-RI/%{name}-%{version}.tar.gz
 
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  maven-local
+BuildRequires:  mvn(com.github.relaxng:relaxngDatatype)
+BuildRequires:  mvn(com.sun.istack:istack-commons-maven-plugin)
 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(com.sun.xml.fastinfoset:FastInfoset)
-BuildRequires:  mvn(jakarta.activation:jakarta.activation-api:2.1.0)
+BuildRequires:  mvn(jakarta.activation:jakarta.activation-api)
-BuildRequires:  mvn(jakarta.xml.bind:jakarta.xml.bind-api:4.0.0)
+BuildRequires:  mvn(jakarta.xml.bind:jakarta.xml.bind-api)
+BuildRequires:  mvn(net.java.dev.msv:xsdlib)
 BuildRequires:  mvn(org.apache.ant:ant)
+BuildRequires:  mvn(org.apache.ant:ant-junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-antrun-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-assembly-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)
 BuildRequires:  mvn(org.jvnet.staxex:stax-ex)
+%endif
 
 %description
 GlassFish JAXB Reference Implementation.
@@ -63,7 +74,7 @@ JAXB Core module. Contains sources required by XJC, JXC and Runtime modules.
 
 %package rngom
 # pom.xml and module-info.java are under BSD, rest is MIT
-License:        MIT and BSD
+License:        MIT AND BSD-3-Clause
 Summary:        RELAX NG Object Model/Parser
 
 %description rngom
@@ -82,8 +93,8 @@ Summary:        TXW2 Runtime
 TXW is a library that allows you to write XML documents.
 
 %package xjc
-# jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/internalizer/NamespaceContextImpl.java is under ASL 2.0
+# jaxb-ri/xjc/src/main/java/com/sun/tools/xjc/reader/internalizer/NamespaceContextImpl.java is under Apache-2.0
-License:        BSD and ASL 2.0
+License:        BSD-3-Clause AND Apache-2.0
 Summary:        JAXB XJC
 
 %description xjc
@@ -102,8 +113,6 @@ JAXB schema generator. The tool to generate XML schema based on java classes.
 
 pushd jaxb-ri
 
-find -name 'module-info.java' -type f -delete
-
 # Remove ee4j parent
 %pom_remove_parent boms/bom codemodel external xsom
 
@@ -133,11 +142,22 @@ find -name 'module-info.java' -type f -delete
 %mvn_package :jaxb-samples __noinstall
 %mvn_package :jaxb-txw-parent __noinstall
 %mvn_package :jaxb-www __noinstall
+
+%if %{with bootstrap}
+%pom_disable_module core
+%pom_disable_module codemodel-annotation-compiler codemodel
+%pom_disable_module runtime
+%pom_disable_module relaxng-datatype external
+%pom_disable_module rngom external
+%pom_disable_module xjc
+%pom_disable_module xsom
+%pom_disable_module txw
+%endif
 popd
 
 %build
 pushd jaxb-ri
-%mvn_build -s -f -j
+%mvn_build -s -f -j -- -Dproject.build.sourceEncoding=UTF-8
 popd
 
 %install
@@ -147,24 +167,113 @@ popd
 
 %files codemodel -f jaxb-ri/.mfiles-codemodel
 %license LICENSE.md NOTICE.md
+
+%if %{without bootstrap}
 %files codemodel-annotation-compiler -f jaxb-ri/.mfiles-codemodel-annotation-compiler
+%files core -f jaxb-ri/.mfiles-jaxb-core
 %files relaxng-datatype -f jaxb-ri/.mfiles-relaxng-datatype
 %license LICENSE.md NOTICE.md
 %files xsom -f jaxb-ri/.mfiles-xsom
-%files core -f jaxb-ri/.mfiles-jaxb-core
 %files rngom -f jaxb-ri/.mfiles-rngom
-%files runtime -f jaxb-ri/.mfiles-jaxb-runtime
 %files txw2 -f jaxb-ri/.mfiles-txw2
 %license LICENSE.md NOTICE.md
 %files txwc2 -f jaxb-ri/.mfiles-txwc2
+%files runtime -f jaxb-ri/.mfiles-jaxb-runtime
 %files xjc -f jaxb-ri/.mfiles-jaxb-xjc
+%endif
 
 %changelog
-* Wed Feb 08 2023 Marián Konček <mkoncek@redhat.com> - 4.0.2-1
+* Tue Nov 26 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 4.0.4-5
+- Rebuilt for MSVSphere 10
+
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 4.0.4-5
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 4.0.4-4
+- Bump release for June 2024 mass rebuild
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Nov 29 2023 Marian Koncek <mkoncek@redhat.com> - 4.0.4-1
+- Update to upstream version 4.0.4
+
+* Mon Nov 27 2023 Marian Koncek <mkoncek@redhat.com> - 4.0.3-1
+- Update to upstream version 4.0.3
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 4.0.2-3
+- Convert License tag to SPDX format
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Feb 08 2023 Marian Koncek <mkoncek@redhat.com> - 4.0.2-1
 - Update to upstream version 4.0.2
 
-* Wed Feb 01 2023 Marián Konček <mkoncek@redhat.com> - 4.0.1-2
+* Wed Feb 08 2023 Marian Koncek <mkoncek@redhat.com> - 4.0.1-4
-- Update licenses
+- Change license, remove bootstrap macro
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.0.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Jan 16 2023 Marian Koncek <mkoncek@redhat.com> - 4.0.1-2
+- Rebuild
+
+* Mon Nov 21 2022 Marian Koncek <mkoncek@redhat.com> - 4.0.1-1
+- Update to pstream version 4.0.1
+
+* Thu Oct 27 2022 Marian Koncek <mkoncek@redhat.com> - 2.3.5-8
+- Add bootstrap option
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.5-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 2.3.5-6
+- Rebuilt for Drop i686 JDKs
+
+* Mon Feb 21 2022 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 2.3.5-5
+- Remove subpackage that provides BOM/POM only
+- Clean up spec (provides, obsoletes, etc.)
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.3.5-4
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Wed Nov 17 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 2.3.5-2
+- Remove workaround for SUREFIRE-1897
+
+* Tue Oct 26 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 2.3.5-1
+- Update to version 2.3.5
+- Remove jp_minimal
+- Disable tests
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Feb  5 2021 Mat Booth <mat.booth@redhat.com> - 2.3.3-6
+- Add obsoletes/provides and compat aliases for old relaxngDatatype package
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Aug 18 2020 Mat Booth <mat.booth@redhat.com> - 2.3.3-4
+- Restore deps on fi and stax-ex for full build mode
+
+* Mon Aug 17 2020 Mat Booth <mat.booth@redhat.com> - 2.3.3-3
+- Add obsoletes/provides and compat aliases for old xsom package
+
+* Tue Aug 11 2020 Mat Booth <mat.booth@redhat.com> - 2.3.3-2
+- Fastinfoset and Staxex are optional deps, this should be reflected in the OSGi
+  metadata
 
-* Tue Jan 17 2023 Marian Koncek <mkoncek@redhat.com> - 4.0.1-1
+* Tue Aug 04 2020 Mat Booth <mat.booth@redhat.com> - 2.3.3-1
-- Initial build
+- 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