pool/hamcrest
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First step to buildability with jdk9

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=25
This commit is contained in:
Fridrich Strba 2017-09-08 06:07:20 +00:00 committed by Git OBS Bridge
parent 569e43d086
commit c9664b1583
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hamcrest-1.3-fork-javac.patch
View File

@ -16,7 +16,7 @@ Index: hamcrest-1.3/build.xml
</manifest> </manifest>
<mkdir dir="build/temp/@{modulename}-${version}.jar.contents"/> <mkdir dir="build/temp/@{modulename}-${version}.jar.contents"/>
- <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false"> - <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false">
+ <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.5" includeantruntime="false" fork="true"> + <javac srcdir="@{srcdir}" destdir="build/temp/@{modulename}-${version}.jar.contents" debug="${debug}" target="1.6" includeantruntime="false" fork="true">
<classpath> <classpath>
<fileset dir="lib/integration"> <fileset dir="lib/integration">
<include name="*.jar"/> <include name="*.jar"/>

12
hamcrest.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Sep 8 06:05:24 UTC 2017 - fstrba@suse.com
- Modified patch:
* hamcrest-1.3-fork-javac.patch
+ Specify java target level 1.6 in order to allow building
with jdk9
- Specify java source level 1.6 in order to allow building with
jdk9
- Require java-1_8_0-openjdk-devel since javadoc errors are fatal
in jdk9
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 29 16:05:25 UTC 2017 - tchvatal@suse.com Mon May 29 16:05:25 UTC 2017 - tchvatal@suse.com

5
hamcrest.spec
View File

@ -50,7 +50,8 @@ Patch3: %{name}-%{version}-javadoc.patch
Patch4: hamcrest-1.3-random-build-crash.patch Patch4: hamcrest-1.3-random-build-crash.patch
Patch5: hamcrest-1.3-fork-javac.patch Patch5: hamcrest-1.3-fork-javac.patch
BuildRequires: ant >= 1.6.5 BuildRequires: ant >= 1.6.5
BuildRequires: java-devel >= 1.6.0 # Disable this one whenever the javadoc build is fixed for jdk9
BuildRequires: java-1_8_0-openjdk-devel
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: javapackages-tools BuildRequires: javapackages-tools
BuildRequires: qdox BuildRequires: qdox
@ -101,7 +102,7 @@ perl -pi -e 's/\r$//g' LICENSE.txt
%build %build
export CLASSPATH=$(build-classpath qdox) export CLASSPATH=$(build-classpath qdox)
ant -Dant.build.javac.source=1.5 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc ant -Dant.build.javac.source=1.6 -Dversion=%{version} -Dbuild.sysclasspath=last clean core generator library bigjar javadoc
# inject OSGi manifests # inject OSGi manifests
mkdir -p META-INF mkdir -p META-INF