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 0367a4d..ff268fd 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: %autorelease Summary: SAX-like API for parsing XML DTDs License: BSD-3-Clause URL: https://github.com/eclipse-ee4j/jaxb-dtd-parser @@ -9,25 +9,24 @@ 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 @@ -37,7 +36,7 @@ popd %build pushd dtd-parser -%mvn_build +%mvn_build -j popd %install @@ -49,63 +48,5 @@ popd %license LICENSE.md NOTICE.md %doc README.md -%files javadoc -f dtd-parser/.mfiles-javadoc -%license LICENSE.md NOTICE.md - %changelog -* 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 diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index a2cdaba..ae17c0c 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 - ref: f40 + url: https://gitlab.com/redhat/centos-stream/tests/javapackages.git + ref: f43 execute: how: tmt 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..f16aa8e --- /dev/null +++ b/tests/Sanity/smoke/runtest.sh @@ -0,0 +1,16 @@ +#!/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 + 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 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