--- lib-src/build-jtreg	2017/08/21 19:43:00	1.6
+++ lib-src/build-jtreg	2018/02/10 16:08:10	1.9
@@ -41,7 +41,7 @@ download_maven_jar() {
 
 main() {
   [[ "$PWD" =~ /lib-src$ ]] || { echo Always run as ./build-jtreg; exit 1; }
-  TESTNG_VERSION="6.9.8"
+  TESTNG_VERSION="6.9.9"
   rm -rf "/tmp/testng-$TESTNG_VERSION"*; mkdir "/tmp/testng-$TESTNG_VERSION"
   def_make_dir TESTNG_HOME "/tmp/testng-$TESTNG_VERSION"
 
@@ -59,8 +59,9 @@ main() {
 
   download_maven_jar "junit" "junit" "4.10"
   download_maven_jar "org/testng" "testng" "$TESTNG_VERSION"
-  download_maven_jar "com/beust" "jcommander" "1.48"
+  download_maven_jar "com/beust" "jcommander" "1.72"
 
+  # TODO: Upgrade to jtharness 5.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"
@@ -110,24 +111,23 @@ main() {
   def_make_file JAVATEST_JAR "$(find $EXTRACT/ -name javatest.jar)"
   def_make_file JAVAHELP_JAR "$(find $EXTRACT/ -name jh.jar)"
 
+  hg_clone_codetools() {
+    local -r repo="$1" rev="$2"
+    rm -rf "$repo"
+    hg clone -r "$rev" "http://hg.openjdk.java.net/code-tools/${repo}"
+    rm -rf "${repo}/.hg"
+    tar cJf "${repo}.tar.xz" "$repo"
+  }
+
   # asmtools is optional, but let's build it for completeness.
-  # asmtools project doesn't seem to have releases; we'll grab tip.
-  # hg clone http://hg.openjdk.java.net/code-tools/asmtools
-  rm -rf "asmtools" "asmtools-"*"-build"
-  wget -qO- "http://hg.openjdk.java.net/code-tools/asmtools/archive/tip.tar.gz" > "asmtools.tar.gz"
-  tar xzf "asmtools.tar.gz"
-  mv "asmtools-"*[0-9a-f][0-9a-f][0-9a-f] "asmtools"
-  (cd asmtools/build && ant build)
+  hg_clone_codetools asmtools 7.0
+  rm -rf "asmtools-"*"-build"
+  (cd "asmtools/build" && ant build)
   def_make_dir ASMTOOLS_HOME "$PWD/asmtools-"*"-build/release"
 
-  # hg clone http://hg.openjdk.java.net/code-tools/jtreg
-  def_make_var BUILD_NUMBER "b08"
+  def_make_var BUILD_NUMBER "b12"
   JTREG_REV="jtreg4.2-${BUILD_NUMBER}"
-  rm -rf "jtreg" "$JTREG_REV" "$JTREG_REV.tar.gz"
-  wget -q "http://hg.openjdk.java.net/code-tools/jtreg/archive/$JTREG_REV.tar.gz"
-  tar xzf "$JTREG_REV.tar.gz"
-  rm "$JTREG_REV.tar.gz"
-  mv "jtreg-$JTREG_REV" "jtreg"
+  hg_clone_codetools jtreg "$JTREG_REV"
 
   def_make_dir JDK17HOME "$HOME/jdk/jdk7"
   def_make_dir JDK18HOME "$HOME/jdk/jdk8"