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

Fix build with jdk9

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=33
This commit is contained in:
Fridrich Strba 2017-09-11 12:02:15 +00:00 committed by Git OBS Bridge
parent da3770c7ce
commit a18daec9fb
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apache-ivy.changes
View File

@ -4,8 +4,6 @@ Thu Sep 7 17:10:15 UTC 2017 - fstrba@suse.com
- Added patch: - Added patch:
* apache-ivy-2.3.0-jdk9.patch * apache-ivy-2.3.0-jdk9.patch
+ Use source and target version 1.6 to enable build with jdk9 + 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 Sun May 21 08:01:08 UTC 2017 - tchvatal@suse.com

4
apache-ivy.spec
View File

@ -31,8 +31,7 @@ BuildRequires: ant
BuildRequires: bouncycastle BuildRequires: bouncycastle
BuildRequires: commons-httpclient BuildRequires: commons-httpclient
BuildRequires: dos2unix BuildRequires: dos2unix
# Disable this one whenever the javadoc build is fixed for jdk9 BuildRequires: java-devel >= 1.6
BuildRequires: java-1_8_0-openjdk-devel
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: jsch BuildRequires: jsch
@ -83,6 +82,7 @@ mkdir -p lib
build-jar-repository lib ant ant/ant-nodeps oro jsch commons-httpclient build-jar-repository lib ant ant/ant-nodeps oro jsch commons-httpclient
# Build # Build
export CLASSPATH=$(build-classpath ant ant/ant-nodeps oro jsch commons-httpclient)
ant -Dtarget.ivy.version=%{version} /localivy /offline jar javadoc ant -Dtarget.ivy.version=%{version} /localivy /offline jar javadoc
%install %install