pool/apache-commons-pool
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1120345 from Java:packages

Browse Source 
Fix build with jdk 21

OBS-URL: https://build.opensuse.org/request/show/1120345
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-pool?expand=0&rev=6
This commit is contained in:
Ana Guerrero 2023-10-26 15:13:39 +00:00 committed by Git OBS Bridge
commit 7bcc34eebd
3 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apache-commons-pool.changes
View File

@ -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>

6
apache-commons-pool.spec
View File

@ -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
@ -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

20
commons-pool-1.6-sourcetarget.patch
View File

@ -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>