Rebuilt for java-25-openjdk as preffered jdk

https://fedoraproject.org/wiki/Changes/Java25AndNoMoreSystemJdk
Note, that since f43, you should be always explicit on what jdk to use.
This commit should do exactly that.

.gitignore

@@ -1,3 +1,4 @@
 /jaxb-dtd-parser-1.4.3.tar.gz
 /jaxb-dtd-parser-1.4.5.tar.gz
 /jaxb-dtd-parser-1.5.0.tar.gz
+/jaxb-dtd-parser-1.5.1.tar.gz

changelog

@@ -0,0 +1,62 @@
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 1.5.1-4
+- Rebuilt for java-21-openjdk as system jdk
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Dec 11 2023 Marian Koncek <mkoncek@redhat.com> - 1.5.1-1
+- Update to upstream version 1.5.1
+
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.5.0-8
+- Convert License tag to SPDX format
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Wed Feb 08 2023 Marian Koncek <mkoncek@redhat.com> - 1.5.0-6
+- Remove provision of glassfish artifact
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Mon Jan 16 2023 Marian Koncek <mkoncek@redhat.com> - 1.5.0-4
+- Reduce dependencies
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.5.0-2
+- Rebuilt for Drop i686 JDKs
+
+* Mon Apr 11 2022 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.5.0-1
+- New upstream release 1.5.0
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.4.5-3
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Oct 26 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.4.5-1
+- New upstream release 1.4.5
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.4.3-3
+- Restore JDK 9+ bits for Jaxb
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri May 08 2020 Fabio Valentini <decathorpe@gmail.com> - 1.4.3-1
+- Initial package renamed from glassfish-dtd-parser.

jaxb-dtd-parser.spec

@@ -1,32 +1,32 @@
 Name:           jaxb-dtd-parser
-Version:        1.5.0
-Release:        7%{?dist}
+Version:        1.5.1
+Release:        %autorelease
 Summary:        SAX-like API for parsing XML DTDs
-License:        BSD
+License:        BSD-3-Clause
 URL:            https://github.com/eclipse-ee4j/jaxb-dtd-parser
 BuildArch:      noarch
 ExclusiveArch:  %{java_arches} noarch
 
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 
-BuildRequires:  maven-local
+BuildRequires:  maven-local-openjdk25
+BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
+# TODO Remove in Fedora 46
+Obsoletes:      %{name}-javadoc < 1.5.1-14
 
 %description
 SAX-like API for parsing XML DTDs.
 
-%package javadoc
-Summary:        API documentation for %{name}
-
-%description javadoc
-API documentation for %{name}.
-
 %prep
-%setup -q
+%autosetup -p1 -C
 
 pushd dtd-parser
 
+# -Werror is considered harmful for downstream package builds
+sed -i /-Werror/d pom.xml
+
 %pom_remove_parent
 
 %pom_remove_plugin :buildnumber-maven-plugin
@@ -36,7 +36,7 @@ popd
 
 %build
 pushd dtd-parser
-%mvn_build
+%mvn_build -j
 popd
 
 %install
@@ -48,51 +48,5 @@ popd
 %license LICENSE.md NOTICE.md
 %doc README.md
 
-%files javadoc -f dtd-parser/.mfiles-javadoc
-%license LICENSE.md NOTICE.md
-
 %changelog
-* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Wed Feb 08 2023 Marian Koncek <mkoncek@redhat.com> - 1.5.0-6
-- Remove provision of glassfish artifact
-
-* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Jan 16 2023 Marian Koncek <mkoncek@redhat.com> - 1.5.0-4
-- Reduce dependencies
-
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Fri Jul 08 2022 Jiri Vanek <jvanek@redhat.com> - 1.5.0-2
-- Rebuilt for Drop i686 JDKs
-
-* Mon Apr 11 2022 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.5.0-1
-- New upstream release 1.5.0
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 1.4.5-3
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.5-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Tue Oct 26 2021 Didik Supriadi <didiksupriadi41@fedoraproject.org> - 1.4.5-1
-- New upstream release 1.4.5
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Mon Aug 10 2020 Mat Booth <mat.booth@redhat.com> - 1.4.3-3
-- Restore JDK 9+ bits for Jaxb
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri May 08 2020 Fabio Valentini <decathorpe@gmail.com> - 1.4.3-1
-- Initial package renamed from glassfish-dtd-parser.
+%autochangelog

plans/javapackages.fmf

@@ -1,7 +1,7 @@
 summary: Run javapackages-specific tests
 discover:
   how: fmf
-  url: https://src.fedoraproject.org/tests/javapackages
-  ref: f39
+  url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git
+  ref: f43
 execute:
   how: tmt

plans/smoke.fmf

@@ -1,17 +1,5 @@
 summary: Basic smoke test
-prepare:
-  how: install
-  package:
-    - java-11-openjdk-devel
-    - xmvn-tools
 discover:
-  how: shell
-  tests:
-    - name: /smoke/classpath-import
-      test: |
-        CLASSPATH+=":$(xmvn-resolve com.sun.xml.dtd-parser:dtd-parser)"
-        export CLASSPATH
-        /usr/lib/jvm/java-11-openjdk/bin/javac plans/Smoke.java
-        /usr/lib/jvm/java-11-openjdk/bin/java -cp "${CLASSPATH}:plans" Smoke
+  how: fmf
 execute:
   how: tmt

sources

@@ -1 +1 @@
-SHA512 (jaxb-dtd-parser-1.5.0.tar.gz) = 5a609c6535bc538014830d933172fc280127c631bd480d5b62dce606657e18f2904feb84fd4f20af0ba72699e75c580d101e7da26182b0e752dc90d70716b831
+SHA512 (jaxb-dtd-parser-1.5.1.tar.gz) = 4618b109ec5a6eac9887c74a92f3189da51957f3962d267ec4345918219b89716d9dd7d96452a51ccda07737244cd25521361bc4455a5b5636fe47e996696d24

tests/Sanity/smoke/main.fmf

@@ -0,0 +1,7 @@
+summary: jaxb-dtd-parser smoke test
+description: |
+  Test basic functionality of jaxb-dtd-parser.
+require:
+  - jaxb-dtd-parser
+  - java-21-openjdk-devel
+  - xmvn-tools

tests/Sanity/smoke/runtest.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+# Author: Marian Koncek <mkoncek@redhat.com>
+. /usr/share/beakerlib/beakerlib.sh
+
+rlJournalStart
+
+  rlPhaseStartTest "compile Smoke.java and run it"
+    CLASSPATH+=":$(xmvn-resolve com.sun.xml.dtd-parser:dtd-parser)"
+    export CLASSPATH
+    rlRun "/usr/lib/jvm/java-21-openjdk/bin/javac Smoke.java"
+    rlRun -s "/usr/lib/jvm/java-21-openjdk/bin/java -cp \"${CLASSPATH}:plans\" Smoke"
+    rlAssertGrep "com.sun.xml.dtdparser.DTDParser" $rlRun_LOG
+  rlPhaseEnd
+
+rlJournalEnd
+rlJournalPrintText

tests/main.fmf

@@ -0,0 +1,5 @@
+contact: Marian Koncek <mkoncek@redhat.com>
+framework: beakerlib
+test: ./runtest.sh
+tier: 0
+component: jaxb-dtd-parser