| author | Craig Mohrman <craig.mohrman@oracle.com> |
| Mon, 27 Apr 2015 19:48:28 -0700 | |
| changeset 4197 | 67d7270f6817 |
| parent 1182 | 31281e52a94c |
| permissions | -rw-r--r-- |
|
4197
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
1 |
# Need to pass in another parameter from the Makefile. |
|
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
2 |
|
|
1182
31281e52a94c
15998720 junit randomly fails a test with jdk 1.7 (fix build)
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
3 |
# Disable this download of outside documentation. |
|
4197
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
4 |
|
|
1182
31281e52a94c
15998720 junit randomly fails a test with jdk 1.7 (fix build)
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
5 |
--- junit-r4.11/build.xml_orig 2012-11-13 12:10:08.000000000 -0800 |
|
4197
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
6 |
+++ junit-r4.11/build.xml 2015-03-09 15:16:26.620136857 -0700 |
|
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
7 |
@@ -144,6 +144,7 @@ |
|
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
8 |
version="false" |
|
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
9 |
use="false" |
|
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
10 |
windowtitle="JUnit API" |
|
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
11 |
+ additionalparam="${additionalparam}"
|
|
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
12 |
stylesheetfile="stylesheet.css" |
|
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
13 |
> |
|
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
14 |
<excludepackage name="junit.*" /> |
|
67d7270f6817
19789496 junit does not build with java 8
Craig Mohrman <craig.mohrman@oracle.com>
parents:
1182
diff
changeset
|
15 |
@@ -152,7 +153,6 @@ |
|
1182
31281e52a94c
15998720 junit randomly fails a test with jdk 1.7 (fix build)
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
16 |
|
|
31281e52a94c
15998720 junit randomly fails a test with jdk 1.7 (fix build)
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
17 |
<sourcepath location="${src}" />
|
|
31281e52a94c
15998720 junit randomly fails a test with jdk 1.7 (fix build)
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
18 |
<sourcepath location="${hamcrestsrc}" />
|
|
31281e52a94c
15998720 junit randomly fails a test with jdk 1.7 (fix build)
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
19 |
- <link href="http://java.sun.com/javase/6/docs/api/" /> |
|
31281e52a94c
15998720 junit randomly fails a test with jdk 1.7 (fix build)
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
20 |
</javadoc> |
|
31281e52a94c
15998720 junit randomly fails a test with jdk 1.7 (fix build)
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
21 |
</target> |
|
31281e52a94c
15998720 junit randomly fails a test with jdk 1.7 (fix build)
Craig Mohrman <craig.mohrman@oracle.com>
parents:
diff
changeset
|
22 |