From 5eaef3243c163a9e6f1828c7946328235cbabfaabcf59e181925c15858b23626 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 25 Oct 2023 15:59:59 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-pool?expand=0&rev=20 --- apache-commons-pool.changes | 8 ++++++++ apache-commons-pool.spec | 2 +- commons-pool-1.6-sourcetarget.patch | 20 ++++++++++++++++++-- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/apache-commons-pool.changes b/apache-commons-pool.changes index 66f5716..658e95a 100644 --- a/apache-commons-pool.changes +++ b/apache-commons-pool.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Oct 25 15:57:51 UTC 2023 - Fridrich Strba + +- Modified patch: + * commons-pool-1.6-sourcetarget.patch + + In ant Javac task, use "release" with compilers that support + it. Fixes some return value incompatibilities with jdk 21 + ------------------------------------------------------------------- Mon Mar 25 17:51:29 UTC 2019 - Fridrich Strba diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec index 096b310..2d00811 100644 --- a/apache-commons-pool.spec +++ b/apache-commons-pool.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-pool # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 diff --git a/commons-pool-1.6-sourcetarget.patch b/commons-pool-1.6-sourcetarget.patch index f3639cf..c7c8075 100644 --- a/commons-pool-1.6-sourcetarget.patch +++ b/commons-pool-1.6-sourcetarget.patch @@ -1,5 +1,5 @@ ---- commons-pool-1.6-src/build.xml 2012-01-04 16:30:59.000000000 +0100 -+++ commons-pool-1.6-src/build.xml 2017-09-14 16:06:25.115950300 +0200 +--- commons-pool-1.6-src/build.xml 2023-10-25 17:55:14.362760902 +0200 ++++ commons-pool-1.6-src/build.xml 2023-10-25 17:56:28.323265075 +0200 @@ -61,8 +61,8 @@ @@ -11,3 +11,19 @@ +@@ -108,6 +108,7 @@ + debug="${javac.debug}" + deprecation="${javac.deprecation}" + optimize="${javac.optimize}" ++ release="${javac.target.version}" + target="${javac.target.version}" + source="${javac.src.version}"/> + +@@ -119,6 +120,7 @@ + debug="${javac.debug}" + deprecation="${javac.deprecation}" + optimize="${javac.optimize}" ++ release="${javac.target.version}" + target="${javac.target.version}" + source="${javac.src.version}"> + From 593b0510eff1584580fe0f7c1840be180cb802a3344fd3f317cc21c8291e3737 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 25 Oct 2023 16:01:17 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-pool?expand=0&rev=21 --- apache-commons-pool.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec index 2d00811..f2f02b2 100644 --- a/apache-commons-pool.spec +++ b/apache-commons-pool.spec @@ -69,8 +69,6 @@ find . -name "*.jar" -exec rm -f {} \; dos2unix README.txt -%pom_remove_parent . - %build ant -Djava.io.tmpdir=. clean dist @@ -83,7 +81,7 @@ install -m 644 dist/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir # pom install -d -m 755 %{buildroot}%{_mavenpomdir} -install -m 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom +%{mvn_install_pom} pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom %add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar # javadoc