Accepting request 526041 from Java:packages

Fix build with java 9

OBS-URL: https://build.opensuse.org/request/show/526041
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-beanutils?expand=0&rev=8
This commit is contained in:
Dominique Leuenberger 2017-09-14 19:17:52 +00:00 committed by Git OBS Bridge
commit 10858b2713
3 changed files with 26 additions and 1 deletions

View File

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

View File

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

15
jdk9.patch Normal file
View File

@ -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 @@
<!-- Compiler source JDK version -->
- <property name="compile.source" value="1.5"/>
+ <property name="compile.source" value="1.6"/>
<!-- Compiler target JDK version -->
- <property name="compile.target" value="1.5"/>
+ <property name="compile.target" value="1.6"/>
<!-- Should Java compilations set the 'debug' compiler option? -->
<property name="compile.debug" value="true"/>