rpm/apache-ivy
SHA256
1
0
Fork 0
forked from pool/apache-ivy
Code Pull Requests Activity

Accepting request 523091 from Java:packages

Browse Source 
Fix build with java 9

OBS-URL: https://build.opensuse.org/request/show/523091
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-ivy?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2017-09-13 20:25:02 +00:00 committed by Git OBS Bridge
commit e586d72d72
3 changed files with 33 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
apache-ivy-2.3.0-jdk9.patch Normal file
View File

@ -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 @@
</target>
<target name="javadoc" unless="skip.javadoc">
- <javadoc destdir="${javadoc.build.dir}" useexternalfile="true">
+ <javadoc destdir="${javadoc.build.dir}" useexternalfile="false" source="${ivy.minimum.javaversion}">
<fileset dir="${src.dir}" includes="**/*.java" />
</javadoc>
</target>

7
apache-ivy.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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
-------------------------------------------------------------------
Sun May 21 08:01:08 UTC 2017 - tchvatal@suse.com

4
apache-ivy.spec
View File

@ -26,10 +26,12 @@ 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
BuildRequires: java-devel >= 1.6
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: jsch
@ -56,6 +58,7 @@ JavaDoc documentation for %{name}
%prep
%setup -q
%patch0 -p1
# Fix messed-up encodings
dos2unix README LICENSE NOTICE RELEASE_NOTES CHANGES.txt
@ -79,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