aboutsummaryrefslogtreecommitdiff
path: root/jtreg-build.yaml
diff options
context:
space:
mode:
authorStuart Monteith <stuart.monteith@linaro.org>2017-10-11 14:22:10 +0100
committerStuart Monteith <stuart.monteith@linaro.org>2017-10-11 14:22:10 +0100
commitb08c0c2ca9937ffc90cb4784bd244b48bd77fe64 (patch)
tree51ea6ee9a328b35b43b1dcf3bb3e0af2258988ab /jtreg-build.yaml
parentdcc578981341d8fd3e26f30555f8318a59f485fd (diff)
jdk: Remove javahelp from jtreg build.
It is no longer necessary. Having javahelp breaks the build as a build step has been added to extract the certificates from the jar file. As the jar we download from maven doesn't have the certificates, the build fails. Change-Id: I41226449cddeec4c40b6acd8e2f885302a2aa115
Diffstat (limited to 'jtreg-build.yaml')
-rw-r--r--jtreg-build.yaml8
1 files changed, 0 insertions, 8 deletions
diff --git a/jtreg-build.yaml b/jtreg-build.yaml
index 9abf1656d4..d498f2baae 100644
--- a/jtreg-build.yaml
+++ b/jtreg-build.yaml
@@ -66,12 +66,6 @@
tar xzf jtharness-5.0.tar.gz jtharness/lib
fi
- if [ ! -d javahelp ]; then
- mkdir -p javahelp/lib
- wget http://central.maven.org/maven2/javax/help/javahelp/2.0.05/javahelp-2.0.05.jar
- mv javahelp-2.0.05.jar javahelp/lib/jh.jar
- fi
-
if [ ! -d junit ]; then
mkdir junit
wget http://repo1.maven.org/maven2/junit/junit/4.8.2/junit-4.8.2.jar -O junit/junit.jar
@@ -116,8 +110,6 @@
# java and ant's home directories are found from the commands.
export JDK17HOME=$(dirname $(java -XshowSettings:properties |& \
grep java.home | sed 's,^.*java.home = \(.*\),\1,'))
- export JAVAHELP_HOME=$PWD/javahelp
- export JAVAHELP_JAR=$PWD/javahelp/lib/jh.jar
export JAVATEST_HOME=$PWD/jtharness
export JAVATEST_JAR=$PWD/jtharness/lib/javatest.jar
export JAVAHARNESS_HOME=$PWD/jtharness