From f44840f00a8d600c90c386819d2e3c81630ecfe7314c88d868ef6887332ae990 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 14 Sep 2017 09:26:17 +0000 Subject: [PATCH] Fix build with java9 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-beanutils?expand=0&rev=9 --- apache-commons-beanutils.changes | 8 ++++++++ apache-commons-beanutils.spec | 4 +++- jdk9.patch | 15 +++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 jdk9.patch diff --git a/apache-commons-beanutils.changes b/apache-commons-beanutils.changes index 87abce2..96b0e56 100644 --- a/apache-commons-beanutils.changes +++ b/apache-commons-beanutils.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Sep 14 09:25:26 UTC 2017 - fstrba@suse.com + +- Added patch: + * jdk9.patch + - Specify java source and target level 1.6 in order to allow + building with jdk9 + ------------------------------------------------------------------- Thu Dec 4 18:53:24 UTC 2014 - p.drouand@gmail.com diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec index 6596879..14ce637 100644 --- a/apache-commons-beanutils.spec +++ b/apache-commons-beanutils.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-beanutils # -# Copyright (c) 2014 SUSE LINUX Products 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 @@ -26,6 +26,7 @@ License: Apache-2.0 Group: Development/Libraries/Java Url: http://commons.apache.org/beanutils Source0: commons-beanutils-%{version}-src.tar.gz +Patch0: jdk9.patch BuildRequires: ant BuildRequires: commons-collections BuildRequires: commons-logging @@ -60,6 +61,7 @@ BeanUtils Package. %prep %setup -q -n %{short_name}-%{version}-src +%patch0 -p1 sed -i 's/\r//' *.txt # bug in ant build touch README.txt diff --git a/jdk9.patch b/jdk9.patch new file mode 100644 index 0000000..661781c --- /dev/null +++ b/jdk9.patch @@ -0,0 +1,15 @@ +--- commons-beanutils-1.9.2-src/build.xml 2014-05-25 19:24:55.000000000 +0200 ++++ commons-beanutils-1.9.2-src/build.xml 2017-09-14 10:40:26.676525095 +0200 +@@ -62,10 +62,10 @@ + + + +- ++ + + +- ++ + + +