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.

.fmf/version

@@ -0,0 +1 @@
+1

.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

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
 -		<!-- this is used for testing Java5 (the test sets stax.dir) -->
 -		<pathelement location="${stax.dir}/jsr173_1.0_api.jar" />
 -		<pathelement location="${stax.dir}/sjsxp.jar" />
-+          <fileset dir="${lib.dir}" includes="*.jar" />
++		<fileset dir="${lib.dir}" includes="*.jar" />
  	</path>
  
  	<path id="core.class.path">
@@ -39,7 +39,7 @@ index cd7c2ed..16368e2 100644
  	    description="Builds the Jars">
  		<fixcrlf srcdir="." includes="**/*.bat" excludes="build*.*" eol="crlf"/>
  		<fixcrlf srcdir="." includes="**/*.sh" excludes="build*.*" eol="lf"/>
-@@ -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.
  			<fileset dir="${core.build}" includes="**/*.class" />
  			<fileset dir="${metainf.build}" excludes="**/MANIFEST.MF" />
  		</jar>
@@ -53,15 +53,21 @@ index cd7c2ed..16368e2 100644
 -		</jar>
 -		<jar destfile="${package}/${jarbase}-javadoc.jar" 
 -			basedir="${build.javadocs}" includes="**/*" />
+-
 -		<jar jarfile="${package}/${jarbase}-sources.jar" >
 -			<fileset dir="${core.src}" includes="**/*" />
+-		</jar>
+-		<jar jarfile="${package}/${jarbase}-junit-sources.jar" >
 -			<fileset dir="${junit.src}" includes="**/*" />
+-		</jar>
+-		<jar jarfile="${package}/${jarbase}-contrib-sources.jar" >
 -			<fileset dir="${contrib.src}" includes="**/*" />
 -		</jar>
- 	    	    
+-	    	    
  	</target>
  	
-@@ -500,7 +475,7 @@ For instructions on how to build JDOM, please view the README.txt file.
+ 	<target name="androidtests" depends="jars">
+@@ -505,7 +474,7 @@ For instructions on how to build JDOM, please view the README.txt file.
  		<delete dir="${mavendir}" includes="**/*" failonerror="false"/>
  	</target>
  	
@@ -70,7 +76,7 @@ index cd7c2ed..16368e2 100644
  		description="Prepares Maven bundle to load on to Sonatype Nexus for Maven-Central">
  		<mkdir dir="${mavendir}" />
  		<mkdir dir="${mavendir}/core" />
-@@ -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.
  		
  		<!-- copy the build jar -->
  		<copy tofile="${mavendir}/core/${mavenbase}.jar" file="${package}/${jarbase}.jar"/>
@@ -79,10 +85,11 @@ index cd7c2ed..16368e2 100644
  		
  		<!-- load the license in to the ${license} property -->
  		<loadfile property="license" srcfile="LICENSE.txt" />
-@@ -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.
+ 				<filter token="license" value="${license}" />
  			</filterset>
  		</copy>
- 		
+-		
 -		<exec dir="${mavendir}/core" executable="${gpg}">
 -			<arg value="-abv"/>
 -			<arg value="${mavenbase}.pom"/>
@@ -108,5 +115,5 @@ index cd7c2ed..16368e2 100644
  	
  </project>
 -- 
-2.25.2
+2.37.2
 

changelog

@@ -0,0 +1,139 @@
+* Thu Jul 18 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6.1-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
+* Thu Feb 29 2024 Jiri Vanek <jvanek@redhat.com> - 2.0.6.1-8
+- bump of release for for java-21-openjdk as system jdk
+
+* Tue Feb 27 2024 Jiri Vanek <jvanek@redhat.com> - 2.0.6.1-7
+- Rebuilt for java-21-openjdk as system jdk
+
+* Tue Feb 20 2024 Marian Koncek <mkoncek@redhat.com> - 2.0.6.1-6
+- Update Java source/target to 1.8
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6.1-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Sep 08 2022 Marian Koncek <mkoncek@redhat.com> - 2.0.6.1-1
+- Update to upstream version 2.0.6.1
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-28
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.0.6-27
+- Rebuilt for java-17-openjdk as system jdk
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Tue Nov 02 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-25
+- Bump Java compiler source/target levels to 1.7
+
+* Thu Oct 14 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-24
+- Add patches to address DoS security vulnerability
+- Resolves: CVE-2021-33813
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-23
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-22
+- Bootstrap build
+- Non-bootstrap build
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-21
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Sep 10 2020 Fabio Valentini <decathorpe@gmail.com> - 2.0.6-20
+- Drop log4j12 dependency and switch junit module to log4j 1.2 API shim.
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-19
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sun Jul 19 2020 Fabio Valentini <decathorpe@gmail.com> - 2.0.6-18
+- Set javac source and target to 1.8 to fix Java 11 builds.
+
+* Fri Jul 10 2020 Jiri Vanek <jvanek@redhat.com> - 2.0.6-17
+- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
+
+* Thu May 07 2020 Fabio Valentini <decathorpe@gmail.com> - 2.0.6-16
+- Drop optional isorelax verifier support from contrib.
+
+* Mon Apr 20 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-15
+- Disable contrib module
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-14
+- Mass rebuild for javapackages-tools 201902
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-14
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-13
+- Mass rebuild for javapackages-tools 201901
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jul 23 2018 Michael Simacek <msimacek@redhat.com> - 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 <mizdebsk@redhat.com> - 2.0.6-11
+- Remove unneeded buildrequires
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-9
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Wed May 31 2017 Michael Simacek <msimacek@redhat.com> - 2.0.6-7
+- Avoid hardcoded jar paths
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Thu Apr 14 2016 Mat Booth <mat.booth@redhat.com> - 2.0.6-6
+- Add OSGi metadata to main jar
+- Fix file listed twice warning
+
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.6-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Tue Mar 24 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-3
+- Remove unneeded BR on cobertura
+
+* Fri Feb 06 2015 gil cattaneo <puntogil@libero.it> 2.0.6-2
+- introduce license macro
+
+* Tue Oct 21 2014 gil cattaneo <puntogil@libero.it> 2.0.6-1
+- update to 2.0.6 (rhbz#1118627)
+
+* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.5-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 2.0.5-3
+- Use Requires: java-headless rebuild (#1067528)
+
+* Thu Nov 14 2013 gil cattaneo <puntogil@libero.it> 2.0.5-2
+- use objectweb-asm3
+
+* Thu Sep 12 2013 gil cattaneo <puntogil@libero.it> 2.0.5-1
+- initial rpm

ci.fmf

@@ -0,0 +1 @@
+resultsdb-testcase: separate

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}

jdom2.spec

@@ -1,25 +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
+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
-
-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.
@@ -32,18 +42,11 @@ 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
 
-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
@@ -54,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.6 -Dcompile.target=1.6 -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
@@ -64,75 +67,11 @@ 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_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
-* Mon Apr 20 2020 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-15
-- Disable contrib module
-
-* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-14
-- Mass rebuild for javapackages-tools 201902
-
-* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-13
-- Mass rebuild for javapackages-tools 201901
-
-* Mon Jul 23 2018 Michael Simacek <msimacek@redhat.com> - 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 <mizdebsk@redhat.com> - 2.0.6-11
-- Remove unneeded buildrequires
-
-* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-10
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Wed May 31 2017 Michael Simacek <msimacek@redhat.com> - 2.0.6-7
-- Avoid hardcoded jar paths
-
-* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-7
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Thu Apr 14 2016 Mat Booth <mat.booth@redhat.com> - 2.0.6-6
-- Add OSGi metadata to main jar
-- Fix file listed twice warning
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.6-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.6-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Tue Mar 24 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.0.6-3
-- Remove unneeded BR on cobertura
-
-* Fri Feb 06 2015 gil cattaneo <puntogil@libero.it> 2.0.6-2
-- introduce license macro
-
-* Tue Oct 21 2014 gil cattaneo <puntogil@libero.it> 2.0.6-1
-- update to 2.0.6 (rhbz#1118627)
-
-* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.0.5-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Fri Mar 28 2014 Michael Simacek <msimacek@redhat.com> - 2.0.5-3
-- Use Requires: java-headless rebuild (#1067528)
-
-* Thu Nov 14 2013 gil cattaneo <puntogil@libero.it> 2.0.5-2
-- use objectweb-asm3
-
-* Thu Sep 12 2013 gil cattaneo <puntogil@libero.it> 2.0.5-1
-- initial rpm
+%autochangelog

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

sources

@@ -1 +1 @@
-SHA512 (jdom2-2.0.6.tar.gz) = 1a38c882323339e94c36635e80635ecf8f66e4a1ed0228f68c11098b1282bd9043fdfec1b31196b79eea72495440ac175af50a0556439be5ba956238c32dd1ff
+SHA512 (jdom2-2.0.6.1.tar.gz) = 764fd20e9acbafdd3e3296360614beda0fb8d2c258b5ef0624b455e7008949966ca4f4b71196205e2ff195b3fe4ee8e3d0755f174935d11ad6eb18b8a6d38540