SHA256
1
0
forked from pool/ant-contrib

Fix build with java 9

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant-contrib?expand=0&rev=28
This commit is contained in:
Fridrich Strba 2017-09-06 18:19:58 +00:00 committed by Git OBS Bridge
parent cb89363e1e
commit 2d1ffa2c1d
3 changed files with 21 additions and 1 deletions

View File

@ -0,0 +1,10 @@
--- ant-contrib/build.properties 2006-11-02 17:46:26.000000000 +0100
+++ ant-contrib/build.properties 2017-09-06 20:13:43.067914247 +0200
@@ -3,5 +3,5 @@
jar.name=${project.name}.jar
jar.name.versioned=${project.name}-${project.version}.jar
ivy.deliver.revision=${project.version}
-jdk.source=1.4
-jdk.target=1.4
+jdk.source=1.6
+jdk.target=1.6

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed Sep 6 18:17:00 UTC 2017 - fstrba@suse.com
- Added patch:
* ant-contrib-sourcetarget.patch
- build with java source and target 1.6
- fixes the build with java 9
------------------------------------------------------------------- -------------------------------------------------------------------
Fri May 19 09:08:21 UTC 2017 - tchvatal@suse.com Fri May 19 09:08:21 UTC 2017 - tchvatal@suse.com

View File

@ -32,12 +32,13 @@ Patch0: local-ivy.patch
Patch1: ant-contrib-antservertest.patch Patch1: ant-contrib-antservertest.patch
Patch2: ant-contrib-pom.patch Patch2: ant-contrib-pom.patch
Patch3: ant-contrib-1.0b3-enable-for-task.patch Patch3: ant-contrib-1.0b3-enable-for-task.patch
Patch4: ant-contrib-sourcetarget.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-ivy BuildRequires: apache-ivy
BuildRequires: bcel >= 5.1 BuildRequires: bcel >= 5.1
BuildRequires: commons-httpclient BuildRequires: commons-httpclient
BuildRequires: commons-logging BuildRequires: commons-logging
BuildRequires: java-devel BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: junit BuildRequires: junit
@ -75,6 +76,7 @@ cp %{SOURCE2} LICENSE-2.0.txt
%patch1 %patch1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
find . -name '*.jar' -or -name '*.class' -exec rm -rf {} + find . -name '*.jar' -or -name '*.class' -exec rm -rf {} +