Accepting request 399833 from home:dimstar:Factory

Fix build with newer, stricter java 1.8

OBS-URL: https://build.opensuse.org/request/show/399833
OBS-URL: https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=19
This commit is contained in:
Tomáš Chvátal 2016-06-02 16:34:25 +00:00 committed by Git OBS Bridge
parent c91bf6c6e9
commit c2bbbf11ca
3 changed files with 23 additions and 1 deletions

View File

@ -18,3 +18,19 @@ Index: hamcrest-1.3/build.xml
<javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
@@ -149,6 +148,7 @@
<link offline="false" href="http://www.junit.org/junit/javadoc/3.8.1/"/>
<link offline="false" href="http://kentbeck.github.com/junit/javadoc/latest/"/>
+ <arg value="-Xdoclint:none"/>
</javadoc>
<jar jarfile="build/hamcrest-all-${version}-javadoc.jar">
<fileset dir="build/temp/hamcrest-all-${version}-javadoc.jar.contents"/>
@@ -304,6 +304,7 @@
<fileset file="build/hamcrest-generator-${version}.jar"/>
<fileset file="build/hamcrest-integration-${version}.jar"/>
</classpath>
+ <arg value="-Xdoclint:none"/>
</javadoc>
<jar jarfile="build/@{modulename}-${version}-javadoc.jar">
<fileset dir="build/temp/@{modulename}-${version}-javadoc.jar.contents"/>

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Jun 2 15:33:14 UTC 2016 - dimstar@opensuse.org
- Update hamcrest-1.3-javadoc.patch: Fix build with recent Java 1.8
by disabling doclint.
-------------------------------------------------------------------
Wed Mar 18 09:46:07 UTC 2015 - tchvatal@suse.com

View File

@ -1,7 +1,7 @@
#
# spec file for package hamcrest
#
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed