--- lib-src/build-jtreg 2019/05/02 07:33:09 1.13 +++ lib-src/build-jtreg 2019/12/17 23:44:10 1.14 @@ -61,7 +61,7 @@ main() { download_maven_jar "org/testng" "testng" "$TESTNG_VERSION" download_maven_jar "com/beust" "jcommander" "1.72" - # TODO: Upgrade to jtharness 5.x + # TODO: Upgrade to jtharness 6.x rm -rf jtharness-4.6; rm -f ./*jtharness*4.6* download_ubuntu "jtharness/jtharness_4.6-1.debian.tar.xz" download_ubuntu "jtharness/jtharness_4.6-1.dsc" @@ -125,13 +125,15 @@ main() { (cd "asmtools/build" && ant build) def_make_dir ASMTOOLS_HOME "$PWD/asmtools-"*"-build/release" - def_make_var BUILD_NUMBER "b14" + def_make_var BUILD_NUMBER "b16" JTREG_REV="jtreg4.2-${BUILD_NUMBER}" hg_clone_codetools jtreg "$JTREG_REV" def_make_dir JDK17HOME "$HOME/jdk/jdk7" def_make_dir JDK18HOME "$HOME/jdk/jdk8" - def_make_dir JDK19HOME "$HOME/jdk/jdk9" + def_make_dir JDK9HOME "$HOME/jdk/jdk9" + def_make_dir JDK11HOME "$HOME/jdk/jdk11" + # Observe version collision at JDK15HOME ! def_make_dir ANTHOME "/usr/share/ant"