--- a/make/conf/jib-profiles.js	Wed Aug 01 19:07:27 2018 -0700
+++ b/make/conf/jib-profiles.js	Wed Aug 01 23:06:33 2018 -0700
@@ -901,7 +901,7 @@
         jtreg: {
             server: "javare",
             revision: "4.2",
-            build_number: "b12",
+            build_number: "b13",
             checksum_file: "MD5_VALUES",
             file: "jtreg_bin-4.2.zip",
             environment_name: "JT_HOME",

--- a/test/failure_handler/src/share/classes/jdk/test/failurehandler/jtreg/GatherDiagnosticInfoObserver.java	Wed Aug 01 19:07:27 2018 -0700
+++ b/test/failure_handler/src/share/classes/jdk/test/failurehandler/jtreg/GatherDiagnosticInfoObserver.java	Wed Aug 01 23:06:33 2018 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -119,10 +119,10 @@
     public void startingTestRun(Parameters params) {
         // TODO find a better way to get JDKs
         InterviewParameters rp = (InterviewParameters) params;
-        Map<?,?> map = new HashMap<>();
+        Map<String, String> map = new HashMap<>();
         rp.save(map);
-        compileJdk = (String) map.get("regtest.compilejdk");
-        testJdk = (String) map.get("regtest.testjdk");
+        compileJdk = map.get("regtest.compilejdk");
+        testJdk = map.get("regtest.testjdk");
     }
 
     @Override