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

Fix build with java9

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-pool?expand=0&rev=10
This commit is contained in:
Fridrich Strba 2017-09-14 14:20:20 +00:00 committed by Git OBS Bridge
parent 01e19897d1
commit 5abef60c47
3 changed files with 24 additions and 1 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 @@
-------------------------------------------------------------------
Thu Sep 14 14:17:08 UTC 2017 - fstrba@suse.com
- Added patch:
* commons-pool-1.6-sourcetarget.patch
+ Specify java source and target level 1.6 in order to allow
building with jdk9
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 29 10:59:24 UTC 2016 - tchvatal@suse.com Thu Sep 29 10:59:24 UTC 2016 - tchvatal@suse.com

4
apache-commons-pool.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-pool # spec file for package apache-commons-pool
# #
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -27,6 +27,7 @@ Group: Development/Libraries/Java
Url: https://commons.apache.org/proper/commons-pool/ Url: https://commons.apache.org/proper/commons-pool/
Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
Patch0: jakarta-commons-pool-build.patch Patch0: jakarta-commons-pool-build.patch
Patch1: commons-pool-1.6-sourcetarget.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
@ -63,6 +64,7 @@ Pool Package.
# remove all binary libs # remove all binary libs
find . -name "*.jar" -exec rm -f {} \; find . -name "*.jar" -exec rm -f {} \;
%patch0 %patch0
%patch1 -p1
%build %build
ant -Djava.io.tmpdir=. clean dist ant -Djava.io.tmpdir=. clean dist

13
commons-pool-1.6-sourcetarget.patch Normal file
View File

@ -0,0 +1,13 @@
--- 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
@@ -61,8 +61,8 @@
<property name="javac.optimize" value="false"/>
<property name="javac.debug" value="true"/>
<property name="javac.deprecation" value="true"/>
- <property name="javac.target.version" value="1.5"/>
- <property name="javac.src.version" value="1.5"/>
+ <property name="javac.target.version" value="1.6"/>
+ <property name="javac.src.version" value="1.6"/>
</target>
<!-- ######################################################### -->