b3e75b6615
* Matchers: Upgrade to Hamcrest 1.3
no longer included junit jar
* Parameterized Tests
* Specify Test execution order
* New maven artifact 'junit:junit' w/o builtin hamcrest
* Number of improvements into Rules
- Drop jdk7-testfailure.patch, fixed upstream
- Add junit-no-hamcrest-src.patch, don't bundle hamcrest into junit.jar
- Use SourceUrl for release tarball and pom
- Don't inject OSGI manifest, it breaks junit.jar
- Provide/obsolete package junit4
OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=6
41 lines
1.3 KiB
Diff
41 lines
1.3 KiB
Diff
diff --git a/build.xml b/build.xml
|
|
index 0efaf87..2efa11c 100644
|
|
--- a/build.xml
|
|
+++ b/build.xml
|
|
@@ -30,7 +30,6 @@
|
|
<property name="javadoczip" location="${dist}-javadoc.zip" />
|
|
<property name="hamcrestlib" location="lib/hamcrest-core-1.3.jar" />
|
|
<property name="hamcrestlibsources" location="lib/hamcrest-core-1.3-sources.jar" />
|
|
- <property name="hamcrestsrc" location="${dist}/temp.hamcrest.source" />
|
|
|
|
<property name="maven.deploy.goal" value="org.apache.maven.plugins:maven-gpg-plugin:1.1:sign-and-deploy-file" />
|
|
|
|
@@ -125,10 +124,6 @@
|
|
</copy>
|
|
</target>
|
|
|
|
- <target name="unjar.hamcrest">
|
|
- <unjar src="${hamcrestlibsources}" dest="${hamcrestsrc}" />
|
|
- </target>
|
|
-
|
|
<target name="release-notes">
|
|
<property name="basename" value="doc/ReleaseNotes${version-base}" />
|
|
<exec executable="perl" failonerror="true">
|
|
@@ -138,7 +133,7 @@
|
|
</exec>
|
|
</target>
|
|
|
|
- <target name="javadoc" depends="unjar.hamcrest">
|
|
+ <target name="javadoc">
|
|
<javadoc destdir="${javadocdir}"
|
|
author="false"
|
|
version="false"
|
|
@@ -151,7 +146,6 @@
|
|
<excludepackage name="org.junit.experimental.theories.internal.*" />
|
|
|
|
<sourcepath location="${src}" />
|
|
- <sourcepath location="${hamcrestsrc}" />
|
|
<link href="http://java.sun.com/javase/6/docs/api/" />
|
|
</javadoc>
|
|
</target>
|