From 41e77c197585c24f2a06a76eabf929210ec35c36587e32903775649f2b1174a9 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 29 Sep 2023 13:10:55 +0000
Subject: [PATCH 1/2] Accepting request 1114355 from Java:packages:test

javapackages >= 6

OBS-URL: https://build.opensuse.org/request/show/1114355
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=35
---
 apache-commons-collections.spec | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index 2e8e0bb..259b16b 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -38,7 +38,7 @@ BuildRequires:  ant
 BuildRequires:  ant-junit
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.8
-BuildRequires:  javapackages-local
+BuildRequires:  javapackages-local >= 6
 BuildRequires:  junit
 Provides:       %{short_name} = %{version}-%{release}
 Obsoletes:      %{short_name} < %{version}-%{release}
@@ -96,8 +96,6 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
 %patch4 -p1
 %patch5 -p1
 
-%pom_remove_parent .
-
 %build
 echo "junit.jar=$(build-classpath junit)" >>build.properties
 ant \
@@ -115,7 +113,7 @@ ln -sf %{short_name}-testframework.jar %{buildroot}%{_javadir}/%{name}-testframe
 
 # poms
 install -d -m 0755 %{buildroot}%{_mavenpomdir}
-install -pm 644  pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
+%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}.pom
 %add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:%{short_name}"
 %add_maven_depmap %{short_name}:%{short_name}-testframework:%{version} %{short_name}-testframework.jar -f "testframework" -a "org.apache.commons:%{short_name}-testframework"
 

From df457157af1175b746498132e6093e7a65fe3b9b4cc71ca8fe34615f9dfaf604 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Wed, 25 Oct 2023 16:32:24 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-collections?expand=0&rev=36

---
 apache-commons-collections.changes      |  9 +++++
 apache-commons-collections.spec         |  7 ++--
 commons-collections-3.2-build_xml.patch | 54 +++++++++++++++++++++++--
 3 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/apache-commons-collections.changes b/apache-commons-collections.changes
index 69505ca..444823d 100644
--- a/apache-commons-collections.changes
+++ b/apache-commons-collections.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Oct 25 16:30:13 UTC 2023 - Fridrich Strba <fstrba@suse.com>
+
+- Modified patch:
+  * commons-collections-3.2-build_xml.patch
+    + In ant Javac task, use "release" with compilers that support
+      it. Use source/target for others. Fixes some return value
+      incompatibilities with jdk 21
+
 -------------------------------------------------------------------
 Thu May  5 16:22:53 UTC 2022 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/apache-commons-collections.spec b/apache-commons-collections.spec
index 259b16b..b15af58 100644
--- a/apache-commons-collections.spec
+++ b/apache-commons-collections.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-collections
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2023 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -99,9 +99,8 @@ sed -i 's/\r//' LICENSE.txt PROPOSAL.html README.txt NOTICE.txt
 %build
 echo "junit.jar=$(build-classpath junit)" >>build.properties
 ant \
-    -Dant.build.javac.source=8 -Dant.build.javac.target=8 \
-    -Dant.build.javadoc.source=8 -Dtf.build.docs=build/docs/apidocs/ \
-    -Djava.io.tmpdir=. jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc
+    -Dtf.build.docs=build/docs/apidocs/ -Djava.io.tmpdir=. \
+    jar javadoc tf.validate tf.jar dist.bin dist.src tf.javadoc
 
 %install
 # jars
diff --git a/commons-collections-3.2-build_xml.patch b/commons-collections-3.2-build_xml.patch
index 41357ec..3067b30 100644
--- a/commons-collections-3.2-build_xml.patch
+++ b/commons-collections-3.2-build_xml.patch
@@ -1,6 +1,26 @@
---- build.xml.orig	2008-11-29 21:16:01.000000000 +0200
-+++ build.xml	2008-11-29 21:17:28.000000000 +0200
-@@ -286,7 +286,7 @@
+--- build.xml	2023-10-25 18:15:51.721217809 +0200
++++ build.xml	2023-10-25 18:26:44.848980199 +0200
+@@ -124,6 +124,9 @@
+     <mkdir dir="${build.classes}"/>
+     <javac  srcdir="${source.java}"
+            destdir="${build.classes}"
++           release="8"
++            source="8"
++            target="8"
+              debug="${compile.debug}"
+        deprecation="${compile.deprecation}"
+           optimize="${compile.optimize}">
+@@ -267,6 +270,9 @@
+     <mkdir dir="${build.tests}"/>
+     <javac  srcdir="${source.test}"
+            destdir="${build.tests}"
++           release="8"
++            source="8"
++            target="8"
+              debug="true"
+        deprecation="false"
+           optimize="false">
+@@ -286,7 +292,7 @@
    <!-- Runs all tests -->
    <target name="-test-all" depends="compile.tests" unless="testcase">
      <mkdir dir="${build.test.reports}"/>
@@ -9,7 +29,7 @@
        <formatter type="brief" />
        <classpath>
          <pathelement location="${build.classes}"/>
-@@ -331,7 +331,7 @@
+@@ -331,7 +337,7 @@
    <target name="testjar"  depends="compile.tests,jar"
            description="Run all unit test cases">
      <echo message="Running collections tests against built jar ..."/>
@@ -18,3 +38,29 @@
        <classpath>
          <pathelement location="${build.jar.name}"/>
          <pathelement location="${build.tests}"/>
+@@ -355,6 +361,7 @@
+     <delete     dir="${build.docs}"/>
+     <mkdir      dir="${build.docs}"/>
+     <javadoc sourcepath="${source.java}"
++                 source="8"
+                 destdir="${build.docs}"
+            packagenames="${component.package}.*"
+                  access="${javadoc.access}"
+@@ -412,6 +419,9 @@
+     <javac  srcdir="${source.test}"
+            destdir="${tf.build.tf}"
+              debug="true"
++           release="8"
++            source="8"
++            target="8"
+        deprecation="false"
+           optimize="false">
+       <patternset refid="tf.patternset.validate" />
+@@ -453,6 +463,7 @@
+     <delete     dir="${tf.build.docs}"/>
+     <mkdir      dir="${tf.build.docs}"/>
+     <javadoc    destdir="${tf.build.docs}"
++                 source="8"
+                  access="protected"
+                  author="false"
+                 version="false"