diff --git a/.fmf/version b/.fmf/version deleted file mode 100644 index d00491f..0000000 --- a/.fmf/version +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/.gitignore b/.gitignore index b86d29b..b1cdc85 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /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 diff --git a/changelog b/changelog deleted file mode 100644 index 0ea1ffb..0000000 --- a/changelog +++ /dev/null @@ -1,62 +0,0 @@ -* 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/ci.fmf b/ci.fmf deleted file mode 100644 index c5aa0e0..0000000 --- a/ci.fmf +++ /dev/null @@ -1 +0,0 @@ -resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml deleted file mode 100644 index 7b6e38f..0000000 --- a/gating.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- !Policy -product_versions: - - fedora-* -decision_contexts: - - bodhi_update_push_testing - - bodhi_update_push_stable -rules: - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/smoke.functional} - - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/jaxb-dtd-parser.spec b/jaxb-dtd-parser.spec index ff268fd..1eb9e9d 100644 --- a/jaxb-dtd-parser.spec +++ b/jaxb-dtd-parser.spec @@ -1,52 +1,89 @@ Name: jaxb-dtd-parser -Version: 1.5.1 -Release: %autorelease +Version: 1.5.0 +Release: 3%{?dist} Summary: SAX-like API for parsing XML DTDs -License: BSD-3-Clause +License: BSD 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-openjdk25 -BuildRequires: mvn(junit:junit) +BuildRequires: git +BuildRequires: maven-local 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 +BuildRequires: mvn(org.codehaus.mojo:buildnumber-maven-plugin) +Provides: glassfish-dtd-parser = %{version}-%{release} %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 - -pushd dtd-parser - -# -Werror is considered harmful for downstream package builds -sed -i /-Werror/d pom.xml +# -S: enable usage of git repo +%autosetup -S git +# delete precompiled jar and class files +find -type f '(' -iname '*.jar' -o -iname '*.class' ')' -print -delete +cd dtd-parser +# remove unnecessary dependency on parent POM +# org.eclipse.ee4j:project is not packaged and isn't needed %pom_remove_parent - -%pom_remove_plugin :buildnumber-maven-plugin +# remove unnecessary plugins %pom_remove_plugin :glassfish-copyright-maven-plugin -%pom_remove_plugin :maven-enforcer-plugin -popd +cd - %build -pushd dtd-parser -%mvn_build -j -popd +cd dtd-parser +%mvn_build +cd - %install -pushd dtd-parser +cd dtd-parser %mvn_install -popd +cd - %files -f dtd-parser/.mfiles %license LICENSE.md NOTICE.md %doc README.md +%files javadoc -f dtd-parser/.mfiles-javadoc +%license LICENSE.md NOTICE.md %changelog -%autochangelog +* 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/plans/javapackages.fmf b/plans/javapackages.fmf deleted file mode 100644 index ae17c0c..0000000 --- a/plans/javapackages.fmf +++ /dev/null @@ -1,7 +0,0 @@ -summary: Run javapackages-specific tests -discover: - how: fmf - 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 deleted file mode 100644 index a1e7bfd..0000000 --- a/plans/smoke.fmf +++ /dev/null @@ -1,5 +0,0 @@ -summary: Basic smoke test -discover: - how: fmf -execute: - how: tmt diff --git a/sources b/sources index e240507..bf7037a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jaxb-dtd-parser-1.5.1.tar.gz) = 4618b109ec5a6eac9887c74a92f3189da51957f3962d267ec4345918219b89716d9dd7d96452a51ccda07737244cd25521361bc4455a5b5636fe47e996696d24 +SHA512 (jaxb-dtd-parser-1.5.0.tar.gz) = 5a609c6535bc538014830d933172fc280127c631bd480d5b62dce606657e18f2904feb84fd4f20af0ba72699e75c580d101e7da26182b0e752dc90d70716b831 diff --git a/tests/Sanity/smoke/Smoke.java b/tests/Sanity/smoke/Smoke.java deleted file mode 100644 index 4762ea3..0000000 --- a/tests/Sanity/smoke/Smoke.java +++ /dev/null @@ -1,15 +0,0 @@ -import com.sun.xml.dtdparser.DTDEventListener; -import com.sun.xml.dtdparser.DTDHandlerBase; -import com.sun.xml.dtdparser.DTDParser; -import com.sun.xml.dtdparser.InputEntity; - -public class Smoke -{ - public static void main(String[] args) - { - System.out.println(DTDEventListener.class.getCanonicalName()); - System.out.println(DTDHandlerBase.class.getCanonicalName()); - System.out.println(DTDParser.class.getCanonicalName()); - System.out.println(InputEntity.class.getCanonicalName()); - } -} diff --git a/tests/Sanity/smoke/main.fmf b/tests/Sanity/smoke/main.fmf deleted file mode 100644 index dd5a73c..0000000 --- a/tests/Sanity/smoke/main.fmf +++ /dev/null @@ -1,7 +0,0 @@ -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 deleted file mode 100755 index f16aa8e..0000000 --- a/tests/Sanity/smoke/runtest.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/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 deleted file mode 100644 index 543e68e..0000000 --- a/tests/main.fmf +++ /dev/null @@ -1,5 +0,0 @@ -contact: Marian Koncek -framework: beakerlib -test: ./runtest.sh -tier: 0 -component: jaxb-dtd-parser