From 87978d620e8159ee724791bf877a757d09829993ab821f2223ba03a472f4aaa9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 7 Sep 2017 17:13:02 +0000 Subject: [PATCH 1/3] First step to buildability with jdk9 OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=31 --- apache-ivy-2.3.0-jdk9.patch | 22 ++++++++++++++++++++++ apache-ivy.changes | 9 +++++++++ apache-ivy.spec | 4 ++++ 3 files changed, 35 insertions(+) create mode 100644 apache-ivy-2.3.0-jdk9.patch diff --git a/apache-ivy-2.3.0-jdk9.patch b/apache-ivy-2.3.0-jdk9.patch new file mode 100644 index 0000000..c024bff --- /dev/null +++ b/apache-ivy-2.3.0-jdk9.patch @@ -0,0 +1,22 @@ +--- apache-ivy-2.3.0/build.properties 2012-04-02 23:11:30.000000000 +0200 ++++ apache-ivy-2.3.0/build.properties 2017-09-07 14:13:28.647597540 +0200 +@@ -42,7 +42,7 @@ + checkstyle.src.dir=${basedir}/src/etc/checkstyle + rat.report.dir=${reports.dir}/rat + +-ivy.minimum.javaversion=1.4 ++ivy.minimum.javaversion=1.6 + debug.mode=on + ivy.install.version=1.4.1 + +--- apache-ivy-2.3.0/build.xml 2012-04-09 08:58:36.000000000 +0200 ++++ apache-ivy-2.3.0/build.xml 2017-09-07 14:46:13.128164218 +0200 +@@ -517,7 +517,7 @@ + + + +- ++ + + + diff --git a/apache-ivy.changes b/apache-ivy.changes index 4f5ee8d..1a543a0 100644 --- a/apache-ivy.changes +++ b/apache-ivy.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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 6e3f097..d79647a 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -26,10 +26,13 @@ Url: http://ant.apache.org/ivy/ Source0: %{name}-%{version}-src.tar.gz Source1: ivy.1 Source2: http://repo1.maven.org/maven2/org/apache/ivy/ivy/2.3.0/ivy-2.3.0.pom +Patch0: apache-ivy-2.3.0-jdk9.patch 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: javapackages-local BuildRequires: javapackages-tools BuildRequires: jsch @@ -56,6 +59,7 @@ JavaDoc documentation for %{name} %prep %setup -q +%patch0 -p1 # Fix messed-up encodings dos2unix README LICENSE NOTICE RELEASE_NOTES CHANGES.txt From da3770c7ce8f823ec0a6f2a59ebb45452696b8d0dd6648cd507a5b28b6a8ae6d Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 7 Sep 2017 17:20:43 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=32 --- apache-ivy.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apache-ivy.spec b/apache-ivy.spec index d79647a..2d27d72 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -32,7 +32,7 @@ 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-1_8_0-openjdk-devel BuildRequires: javapackages-local BuildRequires: javapackages-tools BuildRequires: jsch From a18daec9fb1821b97c7fc4af96b34ed2e93c1fff563f8538d10a0d0af08484f9 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 11 Sep 2017 12:02:15 +0000 Subject: [PATCH 3/3] 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