Build really with jdk9

OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=15
This commit is contained in:
Fridrich Strba 2017-09-11 10:21:25 +00:00 committed by Git OBS Bridge
parent 3962846aec
commit a04462275e
2 changed files with 2 additions and 5 deletions

View File

@ -5,8 +5,6 @@ Fri Sep 8 08:42:24 UTC 2017 - fstrba@suse.com
* junit-jdk9.patch
+ Build with java source and target levels 1.6 in order to
allow building with jdk9
- Force using of java-1_8_0-openjdk-devel for build since javadoc
errors are fatal in jdk9
-------------------------------------------------------------------
Fri May 19 10:03:43 UTC 2017 - dziolkowski@suse.com

View File

@ -33,9 +33,7 @@ Patch1: junit-jdk8.patch
Patch2: junit-jdk9.patch
BuildRequires: ant
BuildRequires: hamcrest >= 1.3
# Disable this one whenever the javadoc build is fixed for jdk9
# BuildRequires: java-devel >= 1.6.0
BuildRequires: java-1_8_0-openjdk-devel
BuildRequires: java-devel >= 1.6.0
BuildRequires: javapackages-local
BuildRequires: javapackages-tools
BuildRequires: perl(Digest::MD5)
@ -93,6 +91,7 @@ find . -type f -name "*.jar" -or -name "*.class" | xargs -t rm -rf
ln -s $(build-classpath hamcrest/core) lib/hamcrest-core-1.3.jar
%build
export CLASSPATH=$(build-classpath hamcrest/core)
ant dist -Dversion-status=
%install