From cddc13168fa22b1eeb00410cdd8b4f5f9ba15ee5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 24 May 2019 17:00:50 +0200 Subject: [PATCH 01/55] Mass rebuild for javapackages-tools 201901 --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 9c496a8..0e91029 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,6 +1,6 @@ Name: jdom2 Version: 2.0.6 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -86,6 +86,9 @@ mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar %license LICENSE.txt %changelog +* Fri May 24 2019 Mikolaj Izdebski - 2.0.6-13 +- Mass rebuild for javapackages-tools 201901 + * 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?) From 55aae16aa8ffc5689c58a062575c038a94b7cbd1 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 2 Aug 2019 10:07:48 +0200 Subject: [PATCH 02/55] Disable OSGi manifest injection unlit BND is fixed --- jdom2.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index 0e91029..b29a90e 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -27,7 +27,7 @@ BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-apis BuildRequires: log4j12 -BuildRequires: aqute-bnd +#BuildRequires: aqute-bnd BuildArch: noarch @@ -68,9 +68,10 @@ build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java 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 From 7110c8dfdcd605b090ac871034a33d332956af64 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 28 Oct 2019 14:22:49 +0100 Subject: [PATCH 03/55] Set compiler source/target levels to 1.6 --- jdom2.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index b29a90e..1bae457 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -61,11 +61,10 @@ sed -i 's/\r//' LICENSE.txt README.txt # Unable to run coverage: use log4j12 but switch to log4j 2.x sed -i.coverage "s|coverage, jars|jars|" build.xml +%build mkdir lib build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer - -%build -ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven +ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven # Make jar into an OSGi bundle # XXX disabled until BND is fixed From 13d138c6c33fe7dfa09edd95666b2f8ab7cb004b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 5 Nov 2019 17:29:28 +0100 Subject: [PATCH 04/55] Mass rebuild for javapackages-tools 201902 --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 1bae457..879249c 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,6 +1,6 @@ Name: jdom2 Version: 2.0.6 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -86,6 +86,9 @@ ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc %license LICENSE.txt %changelog +* Tue Nov 05 2019 Mikolaj Izdebski - 2.0.6-14 +- Mass rebuild for javapackages-tools 201902 + * Fri May 24 2019 Mikolaj Izdebski - 2.0.6-13 - Mass rebuild for javapackages-tools 201901 From 7f370edaef94cf4cbcfc7743de4c048c80892db6 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Mon, 27 Jan 2020 16:27:17 +0100 Subject: [PATCH 05/55] Properly compress tarballs --- generate-tarball.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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" From 56c0a7a04b46d58bd4b964d69b8060d646d50867 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 20 Apr 2020 09:29:34 +0200 Subject: [PATCH 06/55] Disable contrib module --- 0001-Adapt-build.patch | 139 ++++++++++++++++++++------------------ jdom-contrib-template.pom | 96 -------------------------- jdom-junit-template.pom | 120 -------------------------------- jdom2.spec | 18 ++--- 4 files changed, 81 insertions(+), 292 deletions(-) delete mode 100644 jdom-contrib-template.pom delete mode 100644 jdom-junit-template.pom diff --git a/0001-Adapt-build.patch b/0001-Adapt-build.patch index 87e9f3b..e970552 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 | 54 +++--------------------------------------------------- + 1 file changed, 3 insertions(+), 51 deletions(-) diff --git a/build.xml b/build.xml -index cd7c2ed..10d8df6 100644 +index cd7c2ed..16368e2 100644 --- a/build.xml +++ b/build.xml @@ -112,17 +112,7 @@ For instructions on how to build JDOM, please view the README.txt file. @@ -30,72 +30,83 @@ 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,21 +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. - - -- -+ +@@ -500,7 +475,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. - - - -+ - + +- + + +@@ -512,8 +487,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. + + +- +- + + + +@@ -528,27 +501,6 @@ For instructions on how to build JDOM, please view the README.txt file. - -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ - - +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + -- -2.17.1 +2.25.2 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 879249c..af10384 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,14 +1,11 @@ Name: jdom2 Version: 2.0.6 -Release: 14%{?dist} +Release: 15%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ # ./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 # Bnd tool configuration Source3: bnd.properties # Remove bundled jars that might not have clear licensing @@ -23,8 +20,6 @@ BuildRequires: ant BuildRequires: ant-junit BuildRequires: isorelax BuildRequires: jaxen -BuildRequires: xalan-j2 -BuildRequires: xerces-j2 BuildRequires: xml-commons-apis BuildRequires: log4j12 #BuildRequires: aqute-bnd @@ -53,9 +48,6 @@ This package contains javadoc for %{name}. %patch0 -p1 -cp -p %{SOURCE1} maven/contrib.pom -cp -p %{SOURCE2} maven/junit.pom - sed -i 's/\r//' LICENSE.txt README.txt # Unable to run coverage: use log4j12 but switch to log4j 2.x @@ -63,7 +55,8 @@ sed -i.coverage "s|coverage, jars|jars|" build.xml %build mkdir lib -build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer +#build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer +build-jar-repository lib jaxen ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven # Make jar into an OSGi bundle @@ -74,8 +67,6 @@ ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc %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 %files -f .mfiles @@ -86,6 +77,9 @@ ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc %license LICENSE.txt %changelog +* Mon Apr 20 2020 Mikolaj Izdebski - 2.0.6-15 +- Disable contrib module + * Tue Nov 05 2019 Mikolaj Izdebski - 2.0.6-14 - Mass rebuild for javapackages-tools 201902 From 79a534d6ef1f73b4b819830a78c6bc7c1da94f34 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Apr 2020 06:34:50 +0200 Subject: [PATCH 07/55] Remove unneeded dependencies --- jdom2.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index af10384..e313029 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -18,11 +18,8 @@ Patch0: 0001-Adapt-build.patch BuildRequires: javapackages-local BuildRequires: ant BuildRequires: ant-junit -BuildRequires: isorelax BuildRequires: jaxen -BuildRequires: xml-commons-apis BuildRequires: log4j12 -#BuildRequires: aqute-bnd BuildArch: noarch From b82e46814b656c20cddc87e13fdc188338224c59 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 21 Apr 2020 11:22:37 +0200 Subject: [PATCH 08/55] Remove XPath functionality --- jdom2.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index e313029..fee0abc 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -18,7 +18,6 @@ Patch0: 0001-Adapt-build.patch BuildRequires: javapackages-local BuildRequires: ant BuildRequires: ant-junit -BuildRequires: jaxen BuildRequires: log4j12 BuildArch: noarch @@ -50,10 +49,12 @@ sed -i 's/\r//' LICENSE.txt README.txt # Unable to run coverage: use log4j12 but switch to log4j 2.x sed -i.coverage "s|coverage, jars|jars|" build.xml +# 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 mkdir lib -#build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j2 xalan-j2-serializer -build-jar-repository lib jaxen ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven # Make jar into an OSGi bundle From e23286dabf4bf8aaf57915b81142f72424e2bff0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 28 Apr 2020 12:02:53 +0200 Subject: [PATCH 09/55] Drop buildrequires on log4j12 --- jdom2.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index fee0abc..9b60df7 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -18,7 +18,6 @@ Patch0: 0001-Adapt-build.patch BuildRequires: javapackages-local BuildRequires: ant BuildRequires: ant-junit -BuildRequires: log4j12 BuildArch: noarch From bb2ab73b201d69303c1890954fa84f9155d62a01 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 7 May 2020 11:39:57 +0200 Subject: [PATCH 10/55] drop optional isorelax verifier support from contrib --- jdom2.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index 51ba10c..981163c 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,6 +1,6 @@ Name: jdom2 Version: 2.0.6 -Release: 15%{?dist} +Release: 16%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -21,7 +21,6 @@ Patch0: 0001-Adapt-build.patch BuildRequires: javapackages-local BuildRequires: ant BuildRequires: ant-junit -BuildRequires: isorelax BuildRequires: jaxen BuildRequires: xalan-j2 BuildRequires: xerces-j2 @@ -62,7 +61,10 @@ sed -i 's/\r//' LICENSE.txt README.txt 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 +build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit xalan-j2 xalan-j2-serializer + +# drop optional isorelax verifier support from contrib +rm -r contrib/src/java/org/jdom2/contrib/schema %build ant -Dversion=%{version} -Dj2se.apidoc=%{_javadocdir}/java maven @@ -86,6 +88,9 @@ mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar %license LICENSE.txt %changelog +* Thu May 07 2020 Fabio Valentini - 2.0.6-16 +- Drop optional isorelax verifier support from contrib. + * Wed Jan 29 2020 Fedora Release Engineering - 2.0.6-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From cb6b88cefe7167365cd1e0b48e449ef2ccef793b Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 10 Jul 2020 23:53:59 +0200 Subject: [PATCH 11/55] Rebuilt for JDK-11 --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 981163c..28ebe6c 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,6 +1,6 @@ Name: jdom2 Version: 2.0.6 -Release: 16%{?dist} +Release: 17%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -88,6 +88,9 @@ mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar %license LICENSE.txt %changelog +* 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. From 060ee7a5a8815176f8f22cf2fd51386a2ea979ff Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Sun, 19 Jul 2020 23:41:13 +0200 Subject: [PATCH 12/55] set javac source / target to 1.8 to fix Java 11 builds --- 0002-More-adapt-build-javac-1.8.patch | 15 +++++++++++++++ jdom2.spec | 7 ++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 0002-More-adapt-build-javac-1.8.patch diff --git a/0002-More-adapt-build-javac-1.8.patch b/0002-More-adapt-build-javac-1.8.patch new file mode 100644 index 0000000..f6ffdcb --- /dev/null +++ b/0002-More-adapt-build-javac-1.8.patch @@ -0,0 +1,15 @@ +diff --git a/build.xml b/build.xml +index cd7c2ed..f86b76a 100644 +--- a/build.xml ++++ b/build.xml +@@ -47,8 +47,8 @@ For instructions on how to build JDOM, please view the README.txt file. + + + +- +- ++ ++ + + + diff --git a/jdom2.spec b/jdom2.spec index 28ebe6c..1869aa3 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,6 +1,6 @@ Name: jdom2 Version: 2.0.6 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -17,6 +17,7 @@ Source4: generate-tarball.sh # Disable gpg signatures # Process contrib and junit pom files Patch0: 0001-Adapt-build.patch +Patch1: 0002-More-adapt-build-javac-1.8.patch BuildRequires: javapackages-local BuildRequires: ant @@ -51,6 +52,7 @@ This package contains javadoc for %{name}. %setup -q -n jdom-JDOM-%{version} %patch0 -p1 +%patch1 -p1 cp -p %{SOURCE1} maven/contrib.pom cp -p %{SOURCE2} maven/junit.pom @@ -88,6 +90,9 @@ mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar %license LICENSE.txt %changelog +* 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 From fa0c0f3145640516a5a1e5efb29e745386edc19f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 02:20:08 +0000 Subject: [PATCH 13/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 1869aa3..4cd4093 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,6 +1,6 @@ Name: jdom2 Version: 2.0.6 -Release: 18%{?dist} +Release: 19%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -90,6 +90,9 @@ mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar %license LICENSE.txt %changelog +* 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. From edd3ffdcd3074c4c1412350276260bebfc6e03e9 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Thu, 10 Sep 2020 13:44:10 +0200 Subject: [PATCH 14/55] drop log4j12 dependency and switch junit module to log4j 1.2 API shim --- jdom-junit-template.pom | 6 +++--- jdom2.spec | 6 ++++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/jdom-junit-template.pom b/jdom-junit-template.pom index 70c6554..7bc62f9 100644 --- a/jdom-junit-template.pom +++ b/jdom-junit-template.pom @@ -95,9 +95,9 @@ true - log4j - log4j - 1.2.17 + org.apache.logging.log4j + log4j-1.2-api + 2.13.3 true diff --git a/jdom2.spec b/jdom2.spec index 4cd4093..9cdb74b 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,6 +1,6 @@ Name: jdom2 Version: 2.0.6 -Release: 19%{?dist} +Release: 20%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -26,7 +26,6 @@ BuildRequires: jaxen BuildRequires: xalan-j2 BuildRequires: xerces-j2 BuildRequires: xml-commons-apis -BuildRequires: log4j12 BuildRequires: aqute-bnd BuildArch: noarch @@ -90,6 +89,9 @@ mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar %license LICENSE.txt %changelog +* 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 From 01fd63a85cf616ef1bfe45b79f36f714c238810f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 14:51:43 +0000 Subject: [PATCH 15/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 9cdb74b..2f0d2b1 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,6 +1,6 @@ Name: jdom2 Version: 2.0.6 -Release: 20%{?dist} +Release: 21%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -89,6 +89,9 @@ mv build/package/jdom-%{version}.bar build/package/jdom-%{version}.jar %license LICENSE.txt %changelog +* 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. From 9e7c20382c5348db5d2c37b43b7cc520e0428561 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 15:33:12 +0200 Subject: [PATCH 16/55] Conditionalize buildrequires in bootstrap mode --- jdom2.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jdom2.spec b/jdom2.spec index 9b60df7..96cd5e5 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,3 +1,5 @@ +%bcond_without bootstrap + Name: jdom2 Version: 2.0.6 Release: 15%{?dist} @@ -16,8 +18,12 @@ Source4: generate-tarball.sh Patch0: 0001-Adapt-build.patch BuildRequires: javapackages-local +%if %{with bootstrap} +BuildRequires: javapackages-bootstrap +%else BuildRequires: ant BuildRequires: ant-junit +%endif BuildArch: noarch From d29f52bb8f29db3759e7cfc58f5793d19211e931 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 16 Apr 2021 18:31:23 +0200 Subject: [PATCH 17/55] Use %ant macro --- jdom2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 96cd5e5..fa0f516 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -60,7 +60,7 @@ sed -i '/import org.jdom2.xpath.XPathFactory/d' core/src/java/org/jdom2/JDOMCons %build mkdir lib -ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven +%ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven # Make jar into an OSGi bundle # XXX disabled until BND is fixed From 770b63da6d60f31758d10f5407105f6eea4a6f4e Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 13 May 2021 19:08:42 +0200 Subject: [PATCH 18/55] Turn off bootstrap mode by default --- jdom2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index fa0f516..cee1a56 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: jdom2 Version: 2.0.6 From 42cf32cce9c94c13b55efe0bda3c98129ccb0ab0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 15:49:53 +0200 Subject: [PATCH 19/55] Bootstrap build --- jdom2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index 7f37733..879bc9c 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,8 +1,8 @@ -%bcond_with bootstrap +%bcond_without bootstrap Name: jdom2 Version: 2.0.6 -Release: 21%{?dist} +Release: 22%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -80,6 +80,9 @@ mkdir lib %license LICENSE.txt %changelog +* Mon May 17 2021 Mikolaj Izdebski - 2.0.6-22 +- Bootstrap build + * Tue Jan 26 2021 Fedora Release Engineering - 2.0.6-21 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 81b422c38217aed78ca83a487b3ab5155dc9ba0c Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 17 May 2021 18:01:43 +0200 Subject: [PATCH 20/55] Non-bootstrap build --- jdom2.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 879bc9c..2f6239a 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,4 +1,4 @@ -%bcond_without bootstrap +%bcond_with bootstrap Name: jdom2 Version: 2.0.6 @@ -82,6 +82,7 @@ mkdir lib %changelog * 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 From 0f87153540ca65566905343b30ba8de48fb2de74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= Date: Mon, 19 Jul 2021 01:03:08 +0200 Subject: [PATCH 21/55] Add P100->102: Fixes CVE-2021-33813 --- ...16957b59d305f04c7bdb26292852bcbc2eb5.patch | 36 ++++++++++ ...b78370098491911d7fe9d7a43b97144a234e.patch | 69 +++++++++++++++++++ ...3c2fc7893edd914954c73eb577f925a7d361.patch | 34 +++++++++ jdom2.spec | 13 ++++ 4 files changed, 152 insertions(+) create mode 100644 07f316957b59d305f04c7bdb26292852bcbc2eb5.patch create mode 100644 bd3ab78370098491911d7fe9d7a43b97144a234e.patch create mode 100644 dd4f3c2fc7893edd914954c73eb577f925a7d361.patch diff --git a/07f316957b59d305f04c7bdb26292852bcbc2eb5.patch b/07f316957b59d305f04c7bdb26292852bcbc2eb5.patch new file mode 100644 index 0000000..019a524 --- /dev/null +++ b/07f316957b59d305f04c7bdb26292852bcbc2eb5.patch @@ -0,0 +1,36 @@ +From 07f316957b59d305f04c7bdb26292852bcbc2eb5 Mon Sep 17 00:00:00 2001 +From: Rolf Lear +Date: Thu, 1 Jul 2021 23:56:47 -0400 +Subject: [PATCH] Update test case to ensure DTD handling is OK again. Related + #188. Related #189 + +--- + test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java +index a69380ba..a35a1b90 100644 +--- a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java ++++ b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java +@@ -101,6 +101,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + import org.jdom2.DefaultJDOMFactory; + import org.jdom2.Document; + import org.jdom2.EntityRef; ++import org.jdom2.JDOMConstants; + import org.jdom2.JDOMException; + import org.jdom2.JDOMFactory; + import org.jdom2.UncheckedJDOMFactory; +@@ -609,11 +610,12 @@ public void testSetExternalFeature() { + XMLReader reader = sb.createParser(); + assertNotNull(reader); + assertTrue(reader.getFeature(feature)); ++ assertNull(reader.getProperty(JDOMConstants.SAX_PROPERTY_DECLARATION_HANDLER)); + sb.setFeature(feature, false); + reader = sb.createParser(); + assertNotNull(reader); + assertFalse(reader.getFeature(feature)); +- ++ assertNotNull(reader.getProperty(JDOMConstants.SAX_PROPERTY_DECLARATION_HANDLER)); + } catch (Exception e) { + e.printStackTrace(); + fail("Could not create parser: " + e.getMessage()); diff --git a/bd3ab78370098491911d7fe9d7a43b97144a234e.patch b/bd3ab78370098491911d7fe9d7a43b97144a234e.patch new file mode 100644 index 0000000..85e38a2 --- /dev/null +++ b/bd3ab78370098491911d7fe9d7a43b97144a234e.patch @@ -0,0 +1,69 @@ +From bd3ab78370098491911d7fe9d7a43b97144a234e Mon Sep 17 00:00:00 2001 +From: Esti +Date: Thu, 18 Feb 2021 16:40:01 +0200 +Subject: [PATCH] fix setFeature bug and add test case + +--- + core/src/java/org/jdom2/input/SAXBuilder.java | 10 ++++------ + .../test/cases/input/TestSAXBuilder.java | 20 +++++++++++++++++++ + 2 files changed, 24 insertions(+), 6 deletions(-) + +diff --git a/core/src/java/org/jdom2/input/SAXBuilder.java b/core/src/java/org/jdom2/input/SAXBuilder.java +index d7105ec6..a1462334 100644 +--- a/core/src/java/org/jdom2/input/SAXBuilder.java ++++ b/core/src/java/org/jdom2/input/SAXBuilder.java +@@ -971,11 +971,6 @@ protected void configureParser(final XMLReader parser, final SAXHandler contentH + } + } + +- // Set any user-specified features on the parser. +- for (final Map.Entry me : features.entrySet()) { +- internalSetFeature(parser, me.getKey(), me.getValue().booleanValue(), me.getKey()); +- } +- + // Set any user-specified properties on the parser. + for (final Map.Entry me : properties.entrySet()) { + internalSetProperty(parser, me.getKey(), me.getValue(), me.getKey()); +@@ -1007,7 +1002,10 @@ protected void configureParser(final XMLReader parser, final SAXHandler contentH + // No lexical reporting available + } + } +- ++ // Set any user-specified features on the parser. ++ for (final Map.Entry me : features.entrySet()) { ++ internalSetFeature(parser, me.getKey(), me.getValue().booleanValue(), me.getKey()); ++ } + } + + /** +diff --git a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java +index 4ef34834..a69380ba 100644 +--- a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java ++++ b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java +@@ -600,6 +600,26 @@ public void testSetFeature() { + } + } + ++ @Test ++ public void testSetExternalFeature() { ++ String feature = "http://xml.org/sax/features/external-general-entities"; ++ MySAXBuilder sb = new MySAXBuilder(); ++ try { ++ sb.setFeature(feature, true); ++ XMLReader reader = sb.createParser(); ++ assertNotNull(reader); ++ assertTrue(reader.getFeature(feature)); ++ sb.setFeature(feature, false); ++ reader = sb.createParser(); ++ assertNotNull(reader); ++ assertFalse(reader.getFeature(feature)); ++ ++ } catch (Exception e) { ++ e.printStackTrace(); ++ fail("Could not create parser: " + e.getMessage()); ++ } ++ } ++ + @Test + public void testSetProperty() { + LexicalHandler lh = new LexicalHandler() { diff --git a/dd4f3c2fc7893edd914954c73eb577f925a7d361.patch b/dd4f3c2fc7893edd914954c73eb577f925a7d361.patch new file mode 100644 index 0000000..06ac749 --- /dev/null +++ b/dd4f3c2fc7893edd914954c73eb577f925a7d361.patch @@ -0,0 +1,34 @@ +From dd4f3c2fc7893edd914954c73eb577f925a7d361 Mon Sep 17 00:00:00 2001 +From: Rolf Lear +Date: Thu, 1 Jul 2021 23:42:05 -0400 +Subject: [PATCH] Addresses #189 - synchronizes external entity expansion + setting + +--- + core/src/java/org/jdom2/input/SAXBuilder.java | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/core/src/java/org/jdom2/input/SAXBuilder.java b/core/src/java/org/jdom2/input/SAXBuilder.java +index a1462334..514b026d 100644 +--- a/core/src/java/org/jdom2/input/SAXBuilder.java ++++ b/core/src/java/org/jdom2/input/SAXBuilder.java +@@ -82,6 +82,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + import org.jdom2.DocType; + import org.jdom2.Document; + import org.jdom2.EntityRef; ++import org.jdom2.JDOMConstants; + import org.jdom2.JDOMException; + import org.jdom2.JDOMFactory; + import org.jdom2.Verifier; +@@ -797,6 +798,11 @@ public void setFastReconfigure(final boolean fastReconfigure) { + public void setFeature(final String name, final boolean value) { + // Save the specified feature for later. + features.put(name, value ? Boolean.TRUE : Boolean.FALSE); ++ if (JDOMConstants.SAX_FEATURE_EXTERNAL_ENT.equals(name)) { ++ // See issue https://github.com/hunterhacker/jdom/issues/189 ++ // And PR https://github.com/hunterhacker/jdom/pull/188 ++ setExpandEntities(value); ++ } + engine = null; + } + diff --git a/jdom2.spec b/jdom2.spec index 2f6239a..f670767 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -17,6 +17,15 @@ Source4: generate-tarball.sh # Process contrib and junit pom files Patch0: 0001-Adapt-build.patch +# +# Security patches +# P100 -> ... +# +# CVE-2021-33813 +Patch100: bd3ab78370098491911d7fe9d7a43b97144a234e.patch +Patch101: dd4f3c2fc7893edd914954c73eb577f925a7d361.patch +Patch102: 07f316957b59d305f04c7bdb26292852bcbc2eb5.patch + BuildRequires: javapackages-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap @@ -49,6 +58,10 @@ This package contains javadoc for %{name}. %patch0 -p1 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 + sed -i 's/\r//' LICENSE.txt README.txt # Unable to run coverage: use log4j12 but switch to log4j 2.x From 45572eb31f1535f27efcd8e625d6dedf1c03823a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C3=A9cureuil?= Date: Tue, 20 Jul 2021 14:54:04 +0200 Subject: [PATCH 22/55] Bump release --- jdom2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index f670767..3efa97c 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -93,6 +93,10 @@ mkdir lib %license LICENSE.txt %changelog +* Tue Jul 20 2021 Nicolas Lécureuil - 2.0.6-23 +- Bootstrap build +- Non-bootstrap build + * Mon May 17 2021 Mikolaj Izdebski - 2.0.6-22 - Bootstrap build - Non-bootstrap build From c9b09d3a262cdd4237c0e07da9816d362b693da3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 09:05:10 +0000 Subject: [PATCH 23/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 2f6239a..aae88a0 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6 -Release: 22%{?dist} +Release: 23%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -80,6 +80,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From b64215591402da16b02b1a2c7fa0637c40eacf18 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 2 Nov 2021 16:22:34 +0100 Subject: [PATCH 24/55] Bump Java compiler source/target levels to 1.7 --- jdom2.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index 3087a92..0a42e35 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6 -Release: 24%{?dist} +Release: 25%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -73,7 +73,7 @@ sed -i '/import org.jdom2.xpath.XPathFactory/d' core/src/java/org/jdom2/JDOMCons %build mkdir lib -%ant -Dversion=%{version} -Dcompile.source=1.6 -Dcompile.target=1.6 -Dj2se.apidoc=%{_javadocdir}/java maven +%ant -Dversion=%{version} -Dcompile.source=1.7 -Dcompile.target=1.7 -Dj2se.apidoc=%{_javadocdir}/java maven # Make jar into an OSGi bundle # XXX disabled until BND is fixed @@ -93,6 +93,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From c2ac5b737dbf4f2d762106c79d1d49ff72b6491e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:47:45 +0000 Subject: [PATCH 25/55] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 0a42e35..aec23af 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6 -Release: 25%{?dist} +Release: 26%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -93,6 +93,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From ddf611394fe11a1a114e0f2e243c6b5e1186a67a Mon Sep 17 00:00:00 2001 From: Jiri Date: Sat, 5 Feb 2022 21:42:32 +0100 Subject: [PATCH 26/55] Rebuilt for java-17-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java17 --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index aec23af..ebc54db 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -93,6 +93,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From 715d6c56c102fc81f58c40a51c2943eb90d31623 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 12 May 2022 22:33:24 +0200 Subject: [PATCH 27/55] Add ExclusiveArch: %{java_arches} noarch See: https://fedoraproject.org/wiki/Changes/Drop_i686_JDKs --- jdom2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/jdom2.spec b/jdom2.spec index ebc54db..f7c7fa3 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -35,6 +35,7 @@ BuildRequires: ant-junit %endif BuildArch: noarch +ExclusiveArch: %{java_arches} noarch %description JDOM is a Java-oriented object model which models XML documents. From 4115dca46fd3959e0910ab03625ed2e5e3c71d11 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 14 Jun 2022 10:16:40 +0200 Subject: [PATCH 28/55] Update build-requires in bootstrap mode --- jdom2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index f7c7fa3..0b76b45 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -26,10 +26,10 @@ Patch100: bd3ab78370098491911d7fe9d7a43b97144a234e.patch Patch101: dd4f3c2fc7893edd914954c73eb577f925a7d361.patch Patch102: 07f316957b59d305f04c7bdb26292852bcbc2eb5.patch -BuildRequires: javapackages-local %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else +BuildRequires: javapackages-local BuildRequires: ant BuildRequires: ant-junit %endif From 36d15b55f12579c7530367c04acd55c3a23fc951 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 15:13:34 +0000 Subject: [PATCH 29/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 0b76b45..7906435 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -94,6 +94,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From 2a5600de74a6b051ff2e125bb6af316d5d44e29f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Aug 2022 08:36:51 +0200 Subject: [PATCH 30/55] Onboard package into gating --- .fmf/version | 1 + ci.fmf | 1 + gating.yaml | 8 ++++++++ plans/javapackages.fmf | 7 +++++++ 4 files changed, 17 insertions(+) create mode 100644 .fmf/version create mode 100644 ci.fmf create mode 100644 gating.yaml create mode 100644 plans/javapackages.fmf 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/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/plans/javapackages.fmf b/plans/javapackages.fmf new file mode 100644 index 0000000..8f6c9cb --- /dev/null +++ b/plans/javapackages.fmf @@ -0,0 +1,7 @@ +summary: Run javapackages-specific tests +discover: + how: fmf + url: https://src.fedoraproject.org/tests/javapackages + ref: f37 +execute: + how: tmt From 4c8ec1caec94e6fbd147c386a55e2152701d9702 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Thu, 8 Sep 2022 14:21:48 +0200 Subject: [PATCH 31/55] Update to upstream version 2.0.6.1 --- .gitignore | 1 + 0001-Adapt-build.patch | 29 +++++--- ...16957b59d305f04c7bdb26292852bcbc2eb5.patch | 36 ---------- ...b78370098491911d7fe9d7a43b97144a234e.patch | 69 ------------------- ...3c2fc7893edd914954c73eb577f925a7d361.patch | 34 --------- jdom2.spec | 24 ++----- sources | 2 +- 7 files changed, 27 insertions(+), 168 deletions(-) delete mode 100644 07f316957b59d305f04c7bdb26292852bcbc2eb5.patch delete mode 100644 bd3ab78370098491911d7fe9d7a43b97144a234e.patch delete mode 100644 dd4f3c2fc7893edd914954c73eb577f925a7d361.patch 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 e970552..53d0362 100644 --- a/0001-Adapt-build.patch +++ b/0001-Adapt-build.patch @@ -4,11 +4,11 @@ Date: Mon, 20 Apr 2020 09:29:12 +0200 Subject: [PATCH] Adapt build --- - build.xml | 54 +++--------------------------------------------------- - 1 file changed, 3 insertions(+), 51 deletions(-) + build.xml | 61 +++---------------------------------------------------- + 1 file changed, 3 insertions(+), 58 deletions(-) diff --git a/build.xml b/build.xml -index cd7c2ed..16368e2 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,7 +26,7 @@ index cd7c2ed..16368e2 100644 - - - -+ ++ @@ -39,7 +39,7 @@ index cd7c2ed..16368e2 100644 description="Builds the Jars"> -@@ -316,21 +306,6 @@ 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. @@ -53,15 +53,21 @@ index cd7c2ed..16368e2 100644 - - +- - - +- +- - +- +- - - - +- -@@ -500,7 +475,7 @@ 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. @@ -70,7 +76,7 @@ index cd7c2ed..16368e2 100644 description="Prepares Maven bundle to load on to Sonatype Nexus for Maven-Central"> -@@ -512,8 +487,6 @@ 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. @@ -79,10 +85,11 @@ index cd7c2ed..16368e2 100644 -@@ -528,27 +501,6 @@ 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. + - +- - - - @@ -108,5 +115,5 @@ index cd7c2ed..16368e2 100644 -- -2.25.2 +2.37.2 diff --git a/07f316957b59d305f04c7bdb26292852bcbc2eb5.patch b/07f316957b59d305f04c7bdb26292852bcbc2eb5.patch deleted file mode 100644 index 019a524..0000000 --- a/07f316957b59d305f04c7bdb26292852bcbc2eb5.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 07f316957b59d305f04c7bdb26292852bcbc2eb5 Mon Sep 17 00:00:00 2001 -From: Rolf Lear -Date: Thu, 1 Jul 2021 23:56:47 -0400 -Subject: [PATCH] Update test case to ensure DTD handling is OK again. Related - #188. Related #189 - ---- - test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java -index a69380ba..a35a1b90 100644 ---- a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java -+++ b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java -@@ -101,6 +101,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - import org.jdom2.DefaultJDOMFactory; - import org.jdom2.Document; - import org.jdom2.EntityRef; -+import org.jdom2.JDOMConstants; - import org.jdom2.JDOMException; - import org.jdom2.JDOMFactory; - import org.jdom2.UncheckedJDOMFactory; -@@ -609,11 +610,12 @@ public void testSetExternalFeature() { - XMLReader reader = sb.createParser(); - assertNotNull(reader); - assertTrue(reader.getFeature(feature)); -+ assertNull(reader.getProperty(JDOMConstants.SAX_PROPERTY_DECLARATION_HANDLER)); - sb.setFeature(feature, false); - reader = sb.createParser(); - assertNotNull(reader); - assertFalse(reader.getFeature(feature)); -- -+ assertNotNull(reader.getProperty(JDOMConstants.SAX_PROPERTY_DECLARATION_HANDLER)); - } catch (Exception e) { - e.printStackTrace(); - fail("Could not create parser: " + e.getMessage()); diff --git a/bd3ab78370098491911d7fe9d7a43b97144a234e.patch b/bd3ab78370098491911d7fe9d7a43b97144a234e.patch deleted file mode 100644 index 85e38a2..0000000 --- a/bd3ab78370098491911d7fe9d7a43b97144a234e.patch +++ /dev/null @@ -1,69 +0,0 @@ -From bd3ab78370098491911d7fe9d7a43b97144a234e Mon Sep 17 00:00:00 2001 -From: Esti -Date: Thu, 18 Feb 2021 16:40:01 +0200 -Subject: [PATCH] fix setFeature bug and add test case - ---- - core/src/java/org/jdom2/input/SAXBuilder.java | 10 ++++------ - .../test/cases/input/TestSAXBuilder.java | 20 +++++++++++++++++++ - 2 files changed, 24 insertions(+), 6 deletions(-) - -diff --git a/core/src/java/org/jdom2/input/SAXBuilder.java b/core/src/java/org/jdom2/input/SAXBuilder.java -index d7105ec6..a1462334 100644 ---- a/core/src/java/org/jdom2/input/SAXBuilder.java -+++ b/core/src/java/org/jdom2/input/SAXBuilder.java -@@ -971,11 +971,6 @@ protected void configureParser(final XMLReader parser, final SAXHandler contentH - } - } - -- // Set any user-specified features on the parser. -- for (final Map.Entry me : features.entrySet()) { -- internalSetFeature(parser, me.getKey(), me.getValue().booleanValue(), me.getKey()); -- } -- - // Set any user-specified properties on the parser. - for (final Map.Entry me : properties.entrySet()) { - internalSetProperty(parser, me.getKey(), me.getValue(), me.getKey()); -@@ -1007,7 +1002,10 @@ protected void configureParser(final XMLReader parser, final SAXHandler contentH - // No lexical reporting available - } - } -- -+ // Set any user-specified features on the parser. -+ for (final Map.Entry me : features.entrySet()) { -+ internalSetFeature(parser, me.getKey(), me.getValue().booleanValue(), me.getKey()); -+ } - } - - /** -diff --git a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java -index 4ef34834..a69380ba 100644 ---- a/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java -+++ b/test/src/java/org/jdom2/test/cases/input/TestSAXBuilder.java -@@ -600,6 +600,26 @@ public void testSetFeature() { - } - } - -+ @Test -+ public void testSetExternalFeature() { -+ String feature = "http://xml.org/sax/features/external-general-entities"; -+ MySAXBuilder sb = new MySAXBuilder(); -+ try { -+ sb.setFeature(feature, true); -+ XMLReader reader = sb.createParser(); -+ assertNotNull(reader); -+ assertTrue(reader.getFeature(feature)); -+ sb.setFeature(feature, false); -+ reader = sb.createParser(); -+ assertNotNull(reader); -+ assertFalse(reader.getFeature(feature)); -+ -+ } catch (Exception e) { -+ e.printStackTrace(); -+ fail("Could not create parser: " + e.getMessage()); -+ } -+ } -+ - @Test - public void testSetProperty() { - LexicalHandler lh = new LexicalHandler() { diff --git a/dd4f3c2fc7893edd914954c73eb577f925a7d361.patch b/dd4f3c2fc7893edd914954c73eb577f925a7d361.patch deleted file mode 100644 index 06ac749..0000000 --- a/dd4f3c2fc7893edd914954c73eb577f925a7d361.patch +++ /dev/null @@ -1,34 +0,0 @@ -From dd4f3c2fc7893edd914954c73eb577f925a7d361 Mon Sep 17 00:00:00 2001 -From: Rolf Lear -Date: Thu, 1 Jul 2021 23:42:05 -0400 -Subject: [PATCH] Addresses #189 - synchronizes external entity expansion - setting - ---- - core/src/java/org/jdom2/input/SAXBuilder.java | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/core/src/java/org/jdom2/input/SAXBuilder.java b/core/src/java/org/jdom2/input/SAXBuilder.java -index a1462334..514b026d 100644 ---- a/core/src/java/org/jdom2/input/SAXBuilder.java -+++ b/core/src/java/org/jdom2/input/SAXBuilder.java -@@ -82,6 +82,7 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - import org.jdom2.DocType; - import org.jdom2.Document; - import org.jdom2.EntityRef; -+import org.jdom2.JDOMConstants; - import org.jdom2.JDOMException; - import org.jdom2.JDOMFactory; - import org.jdom2.Verifier; -@@ -797,6 +798,11 @@ public void setFastReconfigure(final boolean fastReconfigure) { - public void setFeature(final String name, final boolean value) { - // Save the specified feature for later. - features.put(name, value ? Boolean.TRUE : Boolean.FALSE); -+ if (JDOMConstants.SAX_FEATURE_EXTERNAL_ENT.equals(name)) { -+ // See issue https://github.com/hunterhacker/jdom/issues/189 -+ // And PR https://github.com/hunterhacker/jdom/pull/188 -+ setExpandEntities(value); -+ } - engine = null; - } - diff --git a/jdom2.spec b/jdom2.spec index 7906435..540c705 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,8 +1,8 @@ %bcond_with bootstrap Name: jdom2 -Version: 2.0.6 -Release: 28%{?dist} +Version: 2.0.6.1 +Release: 1%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -17,15 +17,6 @@ Source4: generate-tarball.sh # Process contrib and junit pom files Patch0: 0001-Adapt-build.patch -# -# Security patches -# P100 -> ... -# -# CVE-2021-33813 -Patch100: bd3ab78370098491911d7fe9d7a43b97144a234e.patch -Patch101: dd4f3c2fc7893edd914954c73eb577f925a7d361.patch -Patch102: 07f316957b59d305f04c7bdb26292852bcbc2eb5.patch - %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else @@ -59,11 +50,7 @@ This package contains javadoc for %{name}. %patch0 -p1 -%patch100 -p1 -%patch101 -p1 -%patch102 -p1 - -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 @@ -87,13 +74,16 @@ mkdir lib %mvn_install -J build/apidocs %files -f .mfiles -%doc CHANGES.txt COMMITTERS.txt README.txt TODO.txt +%doc CHANGES.txt COMMITTERS.txt README.md TODO.txt %license LICENSE.txt %files javadoc -f .mfiles-javadoc %license LICENSE.txt %changelog +* 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 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 From c5b976daf92c65056ceb76cfad11d7172a07b047 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:43:39 +0000 Subject: [PATCH 32/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 540c705..8f5de23 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -81,6 +81,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From 7476c9ff0950cd07e8cc205b959c79e8a030f162 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 08:02:03 +0000 Subject: [PATCH 33/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 8f5de23..d5febbe 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -81,6 +81,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From 5899975de81478a981f391daa23cfa5cfb432319 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 1 Sep 2023 14:22:42 +0200 Subject: [PATCH 34/55] Convert License tag to SPDX format Related: https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_2 From 1d6958d61015bc58e779b926a2f88ac20be1305b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 26 Oct 2023 07:33:08 +0200 Subject: [PATCH 35/55] Update javapackages test plan to f40 --- plans/javapackages.fmf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plans/javapackages.fmf b/plans/javapackages.fmf index 8f6c9cb..a2cdaba 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: f37 + ref: f40 execute: how: tmt From d02675a28f3f270fbc08e2c62e34621424eb0d25 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 23:37:51 +0000 Subject: [PATCH 36/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index d5febbe..b694a88 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -81,6 +81,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From 1a41fcf5e07c91d9e48fc0092f5c7c8898692a7b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 23:17:42 +0000 Subject: [PATCH 37/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index b694a88..d560e78 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -81,6 +81,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From b4e64036b048e29e426c7f83eb5d95ef72f76805 Mon Sep 17 00:00:00 2001 From: Marian Koncek Date: Tue, 20 Feb 2024 08:27:55 +0100 Subject: [PATCH 38/55] Update Java source/target to 1.8 --- jdom2.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index d560e78..3a79021 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -18,7 +18,7 @@ Source4: generate-tarball.sh Patch0: 0001-Adapt-build.patch %if %{with bootstrap} -BuildRequires: javapackages-bootstrap +BuildRequires: javapackages-bootstrap %else BuildRequires: javapackages-local BuildRequires: ant @@ -48,7 +48,7 @@ This package contains javadoc for %{name}. %prep %setup -q -n jdom-JDOM-%{version} -%patch0 -p1 +%patch 0 -p1 sed -i 's/\r//' LICENSE.txt @@ -61,7 +61,7 @@ sed -i '/import org.jdom2.xpath.XPathFactory/d' core/src/java/org/jdom2/JDOMCons %build mkdir lib -%ant -Dversion=%{version} -Dcompile.source=1.7 -Dcompile.target=1.7 -Dj2se.apidoc=%{_javadocdir}/java maven +%ant -Dversion=%{version} -Dcompile.source=1.8 -Dcompile.target=1.8 -Dj2se.apidoc=%{_javadocdir}/java maven # Make jar into an OSGi bundle # XXX disabled until BND is fixed @@ -81,6 +81,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From 31e7dbe22c59ebb6b92f69fb0c84be5d28cbc9f4 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 27 Feb 2024 16:26:31 +0100 Subject: [PATCH 39/55] Rebuilt for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 3a79021..7947ba9 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -81,6 +81,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From aa851df77f0a9b7caa9a2a57bdffb9e93433e9a0 Mon Sep 17 00:00:00 2001 From: Jiri Date: Thu, 29 Feb 2024 18:41:51 +0100 Subject: [PATCH 40/55] bump of release for for java-21-openjdk as system jdk https://fedoraproject.org/wiki/Changes/Java21 We are sorry, we messed a bit, and we have to bump release in this package --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 7947ba9..a56c62b 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6.1 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -81,6 +81,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From cb2f295e611d021f1a7d340649aaee565fd89a1e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:58:34 +0000 Subject: [PATCH 41/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- jdom2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index a56c62b..10f7f57 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6.1 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -81,6 +81,9 @@ mkdir lib %license LICENSE.txt %changelog +* 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 From 29c06420efd85f775d1b6341385cbcaea83d39aa Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 31 Jul 2024 20:53:29 +0200 Subject: [PATCH 42/55] 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 3e27585e77394f079590a6f351390e5cf1517247 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 20 Aug 2024 16:33:56 +0200 Subject: [PATCH 43/55] Switch from %setup to %autosetup --- jdom2.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index 10f7f57..44b6074 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -46,9 +46,8 @@ Summary: Javadoc for %{name} This package contains javadoc for %{name}. %prep -%setup -q -n jdom-JDOM-%{version} +%autosetup -p1 -C -%patch 0 -p1 sed -i 's/\r//' LICENSE.txt From 0e2f32418480f2d1883f79468f77985e3e9045eb Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 Aug 2024 22:13:18 +0200 Subject: [PATCH 44/55] Switch to non-numdered patches --- jdom2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 44b6074..2b71c3e 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -15,7 +15,7 @@ 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 %if %{with bootstrap} BuildRequires: javapackages-bootstrap From 037679f949481a71f6e5ead5ac36c5cd7d5041fe Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 23 Aug 2024 00:45:08 +0200 Subject: [PATCH 45/55] Convert to %autorelease and %autochangelog --- changelog | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++ jdom2.spec | 142 +---------------------------------------------------- 2 files changed, 141 insertions(+), 140 deletions(-) create mode 100644 changelog 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/jdom2.spec b/jdom2.spec index 2b71c3e..f753e95 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -2,7 +2,7 @@ Name: jdom2 Version: 2.0.6.1 -Release: 9%{?dist} +Release: %autorelease Summary: Java manipulation of XML made easy License: Saxpath URL: http://www.jdom.org/ @@ -80,142 +80,4 @@ mkdir lib %license LICENSE.txt %changelog -* 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 +%autochangelog From dd1d7482bd416aa15ff5950628dbb7978ec650a0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Fri, 29 Nov 2024 08:28:38 +0100 Subject: [PATCH 46/55] 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 44071c5f1b24b932a9ce9430fcdebb3021c68bd6 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 30 Dec 2024 16:01:18 +0100 Subject: [PATCH 47/55] Unify spec style with the rest of Java/Maven packages [skip changelog] --- jdom2.spec | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index f753e95..561838c 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,33 +1,34 @@ %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/ +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 +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 -Patch: 0001-Adapt-build.patch +Patch: 0001-Adapt-build.patch %if %{with bootstrap} -BuildRequires: javapackages-bootstrap +BuildRequires: javapackages-bootstrap %else -BuildRequires: javapackages-local -BuildRequires: ant -BuildRequires: ant-junit +BuildRequires: javapackages-local +BuildRequires: ant +BuildRequires: ant-junit %endif -BuildArch: noarch -ExclusiveArch: %{java_arches} noarch - %description JDOM is a Java-oriented object model which models XML documents. It provides a Java-centric means of generating and manipulating @@ -40,7 +41,7 @@ complex and memory-consumptive options that current API offerings provide. %package javadoc -Summary: Javadoc for %{name} +Summary: Javadoc for %{name} %description javadoc This package contains javadoc for %{name}. From 4b462e91d86fbf9d5fe5d04c8a2bd4a3267e71e5 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Dec 2024 09:59:10 +0100 Subject: [PATCH 48/55] Update javadoc package description [skip changelog] --- jdom2.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index 561838c..41c2ff9 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -41,10 +41,10 @@ complex and memory-consumptive options that current API offerings provide. %package javadoc -Summary: Javadoc for %{name} +Summary: API documentation for %{name} %description javadoc -This package contains javadoc for %{name}. +API documentation for %{name}. %prep %autosetup -p1 -C From 790c7a6da0a9b1a3da2ec35147ac2bc60b7a8429 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:50:10 +0000 Subject: [PATCH 49/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 6b1ddf793cd400801cb1bc3303dea348567af1d0 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Mon, 3 Mar 2025 11:57:13 +0100 Subject: [PATCH 50/55] Remove javadoc subpackage --- jdom2.spec | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index 41c2ff9..51eae5e 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -28,6 +28,8 @@ BuildRequires: javapackages-local BuildRequires: ant 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. @@ -40,12 +42,6 @@ light-weight means of reading and writing XML data without the complex and memory-consumptive options that current API offerings provide. -%package javadoc -Summary: API documentation for %{name} - -%description javadoc -API documentation for %{name}. - %prep %autosetup -p1 -C @@ -61,7 +57,7 @@ sed -i '/import org.jdom2.xpath.XPathFactory/d' core/src/java/org/jdom2/JDOMCons %build mkdir lib -%ant -Dversion=%{version} -Dcompile.source=1.8 -Dcompile.target=1.8 -Dj2se.apidoc=%{_javadocdir}/java maven +%ant -Dversion=%{version} -Dcompile.source=1.8 -Dcompile.target=1.8 maven # Make jar into an OSGi bundle # XXX disabled until BND is fixed @@ -71,14 +67,11 @@ mkdir lib %install %mvn_artifact build/maven/core/%{name}-%{version}.pom build/package/jdom-%{version}.jar -%mvn_install -J build/apidocs +%mvn_install %files -f .mfiles %doc CHANGES.txt COMMITTERS.txt README.md TODO.txt %license LICENSE.txt -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt - %changelog %autochangelog From 98a55a0561bad594983f33ad26734e966458f08b Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Wed, 26 Mar 2025 08:43:19 +0100 Subject: [PATCH 51/55] 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 cde70867aca397de21e860037d52e4b33f8f3fcf Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 22 May 2025 13:35:31 +0200 Subject: [PATCH 52/55] 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 194b5ca4b399c9986c43eb19a914c11d63833132 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sun, 13 Jul 2025 09:22:51 +0200 Subject: [PATCH 53/55] Build with OpenJDK 25 --- jdom2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 51eae5e..75e6922 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -24,7 +24,7 @@ Patch: 0001-Adapt-build.patch %if %{with bootstrap} BuildRequires: javapackages-bootstrap %else -BuildRequires: javapackages-local +BuildRequires: javapackages-local-openjdk25 BuildRequires: ant BuildRequires: ant-junit %endif From d2867560bbee0afec00100ecdc7d68beef933044 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:59:46 +0000 Subject: [PATCH 54/55] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a4b4e3926a7a7b50610d1368ef3ddd4f7abdea57 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 29 Jul 2025 21:36:29 +0200 Subject: [PATCH 55/55] 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. --- jdom2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jdom2.spec b/jdom2.spec index 75e6922..419dbbe 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -25,7 +25,7 @@ Patch: 0001-Adapt-build.patch BuildRequires: javapackages-bootstrap %else BuildRequires: javapackages-local-openjdk25 -BuildRequires: ant +BuildRequires: ant-openjdk25 BuildRequires: ant-junit %endif # TODO Remove in Fedora 46