From aa1c04ad8490ae73a1a74aee994afc07fc034195 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 16:15:35 +0100 Subject: [PATCH 01/15] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- jaxb-dtd-parser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jaxb-dtd-parser.spec b/jaxb-dtd-parser.spec index 0367a4d..6cf0980 100644 --- a/jaxb-dtd-parser.spec +++ b/jaxb-dtd-parser.spec @@ -1,6 +1,6 @@ Name: jaxb-dtd-parser Version: 1.5.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: SAX-like API for parsing XML DTDs License: BSD-3-Clause URL: https://github.com/eclipse-ee4j/jaxb-dtd-parser @@ -53,6 +53,9 @@ popd %license LICENSE.md NOTICE.md %changelog +* Tue Feb 27 2024 Jiri Vanek - 1.5.1-4 +- Rebuilt for java-21-openjdk as system jdk + * Wed Jan 24 2024 Fedora Release Engineering - 1.5.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From add2872dcf37ccee620a054052c102c300fa6243 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Jul 2024 09:26:43 +0200 Subject: [PATCH 02/15] Extract smoke tests out of test plan We want tests to be stored directly in the file system instead of being embedded into tests plans. --- plans/smoke.fmf | 14 +------------- {plans => tests/Sanity/smoke}/Smoke.java | 0 tests/Sanity/smoke/main.fmf | 7 +++++++ tests/Sanity/smoke/runtest.sh | 15 +++++++++++++++ tests/main.fmf | 5 +++++ 5 files changed, 28 insertions(+), 13 deletions(-) rename {plans => tests/Sanity/smoke}/Smoke.java (100%) create mode 100644 tests/Sanity/smoke/main.fmf create mode 100755 tests/Sanity/smoke/runtest.sh create mode 100644 tests/main.fmf diff --git a/plans/smoke.fmf b/plans/smoke.fmf index b6f90d0..a1e7bfd 100644 --- a/plans/smoke.fmf +++ b/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 diff --git a/plans/Smoke.java b/tests/Sanity/smoke/Smoke.java similarity index 100% rename from plans/Smoke.java rename to tests/Sanity/smoke/Smoke.java diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf new file mode 100644 index 0000000..dd5a73c --- /dev/null +++ b/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 diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh new file mode 100755 index 0000000..fe57118 --- /dev/null +++ b/tests/Sanity/smoke/runtest.sh @@ -0,0 +1,15 @@ +#!/bin/bash +# Author: Marian Koncek +. /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 + /usr/lib/jvm/java-21-openjdk/bin/javac Smoke.java + /usr/lib/jvm/java-21-openjdk/bin/java -cp "${CLASSPATH}:plans" Smoke + rlPhaseEnd + +rlJournalEnd +rlJournalPrintText diff --git a/tests/main.fmf b/tests/main.fmf new file mode 100644 index 0000000..543e68e --- /dev/null +++ b/tests/main.fmf @@ -0,0 +1,5 @@ +contact: Marian Koncek +framework: beakerlib +test: ./runtest.sh +tier: 0 +component: jaxb-dtd-parser From adba2cd3534ba5f26738b8323275e15f305c6256 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Jul 2024 09:51:42 +0200 Subject: [PATCH 03/15] Use rlRun and rlAssertGrep --- tests/Sanity/smoke/runtest.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tests/Sanity/smoke/runtest.sh b/tests/Sanity/smoke/runtest.sh index fe57118..f16aa8e 100755 --- a/tests/Sanity/smoke/runtest.sh +++ b/tests/Sanity/smoke/runtest.sh @@ -7,8 +7,9 @@ rlJournalStart rlPhaseStartTest "compile Smoke.java and run it" CLASSPATH+=":$(xmvn-resolve com.sun.xml.dtd-parser:dtd-parser)" export CLASSPATH - /usr/lib/jvm/java-21-openjdk/bin/javac Smoke.java - /usr/lib/jvm/java-21-openjdk/bin/java -cp "${CLASSPATH}:plans" Smoke + 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 From bcd040cf341555aac007839f2be03d69b6db0f75 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:54:18 +0000 Subject: [PATCH 04/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- jaxb-dtd-parser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jaxb-dtd-parser.spec b/jaxb-dtd-parser.spec index 6cf0980..36b755a 100644 --- a/jaxb-dtd-parser.spec +++ b/jaxb-dtd-parser.spec @@ -1,6 +1,6 @@ Name: jaxb-dtd-parser Version: 1.5.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: SAX-like API for parsing XML DTDs License: BSD-3-Clause URL: https://github.com/eclipse-ee4j/jaxb-dtd-parser @@ -53,6 +53,9 @@ popd %license LICENSE.md NOTICE.md %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 1.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Tue Feb 27 2024 Jiri Vanek - 1.5.1-4 - Rebuilt for java-21-openjdk as system jdk From c6ad80316540187d1ecc2cca02d1102754d36512 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 05/15] Switch javapackages tests to f41 branch --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..17c6113 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f40 + ref: f41 execute: how: tmt From 12a2c859c6bc6c86edee20b4e526134efa982f8d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 06/15] Switch from %setup to %autosetup --- jaxb-dtd-parser.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jaxb-dtd-parser.spec b/jaxb-dtd-parser.spec index 36b755a..e8af470 100644 --- a/jaxb-dtd-parser.spec +++ b/jaxb-dtd-parser.spec @@ -24,7 +24,7 @@ Summary: API documentation for %{name} API documentation for %{name}. %prep -%setup -q +%autosetup -p1 -C pushd dtd-parser From b13aaec293e0ae3db7f8cb7e35422c5090cbf9ba Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:07 +0200 Subject: [PATCH 07/15] Convert to %autorelease and %autochangelog --- changelog | 62 ++++++++++++++++++++++++++++++++++++++++++ jaxb-dtd-parser.spec | 65 ++------------------------------------------ 2 files changed, 64 insertions(+), 63 deletions(-) create mode 100644 changelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..0ea1ffb --- /dev/null +++ b/changelog @@ -0,0 +1,62 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 1.5.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Feb 27 2024 Jiri Vanek - 1.5.1-4 +- Rebuilt for java-21-openjdk as system jdk + +* Wed Jan 24 2024 Fedora Release Engineering - 1.5.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 1.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Mon Dec 11 2023 Marian Koncek - 1.5.1-1 +- Update to upstream version 1.5.1 + +* Fri Sep 01 2023 Mikolaj Izdebski - 1.5.0-8 +- Convert License tag to SPDX format + +* Thu Jul 20 2023 Fedora Release Engineering - 1.5.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Feb 08 2023 Marian Koncek - 1.5.0-6 +- Remove provision of glassfish artifact + +* Thu Jan 19 2023 Fedora Release Engineering - 1.5.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Mon Jan 16 2023 Marian Koncek - 1.5.0-4 +- Reduce dependencies + +* Thu Jul 21 2022 Fedora Release Engineering - 1.5.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jul 08 2022 Jiri Vanek - 1.5.0-2 +- Rebuilt for Drop i686 JDKs + +* Mon Apr 11 2022 Didik Supriadi - 1.5.0-1 +- New upstream release 1.5.0 + +* Sat Feb 05 2022 Jiri Vanek - 1.4.5-3 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 1.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Oct 26 2021 Didik Supriadi - 1.4.5-1 +- New upstream release 1.4.5 + +* Thu Jul 22 2021 Fedora Release Engineering - 1.4.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.4.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Aug 10 2020 Mat Booth - 1.4.3-3 +- Restore JDK 9+ bits for Jaxb + +* Tue Jul 28 2020 Fedora Release Engineering - 1.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri May 08 2020 Fabio Valentini - 1.4.3-1 +- Initial package renamed from glassfish-dtd-parser. diff --git a/jaxb-dtd-parser.spec b/jaxb-dtd-parser.spec index e8af470..5cd5cf2 100644 --- a/jaxb-dtd-parser.spec +++ b/jaxb-dtd-parser.spec @@ -1,6 +1,6 @@ Name: jaxb-dtd-parser Version: 1.5.1 -Release: 5%{?dist} +Release: %autorelease Summary: SAX-like API for parsing XML DTDs License: BSD-3-Clause URL: https://github.com/eclipse-ee4j/jaxb-dtd-parser @@ -53,65 +53,4 @@ popd %license LICENSE.md NOTICE.md %changelog -* Thu Jul 18 2024 Fedora Release Engineering - 1.5.1-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Feb 27 2024 Jiri Vanek - 1.5.1-4 -- Rebuilt for java-21-openjdk as system jdk - -* Wed Jan 24 2024 Fedora Release Engineering - 1.5.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Sat Jan 20 2024 Fedora Release Engineering - 1.5.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Mon Dec 11 2023 Marian Koncek - 1.5.1-1 -- Update to upstream version 1.5.1 - -* Fri Sep 01 2023 Mikolaj Izdebski - 1.5.0-8 -- Convert License tag to SPDX format - -* Thu Jul 20 2023 Fedora Release Engineering - 1.5.0-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Wed Feb 08 2023 Marian Koncek - 1.5.0-6 -- Remove provision of glassfish artifact - -* Thu Jan 19 2023 Fedora Release Engineering - 1.5.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Mon Jan 16 2023 Marian Koncek - 1.5.0-4 -- Reduce dependencies - -* Thu Jul 21 2022 Fedora Release Engineering - 1.5.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jul 08 2022 Jiri Vanek - 1.5.0-2 -- Rebuilt for Drop i686 JDKs - -* Mon Apr 11 2022 Didik Supriadi - 1.5.0-1 -- New upstream release 1.5.0 - -* Sat Feb 05 2022 Jiri Vanek - 1.4.5-3 -- Rebuilt for java-17-openjdk as system jdk - -* Thu Jan 20 2022 Fedora Release Engineering - 1.4.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Oct 26 2021 Didik Supriadi - 1.4.5-1 -- New upstream release 1.4.5 - -* Thu Jul 22 2021 Fedora Release Engineering - 1.4.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Tue Jan 26 2021 Fedora Release Engineering - 1.4.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Aug 10 2020 Mat Booth - 1.4.3-3 -- Restore JDK 9+ bits for Jaxb - -* Tue Jul 28 2020 Fedora Release Engineering - 1.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Fri May 08 2020 Fabio Valentini - 1.4.3-1 -- Initial package renamed from glassfish-dtd-parser. +%autochangelog From 2873bd5511480ced3eabac9c35bb115aceb0d22a Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 08/15] Update javapackages test plan to f42 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 17c6113..86bfcea 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://src.fedoraproject.org/tests/javapackages - ref: f41 + ref: f42 execute: how: tmt From 6be261eece094fbbd5d84171605212da9e4a6acb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:44:55 +0000 Subject: [PATCH 09/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 9d4fdc291e4dc27b09b83afd4ae00afe49d1238d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 10/15] Remove javadoc subpackage --- jaxb-dtd-parser.spec | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/jaxb-dtd-parser.spec b/jaxb-dtd-parser.spec index 5cd5cf2..3288863 100644 --- a/jaxb-dtd-parser.spec +++ b/jaxb-dtd-parser.spec @@ -13,16 +13,12 @@ BuildRequires: maven-local 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 %autosetup -p1 -C @@ -37,7 +33,7 @@ popd %build pushd dtd-parser -%mvn_build +%mvn_build -j popd %install @@ -49,8 +45,5 @@ popd %license LICENSE.md NOTICE.md %doc README.md -%files javadoc -f dtd-parser/.mfiles-javadoc -%license LICENSE.md NOTICE.md - %changelog %autochangelog From 7468dd818a715d55e13f43be85bbaf4a3dcb253c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 11/15] Switch to javapackages tests from CentOS Stream GitLab --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 86bfcea..e39d47c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -1,7 +1,7 @@ summary: Run javapackages-specific tests discover: how: fmf - url: https://src.fedoraproject.org/tests/javapackages + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git ref: f42 execute: how: tmt From 322db1f389ad53b28ecce1f6f8a3315bb09e05ff Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 12/15] Switch javapackages test plan to f43 ref --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index e39d47c..ae17c0c 100644 --- a/plans/javapackages.fmf +++ b/plans/javapackages.fmf @@ -2,6 +2,6 @@ summary: Run javapackages-specific tests discover: how: fmf url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git - ref: f42 + ref: f43 execute: how: tmt From 37352fb8738f9209fd6cb453c6c2908ea54d1bc4 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 13/15] Build with OpenJDK 25 --- jaxb-dtd-parser.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jaxb-dtd-parser.spec b/jaxb-dtd-parser.spec index 3288863..ff268fd 100644 --- a/jaxb-dtd-parser.spec +++ b/jaxb-dtd-parser.spec @@ -9,7 +9,7 @@ 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) @@ -24,6 +24,9 @@ SAX-like API for parsing XML DTDs. 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 From 419026f4926443be206f0a506dfc0bba087cb52e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:57:17 +0000 Subject: [PATCH 14/15] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 41a0397756ab42b465635912a8f31e5a5f2f258b Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 21:26:19 +0200 Subject: [PATCH 15/15] 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.