diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 3aa89c4..d68abd7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /JDOM-2.0.5.tar.gz /JDOM-2.0.6.tar.gz /jdom2-2.0.6.tar.gz +/jdom2-2.0.6.1.tar.gz diff --git a/0001-Adapt-build.patch b/0001-Adapt-build.patch index 87e9f3b..53d0362 100644 --- a/0001-Adapt-build.patch +++ b/0001-Adapt-build.patch @@ -1,14 +1,14 @@ -From 05a8a2fa49e92ad36a86d5d73588a2e46bf9ff95 Mon Sep 17 00:00:00 2001 -From: Michael Simacek -Date: Mon, 23 Jul 2018 14:30:14 +0200 +From cf7e676edc7ab9d4b8b130ca4d8ecbd291995dea Mon Sep 17 00:00:00 2001 +From: Mikolaj Izdebski +Date: Mon, 20 Apr 2020 09:29:12 +0200 Subject: [PATCH] Adapt build --- - build.xml | 40 +++++++++++++++++++++++++--------------- - 1 file changed, 25 insertions(+), 15 deletions(-) + build.xml | 61 +++---------------------------------------------------- + 1 file changed, 3 insertions(+), 58 deletions(-) diff --git a/build.xml b/build.xml -index cd7c2ed..10d8df6 100644 +index ed632c2..d80abff 100644 --- a/build.xml +++ b/build.xml @@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file. @@ -26,76 +26,94 @@ index cd7c2ed..10d8df6 100644 - - - -+ ++ -@@ -289,6 +279,7 @@ For instructions on how to build JDOM, please view the README.txt file. - header="<b>${Name}<br><font size='-1'>${version}</font></b>" - bottom="Copyright © ${year} Jason Hunter, Brett McLaughlin. All Rights Reserved."> - -+ - +@@ -296,7 +286,7 @@ For instructions on how to build JDOM, please view the README.txt file. + + + +- + + +@@ -316,27 +306,6 @@ For instructions on how to build JDOM, please view the README.txt file. + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- -@@ -373,11 +364,11 @@ For instructions on how to build JDOM, please view the README.txt file. - - -- -+ + +@@ -505,7 +474,7 @@ For instructions on how to build JDOM, please view the README.txt file. + - - -@@ -401,6 +392,7 @@ For instructions on how to build JDOM, please view the README.txt file. - - - -+ - + +- + + +@@ -517,8 +486,6 @@ For instructions on how to build JDOM, please view the README.txt file. - -@@ -528,7 +520,25 @@ For instructions on how to build JDOM, please view the README.txt file. + + +- +- + + + +@@ -532,28 +499,6 @@ For instructions on how to build JDOM, please view the README.txt file. + - +- - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + -- -2.17.1 +2.37.2 diff --git a/changelog b/changelog new file mode 100644 index 0000000..80c7c86 --- /dev/null +++ b/changelog @@ -0,0 +1,139 @@ +* Thu Jul 18 2024 Fedora Release Engineering - 2.0.6.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Thu Feb 29 2024 Jiri Vanek - 2.0.6.1-8 +- bump of release for for java-21-openjdk as system jdk + +* Tue Feb 27 2024 Jiri Vanek - 2.0.6.1-7 +- Rebuilt for java-21-openjdk as system jdk + +* Tue Feb 20 2024 Marian Koncek - 2.0.6.1-6 +- Update Java source/target to 1.8 + +* Wed Jan 24 2024 Fedora Release Engineering - 2.0.6.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 2.0.6.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 2.0.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 2.0.6.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Sep 08 2022 Marian Koncek - 2.0.6.1-1 +- Update to upstream version 2.0.6.1 + +* Thu Jul 21 2022 Fedora Release Engineering - 2.0.6-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Feb 05 2022 Jiri Vanek - 2.0.6-27 +- Rebuilt for java-17-openjdk as system jdk + +* Thu Jan 20 2022 Fedora Release Engineering - 2.0.6-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Mikolaj Izdebski - 2.0.6-25 +- Bump Java compiler source/target levels to 1.7 + +* Thu Oct 14 2021 Mikolaj Izdebski - 2.0.6-24 +- Add patches to address DoS security vulnerability +- Resolves: CVE-2021-33813 + +* Thu Jul 22 2021 Fedora Release Engineering - 2.0.6-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Mon May 17 2021 Mikolaj Izdebski - 2.0.6-22 +- Bootstrap build +- Non-bootstrap build + +* Tue Jan 26 2021 Fedora Release Engineering - 2.0.6-21 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Thu Sep 10 2020 Fabio Valentini - 2.0.6-20 +- Drop log4j12 dependency and switch junit module to log4j 1.2 API shim. + +* Tue Jul 28 2020 Fedora Release Engineering - 2.0.6-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Sun Jul 19 2020 Fabio Valentini - 2.0.6-18 +- Set javac source and target to 1.8 to fix Java 11 builds. + +* Fri Jul 10 2020 Jiri Vanek - 2.0.6-17 +- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11 + +* Thu May 07 2020 Fabio Valentini - 2.0.6-16 +- Drop optional isorelax verifier support from contrib. + +* Mon Apr 20 2020 Mikolaj Izdebski - 2.0.6-15 +- Disable contrib module + +* Wed Jan 29 2020 Fedora Release Engineering - 2.0.6-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Tue Nov 05 2019 Mikolaj Izdebski - 2.0.6-14 +- Mass rebuild for javapackages-tools 201902 + +* Thu Jul 25 2019 Fedora Release Engineering - 2.0.6-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri May 24 2019 Mikolaj Izdebski - 2.0.6-13 +- Mass rebuild for javapackages-tools 201901 + +* Fri Feb 01 2019 Fedora Release Engineering - 2.0.6-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Jul 23 2018 Michael Simacek - 2.0.6-12 +- Repack tarball without bundled jars +- The repacked jar contains slightly different source (force push by upstream?) +- Correct license tag + +* Tue Jul 17 2018 Mikolaj Izdebski - 2.0.6-11 +- Remove unneeded buildrequires + +* Fri Jul 13 2018 Fedora Release Engineering - 2.0.6-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Wed Feb 07 2018 Fedora Release Engineering - 2.0.6-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 2.0.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Wed May 31 2017 Michael Simacek - 2.0.6-7 +- Avoid hardcoded jar paths + +* Fri Feb 10 2017 Fedora Release Engineering - 2.0.6-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Thu Apr 14 2016 Mat Booth - 2.0.6-6 +- Add OSGi metadata to main jar +- Fix file listed twice warning + +* Thu Feb 04 2016 Fedora Release Engineering - 2.0.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Wed Jun 17 2015 Fedora Release Engineering - 2.0.6-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Tue Mar 24 2015 Mikolaj Izdebski - 2.0.6-3 +- Remove unneeded BR on cobertura + +* Fri Feb 06 2015 gil cattaneo 2.0.6-2 +- introduce license macro + +* Tue Oct 21 2014 gil cattaneo 2.0.6-1 +- update to 2.0.6 (rhbz#1118627) + +* Sun Jun 08 2014 Fedora Release Engineering - 2.0.5-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Fri Mar 28 2014 Michael Simacek - 2.0.5-3 +- Use Requires: java-headless rebuild (#1067528) + +* Thu Nov 14 2013 gil cattaneo 2.0.5-2 +- use objectweb-asm3 + +* Thu Sep 12 2013 gil cattaneo 2.0.5-1 +- initial rpm diff --git a/ci.fmf b/ci.fmf new file mode 100644 index 0000000..c5aa0e0 --- /dev/null +++ b/ci.fmf @@ -0,0 +1 @@ +resultsdb-testcase: separate diff --git a/gating.yaml b/gating.yaml new file mode 100644 index 0000000..0d484d7 --- /dev/null +++ b/gating.yaml @@ -0,0 +1,8 @@ +--- !Policy +product_versions: + - fedora-* +decision_contexts: + - bodhi_update_push_testing + - bodhi_update_push_stable +rules: + - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build./plans/javapackages.functional} diff --git a/generate-tarball.sh b/generate-tarball.sh index b869a6b..e864f8b 100755 --- a/generate-tarball.sh +++ b/generate-tarball.sh @@ -9,7 +9,7 @@ wget "https://github.com/hunterhacker/jdom/archive/JDOM-${version}.tar.gz" -O "$ rm -rf tarball-tmp mkdir tarball-tmp -cd tarball-tmp +pushd tarball-tmp tar xf "../${name}-${version}.orig.tar.gz" # CLEAN TARBALL @@ -17,6 +17,6 @@ rm -r */lib */*/lib find -name '*.jar' -delete find -name '*.class' -delete -tar cf "../${name}-${version}.tar.gz" * -cd .. +tar -czf "../${name}-${version}.tar.gz" * +popd rm -r tarball-tmp "${name}-${version}.orig.tar.gz" diff --git a/jdom-contrib-template.pom b/jdom-contrib-template.pom deleted file mode 100644 index d719410..0000000 --- a/jdom-contrib-template.pom +++ /dev/null @@ -1,96 +0,0 @@ - - 4.0.0 - org.jdom - @artifactID@-contrib - jar - - JDOM Contrib - @version@ - - - A complete, Java-based solution for accessing, manipulating, - and outputting XML data - - http://www.jdom.org - - - JDOM - http://www.jdom.org - - - - - JDOM-interest Mailing List - jdom-interest@jdom.org - http://jdom.markmail.org/ - - - - - - Similar to Apache License but with the acknowledgment clause removed - https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt - repo - - - - - - git@github.com:/hunterhacker/jdom - scm:git:git@github.com:hunterhacker/jdom - scm:git:git@github.com:hunterhacker/jdom - - - - - hunterhacker - Jason Hunter - jhunter@servlets.com - - - rolfl - Rolf Lear - jdom@tuis.net - - - - - - org.jdom - @artifactID@ - @version@ - - - jaxen - jaxen - 1.1.4 - true - - - xerces - xercesImpl - 2.10.0 - true - - - isorelax - isorelax - 20030108 - true - - - stax - stax-api - 1.0.1 - true - - - - - @jdk@ - - \ No newline at end of file diff --git a/jdom-junit-template.pom b/jdom-junit-template.pom deleted file mode 100644 index 70c6554..0000000 --- a/jdom-junit-template.pom +++ /dev/null @@ -1,120 +0,0 @@ - - 4.0.0 - org.jdom - @artifactID@-junit - jar - - JDOM Junit - @version@ - - - A complete, Java-based solution for accessing, manipulating, - and outputting XML data - - http://www.jdom.org - - - JDOM - http://www.jdom.org - - - - - JDOM-interest Mailing List - jdom-interest@jdom.org - http://jdom.markmail.org/ - - - - - - Similar to Apache License but with the acknowledgment clause removed - https://raw.github.com/hunterhacker/jdom/master/LICENSE.txt - repo - - - - - - git@github.com:/hunterhacker/jdom - scm:git:git@github.com:hunterhacker/jdom - scm:git:git@github.com:hunterhacker/jdom - - - - - hunterhacker - Jason Hunter - jhunter@servlets.com - - - rolfl - Rolf Lear - jdom@tuis.net - - - - - - org.jdom - @artifactID@ - @version@ - - - jaxen - jaxen - 1.1.4 - true - - - xerces - xercesImpl - 2.10.0 - true - - - junit - junit - 4.11 - true - - - asm - asm - 3.3.1 - true - - - asm - asm-tree - 3.3.1 - true - - - log4j - log4j - 1.2.17 - true - - - net.sourceforge.cobertura - cobertura - 1.9.4.1 - true - - - net.sourceforge.cobertura - cobertura-runtime - 1.9.4.1 - true - - - - - @jdk@ - - \ No newline at end of file diff --git a/jdom2.spec b/jdom2.spec index 51ba10c..419dbbe 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,35 +1,35 @@ -Name: jdom2 -Version: 2.0.6 -Release: 15%{?dist} -Summary: Java manipulation of XML made easy -License: Saxpath -URL: http://www.jdom.org/ +%bcond_with bootstrap + +Name: jdom2 +Version: 2.0.6.1 +Release: %autorelease +Summary: Java manipulation of XML made easy +License: Saxpath +URL: http://www.jdom.org/ +BuildArch: noarch +ExclusiveArch: %{java_arches} noarch + # ./generate-tarball.sh -Source0: %{name}-%{version}.tar.gz -# originally taken from http://repo1.maven.org/maven2/org/jdom/jdom-contrib/1.1.3/jdom-contrib-1.1.3.pom -Source1: jdom-contrib-template.pom -Source2: jdom-junit-template.pom +Source0: %{name}-%{version}.tar.gz # Bnd tool configuration -Source3: bnd.properties +Source3: bnd.properties # Remove bundled jars that might not have clear licensing -Source4: generate-tarball.sh +Source4: generate-tarball.sh + # Use system libraries # Disable gpg signatures # Process contrib and junit pom files -Patch0: 0001-Adapt-build.patch +Patch: 0001-Adapt-build.patch -BuildRequires: javapackages-local -BuildRequires: ant -BuildRequires: ant-junit -BuildRequires: isorelax -BuildRequires: jaxen -BuildRequires: xalan-j2 -BuildRequires: xerces-j2 -BuildRequires: xml-commons-apis -BuildRequires: log4j12 -BuildRequires: aqute-bnd - -BuildArch: noarch +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else +BuildRequires: javapackages-local-openjdk25 +BuildRequires: ant-openjdk25 +BuildRequires: ant-junit +%endif +# TODO Remove in Fedora 46 +Obsoletes: %{name}-javadoc < 2.0.6.1-21 %description JDOM is a Java-oriented object model which models XML documents. @@ -42,109 +42,36 @@ light-weight means of reading and writing XML data without the complex and memory-consumptive options that current API offerings provide. -%package javadoc -Summary: Javadoc for %{name} - -%description javadoc -This package contains javadoc for %{name}. - %prep -%setup -q -n jdom-JDOM-%{version} +%autosetup -p1 -C -%patch0 -p1 -cp -p %{SOURCE1} maven/contrib.pom -cp -p %{SOURCE2} maven/junit.pom - -sed -i 's/\r//' LICENSE.txt README.txt +sed -i 's/\r//' LICENSE.txt # Unable to run coverage: use log4j12 but switch to log4j 2.x sed -i.coverage "s|coverage, jars|jars|" build.xml -mkdir lib -build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer +# XPath functionality is not needed +rm -rf core/src/java/org/jdom2/xpath/ +sed -i '/import org.jdom2.xpath.XPathFactory/d' core/src/java/org/jdom2/JDOMConstants.java %build -ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven +mkdir lib +%ant -Dversion=%{version} -Dcompile.source=1.8 -Dcompile.target=1.8 maven # Make jar into an OSGi bundle -bnd wrap --output build/package/jdom-%{version}.bar --properties %{SOURCE3} \ - --version %{version} build/package/jdom-%{version}.jar -mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar +# XXX disabled until BND is fixed +#bnd wrap --output build/package/jdom-%{version}.bar --properties %{SOURCE3} \ +# --version %{version} build/package/jdom-%{version}.jar +#mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar %install %mvn_artifact build/maven/core/%{name}-%{version}.pom build/package/jdom-%{version}.jar -%mvn_artifact build/maven/core/%{name}-%{version}-contrib.pom build/package/jdom-%{version}-contrib.jar -%mvn_artifact build/maven/core/%{name}-%{version}-junit.pom build/package/jdom-%{version}-junit.jar -%mvn_install -J build/apidocs +%mvn_install %files -f .mfiles -%doc CHANGES.txt COMMITTERS.txt README.txt TODO.txt -%license LICENSE.txt - -%files javadoc -f .mfiles-javadoc +%doc CHANGES.txt COMMITTERS.txt README.md TODO.txt %license LICENSE.txt %changelog -* Wed Jan 29 2020 Fedora Release Engineering - 2.0.6-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Jul 25 2019 Fedora Release Engineering - 2.0.6-14 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Fri Feb 01 2019 Fedora Release Engineering - 2.0.6-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Mon Jul 23 2018 Michael Simacek - 2.0.6-12 -- Repack tarball without bundled jars -- The repacked jar contains slightly different source (force push by upstream?) -- Correct license tag - -* Tue Jul 17 2018 Mikolaj Izdebski - 2.0.6-11 -- Remove unneeded buildrequires - -* Fri Jul 13 2018 Fedora Release Engineering - 2.0.6-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Wed Feb 07 2018 Fedora Release Engineering - 2.0.6-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 2.0.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Wed May 31 2017 Michael Simacek - 2.0.6-7 -- Avoid hardcoded jar paths - -* Fri Feb 10 2017 Fedora Release Engineering - 2.0.6-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Apr 14 2016 Mat Booth - 2.0.6-6 -- Add OSGi metadata to main jar -- Fix file listed twice warning - -* Thu Feb 04 2016 Fedora Release Engineering - 2.0.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Wed Jun 17 2015 Fedora Release Engineering - 2.0.6-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Tue Mar 24 2015 Mikolaj Izdebski - 2.0.6-3 -- Remove unneeded BR on cobertura - -* Fri Feb 06 2015 gil cattaneo 2.0.6-2 -- introduce license macro - -* Tue Oct 21 2014 gil cattaneo 2.0.6-1 -- update to 2.0.6 (rhbz#1118627) - -* Sun Jun 08 2014 Fedora Release Engineering - 2.0.5-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 2.0.5-3 -- Use Requires: java-headless rebuild (#1067528) - -* Thu Nov 14 2013 gil cattaneo 2.0.5-2 -- use objectweb-asm3 - -* Thu Sep 12 2013 gil cattaneo 2.0.5-1 -- initial rpm +%autochangelog diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..ae17c0c --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +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/sources b/sources index 0850013..7f08082 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jdom2-2.0.6.tar.gz) = 1a38c882323339e94c36635e80635ecf8f66e4a1ed0228f68c11098b1282bd9043fdfec1b31196b79eea72495440ac175af50a0556439be5ba956238c32dd1ff +SHA512 (jdom2-2.0.6.1.tar.gz) = 764fd20e9acbafdd3e3296360614beda0fb8d2c258b5ef0624b455e7008949966ca4f4b71196205e2ff195b3fe4ee8e3d0755f174935d11ad6eb18b8a6d38540