Merge branch 'rawhide' into f35

Revert "No longer used"
This reverts commit 1616e39dd1. Unretirement request: https://pagure.io/releng/issue/10356 Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2021-10-26 18:00:17 +07:00 · 2021-10-26 08:44:50 +02:00 · 2021-10-04 17:11:28 -05:00
13 changed files with 46 additions and 148 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1 @@
 /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
--- a/62
+++ b/62
@ -1,62 +0,0 @@
-* 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.
--- a/ci.fmf
+++ b/ci.fmf
@ -1 +0,0 @@
-resultsdb-testcase: separate
--- a/gating.yaml
+++ b/gating.yaml
@ -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}
--- a/jaxb-dtd-parser.spec
+++ b/jaxb-dtd-parser.spec
@ -1,52 +1,81 @@
 Name:           jaxb-dtd-parser
-Version:        1.5.1
-Release:        %autorelease
+Version:        1.4.5
+Release:        1%{?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:  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
+
+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
+%autosetup

 pushd dtd-parser
-
-# -Werror is considered harmful for downstream package builds
-sed -i /-Werror/d pom.xml
-
+# remove unnecessary dependency on parent POM
+# org.eclipse.ee4j:project is not packaged and isn't needed
 %pom_remove_parent

+# remove unnecessary plugins
 %pom_remove_plugin :buildnumber-maven-plugin
 %pom_remove_plugin :glassfish-copyright-maven-plugin
-%pom_remove_plugin :maven-enforcer-plugin
+
 popd

+
 %build
 pushd dtd-parser
-%mvn_build -j
+%mvn_build
 popd

+
 %install
 pushd dtd-parser
 %mvn_install
 popd

+
 %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
+* 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.
+
--- a/plans/javapackages.fmf
+++ b/plans/javapackages.fmf
@ -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
--- a/plans/smoke.fmf
+++ b/plans/smoke.fmf
@ -1,5 +0,0 @@
-summary: Basic smoke test
-discover:
-  how: fmf
-execute:
-  how: tmt
--- a/2
+++ b/2
@ -1 +1 @@
-SHA512 (jaxb-dtd-parser-1.5.1.tar.gz) = 4618b109ec5a6eac9887c74a92f3189da51957f3962d267ec4345918219b89716d9dd7d96452a51ccda07737244cd25521361bc4455a5b5636fe47e996696d24
+SHA512 (jaxb-dtd-parser-1.4.5.tar.gz) = 9b07f6f8e4860b85f2c89d660fabc1f1ec755f313423f47fd4617fb174f4ee6613dc38923fb2fd6aa768c23d54891ebe1e8fe1a1e422115fb0836a48ddfe1ce5
--- a/tests/Sanity/smoke/Smoke.java
+++ b/tests/Sanity/smoke/Smoke.java
@ -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());
-	}
-}
--- a/tests/Sanity/smoke/main.fmf
+++ b/tests/Sanity/smoke/main.fmf
@ -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
--- a/tests/Sanity/smoke/runtest.sh
+++ b/tests/Sanity/smoke/runtest.sh
@ -1,16 +0,0 @@
-#!/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
--- a/tests/main.fmf
+++ b/tests/main.fmf
@ -1,5 +0,0 @@
-contact: Marian Koncek <mkoncek@redhat.com>
-framework: beakerlib
-test: ./runtest.sh
-tier: 0
-component: jaxb-dtd-parser
Author	SHA1	Message	Date
Didik Supriadi	80a3c1b974	Merge branch 'rawhide' into f35	2021-10-26 18:00:17 +07:00
Tomas Hrcka	40d3a7f4dd	Revert "No longer used" This reverts commit `1616e39dd1`. Unretirement request: https://pagure.io/releng/issue/10356 Signed-off-by: Tomas Hrcka <thrcka@redhat.com>	2021-10-26 08:44:50 +02:00
Endi S. Dewata	2931edc323	No longer used	2021-10-04 17:11:28 -05:00