eee6d90e82
bugfix and feature update, see CHANGES.txt for details
- Removed patches
* hamcrest-1.1-build.patch
+ renamed to hamcrest-1.3-build.patch
* hamcrest-1.1-no-jarjar.patch
+ renamed to hamcrest-1.3-no-jarjar.patch
* hamcrest-1.1-no-integration.patch
+ renamed to hamcrest-1.3-no-integration.patch
- Added patches
* hamcrest-1.3-javadoc.patch
- Updated poms and added OSGI manifests from Fedora
OBS-URL: https://build.opensuse.org/package/show/Java:packages/hamcrest?expand=0&rev=9
31 lines
1.8 KiB
Diff
31 lines
1.8 KiB
Diff
diff --git a/build.xml b/build.xml
|
|
index 1cfd4fb..54d43fe 100644
|
|
--- a/build.xml
|
|
+++ b/build.xml
|
|
@@ -14,13 +14,13 @@
|
|
<target name="generator" description="Build code generator tool">
|
|
<java-to-jar srcdir="hamcrest-generator/src/main/java"
|
|
modulename="hamcrest-generator-nodeps"
|
|
- classpath="lib/generator/qdox-1.12.jar"/>
|
|
+ classpath="lib/generator/qdox.jar"/>
|
|
|
|
<!-- Bundle QDox classes in hamcrest-generator.jar using JarJar to place classes under a different package -->
|
|
- <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar-1.3.jar"/>
|
|
+ <taskdef name="jarjar" classname="com.tonicsystems.jarjar.JarJarTask" classpath="lib/generator/jarjar.jar"/>
|
|
<jarjar jarfile="build/hamcrest-generator-${version}.jar">
|
|
<zipfileset src="build/hamcrest-generator-nodeps-${version}.jar"/>
|
|
- <zipfileset src="lib/generator/qdox-1.12.jar"/>
|
|
+ <zipfileset src="lib/generator/qdox.jar"/>
|
|
<rule pattern="com.thoughtworks.qdox.**" result="org.hamcrest.generator.qdox.@1"/>
|
|
</jarjar>
|
|
<copy file="build/hamcrest-generator-nodeps-${version}-sources.jar" tofile="build/hamcrest-generator-${version}-sources.jar"/>
|
|
@@ -152,7 +152,7 @@
|
|
|
|
<javadoc packagenames="org.hamcrest.*" defaultexcludes="yes"
|
|
destdir="build/temp/hamcrest-all-${version}-javadoc.jar.contents" author="true" version="true" use="true"
|
|
- windowtitle="Hamcrest" source="1.6" failonerror="yes" overview="overview.html">
|
|
+ windowtitle="Hamcrest" source="1.6" failonerror="yes">
|
|
<classpath>
|
|
<fileset dir="lib/integration">
|
|
<include name="*.jar"/>
|