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 <fstrba@suse.com>
+
+- 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 <fstrba@suse.com>
 
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 @@
        <property name="javac.optimize" value="false"/>
        <property name="javac.debug" value="true"/>
@@ -11,3 +11,19 @@
     </target>
  
     <!-- ######################################################### -->
+@@ -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}"/>
+    </target>
+@@ -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}">
+         <classpath>