From a18daec9fb1821b97c7fc4af96b34ed2e93c1fff563f8538d10a0d0af08484f9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 11 Sep 2017 12:02:15 +0000 Subject: [PATCH] Fix build with jdk9 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=33 --- apache-ivy.changes | 2 -- apache-ivy.spec | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apache-ivy.changes b/apache-ivy.changes index 1a543a0..1360645 100644 --- a/apache-ivy.changes +++ b/apache-ivy.changes @@ -4,8 +4,6 @@ Thu Sep 7 17:10:15 UTC 2017 - fstrba@suse.com - Added patch: * apache-ivy-2.3.0-jdk9.patch + Use source and target version 1.6 to enable build with jdk9 -- Force using of java-1_8_0-openjdk-devel for building, since - javadoc errors are fatal in jdk9 ------------------------------------------------------------------- Sun May 21 08:01:08 UTC 2017 - tchvatal@suse.com diff --git a/apache-ivy.spec b/apache-ivy.spec index 2d27d72..a247b0c 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -31,8 +31,7 @@ BuildRequires: ant BuildRequires: bouncycastle BuildRequires: commons-httpclient BuildRequires: dos2unix -# Disable this one whenever the javadoc build is fixed for jdk9 -BuildRequires: java-1_8_0-openjdk-devel +BuildRequires: java-devel >= 1.6 BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: jsch @@ -83,6 +82,7 @@ mkdir -p lib build-jar-repository lib ant ant/ant-nodeps oro jsch commons-httpclient # Build +export CLASSPATH=$(build-classpath ant ant/ant-nodeps oro jsch commons-httpclient) ant -Dtarget.ivy.version=%{version} /localivy /offline jar javadoc %install