From 5abef60c477e493378c60380301fe70aa9c33de684437d170a19f6bd10bd26b5 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2017 14:20:20 +0000 Subject: [PATCH] Fix build with java9 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-pool?expand=0&rev=10 --- apache-commons-pool.changes | 8 ++++++++ apache-commons-pool.spec | 4 +++- commons-pool-1.6-sourcetarget.patch | 13 +++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 commons-pool-1.6-sourcetarget.patch diff --git a/apache-commons-pool.changes b/apache-commons-pool.changes index 42efcaa..a7fdda6 100644 --- a/apache-commons-pool.changes +++ b/apache-commons-pool.changes @@ -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 diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec index 393e034..aa15761 100644 --- a/apache-commons-pool.spec +++ b/apache-commons-pool.spec @@ -1,7 +1,7 @@ # # 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 # 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/ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Patch0: jakarta-commons-pool-build.patch +Patch1: commons-pool-1.6-sourcetarget.patch BuildRequires: ant BuildRequires: java-devel BuildRequires: javapackages-tools @@ -63,6 +64,7 @@ Pool Package. # remove all binary libs find . -name "*.jar" -exec rm -f {} \; %patch0 +%patch1 -p1 %build ant -Djava.io.tmpdir=. clean dist diff --git a/commons-pool-1.6-sourcetarget.patch b/commons-pool-1.6-sourcetarget.patch new file mode 100644 index 0000000..b1f32d6 --- /dev/null +++ b/commons-pool-1.6-sourcetarget.patch @@ -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 @@ + + + +- +- ++ ++ + + +