Merge pull request ibmruntimes#760 from JasonFengJ9/mergetmp

Merge master jdk8u432-b02 into openj9-staging

closed/openjdk-tag.gmk

@@ -1 +1 @@
-OPENJDK_TAG := jdk8u432-b01
+OPENJDK_TAG := jdk8u432-b02

common/autoconf/flags.m4

@@ -143,9 +143,12 @@ AC_DEFUN_ONCE([FLAGS_SETUP_INIT_FLAGS],
       SYSROOT_LDFLAGS="-isysroot \"$SYSROOT\""
     fi
     # Propagate the sysroot args to hotspot
-    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
-    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
-    LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
+    LEGACY_HOST_CFLAGS="$LEGACY_EXTRA_CFLAGS"
+    LEGACY_HOST_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS"
+    LEGACY_HOST_LDFLAGS="$LEGACY_EXTRA_LDFLAGS"
+    LEGACY_TARGET_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
+    LEGACY_TARGET_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
+    LEGACY_TARGET_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
   fi
   AC_SUBST(SYSROOT_CFLAGS)
   AC_SUBST(SYSROOT_LDFLAGS)
@@ -441,11 +444,14 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
     CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt -qstackprotect"
     CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt -qstackprotect"
   elif test "x$TOOLCHAIN_TYPE" = xgcc; then
-    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
-    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
+    LEGACY_HOST_CFLAGS="$LEGACY_HOST_CFLAGS -fstack-protector"
+    LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS -fstack-protector"
+    LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS -fstack-protector"
+    LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS -fstack-protector"
     if test "x$OPENJDK_TARGET_OS" != xmacosx; then
       LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
-      LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
+      LEGACY_HOST_LDFLAGS="$LEGACY_HOST_LDFLAGS -Wl,-z,relro"
+      LEGACY_TARGET_LDFLAGS="$LEGACY_TARGET_LDFLAGS -Wl,-z,relro"
     fi
     $2CXXSTD_CXXFLAG="-std=gnu++98"
     FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]$2CXXSTD_CXXFLAG -Werror],
@@ -489,15 +495,23 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK],
   LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
 
   # Hotspot needs these set in their legacy form
-  LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
-  LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
-  LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
-  LEGACY_EXTRA_ASFLAGS="$with_extra_asflags"
-
-  AC_SUBST(LEGACY_EXTRA_CFLAGS)
-  AC_SUBST(LEGACY_EXTRA_CXXFLAGS)
-  AC_SUBST(LEGACY_EXTRA_LDFLAGS)
-  AC_SUBST(LEGACY_EXTRA_ASFLAGS)
+  LEGACY_HOST_CFLAGS="$LEGACY_HOST_CFLAGS $with_extra_cflags"
+  LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS $with_extra_cflags"
+  LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS $with_extra_cxxflags"
+  LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS $with_extra_cxxflags"
+  LEGACY_HOST_LDFLAGS="$LEGACY_HOST_LDFLAGS $with_extra_ldflags"
+  LEGACY_TARGET_LDFLAGS="$LEGACY_TARGET_LDFLAGS $with_extra_ldflags"
+  LEGACY_HOST_ASFLAGS="$with_extra_asflags"
+  LEGACY_TARGET_ASFLAGS="$with_extra_asflags"
+
+  AC_SUBST(LEGACY_HOST_CFLAGS)
+  AC_SUBST(LEGACY_HOST_CXXFLAGS)
+  AC_SUBST(LEGACY_HOST_LDFLAGS)
+  AC_SUBST(LEGACY_HOST_ASFLAGS)
+  AC_SUBST(LEGACY_TARGET_CFLAGS)
+  AC_SUBST(LEGACY_TARGET_CXXFLAGS)
+  AC_SUBST(LEGACY_TARGET_LDFLAGS)
+  AC_SUBST(LEGACY_TARGET_ASFLAGS)
 
   ###############################################################################
   #

common/autoconf/generated-configure.sh

@@ -691,10 +691,14 @@ FDLIBM_CFLAGS
 USE_FORMAT_OVERFLOW
 NO_LIFETIME_DSE_CFLAG
 NO_DELETE_NULL_POINTER_CHECKS_CFLAG
-LEGACY_EXTRA_ASFLAGS
-LEGACY_EXTRA_LDFLAGS
-LEGACY_EXTRA_CXXFLAGS
-LEGACY_EXTRA_CFLAGS
+LEGACY_TARGET_ASFLAGS
+LEGACY_TARGET_LDFLAGS
+LEGACY_TARGET_CXXFLAGS
+LEGACY_TARGET_CFLAGS
+LEGACY_HOST_ASFLAGS
+LEGACY_HOST_LDFLAGS
+LEGACY_HOST_CXXFLAGS
+LEGACY_HOST_CFLAGS
 CXXSTD_CXXFLAG
 CXX_O_FLAG_NONE
 CXX_O_FLAG_NORM
@@ -4451,7 +4455,7 @@ VS_TOOLSET_SUPPORTED_2022=true
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1714325248
+DATE_WHEN_GENERATED=1724410208
 
 ###############################################################################
 #
@@ -41870,9 +41874,12 @@ $as_echo "$tool_specified" >&6; }
       SYSROOT_LDFLAGS="-isysroot \"$SYSROOT\""
     fi
     # Propagate the sysroot args to hotspot
-    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
-    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
-    LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
+    LEGACY_HOST_CFLAGS="$LEGACY_EXTRA_CFLAGS"
+    LEGACY_HOST_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS"
+    LEGACY_HOST_LDFLAGS="$LEGACY_EXTRA_LDFLAGS"
+    LEGACY_TARGET_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
+    LEGACY_TARGET_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
+    LEGACY_TARGET_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
   fi
 
 
@@ -42700,11 +42707,14 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
     CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt -qstackprotect"
     CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt -qstackprotect"
   elif test "x$TOOLCHAIN_TYPE" = xgcc; then
-    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
-    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
+    LEGACY_HOST_CFLAGS="$LEGACY_HOST_CFLAGS -fstack-protector"
+    LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS -fstack-protector"
+    LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS -fstack-protector"
+    LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS -fstack-protector"
     if test "x$OPENJDK_TARGET_OS" != xmacosx; then
       LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
-      LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
+      LEGACY_HOST_LDFLAGS="$LEGACY_HOST_LDFLAGS -Wl,-z,relro"
+      LEGACY_TARGET_LDFLAGS="$LEGACY_TARGET_LDFLAGS -Wl,-z,relro"
     fi
     CXXSTD_CXXFLAG="-std=gnu++98"
 
@@ -42805,10 +42815,18 @@ fi
   LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
 
   # Hotspot needs these set in their legacy form
-  LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
-  LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
-  LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
-  LEGACY_EXTRA_ASFLAGS="$with_extra_asflags"
+  LEGACY_HOST_CFLAGS="$LEGACY_HOST_CFLAGS $with_extra_cflags"
+  LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS $with_extra_cflags"
+  LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS $with_extra_cxxflags"
+  LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS $with_extra_cxxflags"
+  LEGACY_HOST_LDFLAGS="$LEGACY_HOST_LDFLAGS $with_extra_ldflags"
+  LEGACY_TARGET_LDFLAGS="$LEGACY_TARGET_LDFLAGS $with_extra_ldflags"
+  LEGACY_HOST_ASFLAGS="$with_extra_asflags"
+  LEGACY_TARGET_ASFLAGS="$with_extra_asflags"
+
+
+
+
 
 
 

common/autoconf/hotspot-spec.gmk.in

@@ -111,11 +111,19 @@ LD:=@HOTSPOT_LD@
 MT:=@HOTSPOT_MT@
 RC:=@HOTSPOT_RC@
 
-EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
-				   $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
-EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
-EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
-EXTRA_ASFLAGS=@LEGACY_EXTRA_ASFLAGS@
+# Retain EXTRA_{CFLAGS,CXXFLAGS,LDFLAGS,ASFLAGS} for the target flags to
+# maintain compatibility with the existing Makefiles
+EXTRA_CFLAGS=@LEGACY_TARGET_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
+				    $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
+EXTRA_CXXFLAGS=@LEGACY_TARGET_CXXFLAGS@
+EXTRA_LDFLAGS=@LEGACY_TARGET_LDFLAGS@
+EXTRA_ASFLAGS=@LEGACY_TARGET_ASFLAGS@
+# Define an equivalent set for the host flags (i.e. without sysroot options)
+HOST_CFLAGS=@LEGACY_HOST_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \
+				 $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
+HOST_CXXFLAGS=@LEGACY_HOST_CXXFLAGS@
+HOST_LDFLAGS=@LEGACY_HOST_LDFLAGS@
+HOST_ASFLAGS=@LEGACY_HOST_ASFLAGS@
 
 USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@
 USE_FORMAT_OVERFLOW=@USE_FORMAT_OVERFLOW@

jdk/make/closed/autoconf/generated-configure.sh

@@ -701,10 +701,14 @@ FDLIBM_CFLAGS
 USE_FORMAT_OVERFLOW
 NO_LIFETIME_DSE_CFLAG
 NO_DELETE_NULL_POINTER_CHECKS_CFLAG
-LEGACY_EXTRA_ASFLAGS
-LEGACY_EXTRA_LDFLAGS
-LEGACY_EXTRA_CXXFLAGS
-LEGACY_EXTRA_CFLAGS
+LEGACY_TARGET_ASFLAGS
+LEGACY_TARGET_LDFLAGS
+LEGACY_TARGET_CXXFLAGS
+LEGACY_TARGET_CFLAGS
+LEGACY_HOST_ASFLAGS
+LEGACY_HOST_LDFLAGS
+LEGACY_HOST_CXXFLAGS
+LEGACY_HOST_CFLAGS
 CXXSTD_CXXFLAG
 CXX_O_FLAG_NONE
 CXX_O_FLAG_NORM
@@ -4625,7 +4629,7 @@ VS_TOOLSET_SUPPORTED_2022=true
 
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1714325248
+DATE_WHEN_GENERATED=1724410208
 
 ###############################################################################
 #
@@ -44881,9 +44885,12 @@ $as_echo "$tool_specified" >&6; }
       SYSROOT_LDFLAGS="-isysroot \"$SYSROOT\""
     fi
     # Propagate the sysroot args to hotspot
-    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
-    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
-    LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
+    LEGACY_HOST_CFLAGS="$LEGACY_EXTRA_CFLAGS"
+    LEGACY_HOST_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS"
+    LEGACY_HOST_LDFLAGS="$LEGACY_EXTRA_LDFLAGS"
+    LEGACY_TARGET_CFLAGS="$LEGACY_EXTRA_CFLAGS $SYSROOT_CFLAGS"
+    LEGACY_TARGET_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $SYSROOT_CFLAGS"
+    LEGACY_TARGET_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $SYSROOT_LDFLAGS"
   fi
 
 
@@ -45711,11 +45718,14 @@ $as_echo "$ac_cv_c_bigendian" >&6; }
     CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt -qstackprotect"
     CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt -qstackprotect"
   elif test "x$TOOLCHAIN_TYPE" = xgcc; then
-    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
-    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
+    LEGACY_HOST_CFLAGS="$LEGACY_HOST_CFLAGS -fstack-protector"
+    LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS -fstack-protector"
+    LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS -fstack-protector"
+    LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS -fstack-protector"
     if test "x$OPENJDK_TARGET_OS" != xmacosx; then
       LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
-      LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
+      LEGACY_HOST_LDFLAGS="$LEGACY_HOST_LDFLAGS -Wl,-z,relro"
+      LEGACY_TARGET_LDFLAGS="$LEGACY_TARGET_LDFLAGS -Wl,-z,relro"
     fi
     CXXSTD_CXXFLAG="-std=gnu++98"
 
@@ -45816,10 +45826,18 @@ fi
   LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
 
   # Hotspot needs these set in their legacy form
-  LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
-  LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
-  LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
-  LEGACY_EXTRA_ASFLAGS="$with_extra_asflags"
+  LEGACY_HOST_CFLAGS="$LEGACY_HOST_CFLAGS $with_extra_cflags"
+  LEGACY_TARGET_CFLAGS="$LEGACY_TARGET_CFLAGS $with_extra_cflags"
+  LEGACY_HOST_CXXFLAGS="$LEGACY_HOST_CXXFLAGS $with_extra_cxxflags"
+  LEGACY_TARGET_CXXFLAGS="$LEGACY_TARGET_CXXFLAGS $with_extra_cxxflags"
+  LEGACY_HOST_LDFLAGS="$LEGACY_HOST_LDFLAGS $with_extra_ldflags"
+  LEGACY_TARGET_LDFLAGS="$LEGACY_TARGET_LDFLAGS $with_extra_ldflags"
+  LEGACY_HOST_ASFLAGS="$with_extra_asflags"
+  LEGACY_TARGET_ASFLAGS="$with_extra_asflags"
+
+
+
+
 
 
 

jdk/src/share/native/common/check_code.c

@@ -1731,9 +1731,14 @@ static int instruction_length(unsigned char *iptr, unsigned char *end)
             }
 
         default: {
+            if (instruction < 0 || instruction > JVM_OPC_MAX)
+                return -1;
+
             /* A length of 0 indicates an error. */
-            int length = opcode_length[instruction];
-            return (length <= 0) ? -1 : length;
+            if (opcode_length[instruction] <= 0)
+                return -1;
+
+            return opcode_length[instruction];
         }
     }
 }

jdk/src/share/native/sun/java2d/loops/TransformHelper.c

@@ -120,6 +120,13 @@ TransformInterpFunc *pBicubicFunc = BicubicInterp;
 /* We reject coordinates not less than 1<<30 so that the distance between */
 /* any 2 of them is less than 1<<31 which would overflow into the sign */
 /* bit of a signed long value used to represent fixed point coordinates. */
+/// Properly define some macros to accommodate
+/// older MSVC versions.
+#if defined(_MSC_VER) && _MSC_VER <= 1700
+    #include <float.h>
+    #define isnan _isnan
+    #define isinf(x) (!_finite((x)))
+#endif
 #if  !defined(_MSC_VER) && (defined(__STDC_VERSION__) && __STDC_VERSION__ <= 199409)
     #if !defined(isinf)
     #define isinf(x) (!finite(x))

jdk/test/java/util/Calendar/SupplementalJapaneseEraTest.java

@@ -39,6 +39,7 @@
 import java.nio.file.SimpleFileVisitor;
 import java.nio.file.StandardCopyOption;
 import java.nio.file.attribute.BasicFileAttributes;
+import java.nio.file.FileVisitOption;
 import java.text.SimpleDateFormat;
 import java.time.chrono.JapaneseChronology;
 import java.time.chrono.JapaneseDate;
@@ -52,6 +53,7 @@
 import java.util.Locale;
 import java.util.Properties;
 import java.util.TimeZone;
+import java.util.EnumSet;
 
 import jdk.testlibrary.ProcessTools;
 import org.testng.annotations.BeforeTest;
@@ -71,7 +73,7 @@ public class SupplementalJapaneseEraTest {
     public void prepareTestJDK() throws IOException {
         Path src = Paths.get(System.getProperty("test.jdk")).toAbsolutePath();
         Path dst = Paths.get("testjava").toAbsolutePath();
-        Files.walkFileTree(src, new CopyFileVisitor(src, dst));
+        Files.walkFileTree(src, EnumSet.of(FileVisitOption.FOLLOW_LINKS), Integer.MAX_VALUE, new CopyFileVisitor(src, dst));
     }
 
     @Test

jdk/test/sun/management/jmxremote/bootstrap/management_ssltest07_ok.properties.in

@@ -1,5 +1,5 @@
-com.sun.management.jmxremote.ssl.enabled.cipher.suites=SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5
+com.sun.management.jmxremote.ssl.enabled.cipher.suites=TLS_DHE_DSS_WITH_AES_128_GCM_SHA256
 com.sun.management.jmxremote.ssl.enabled.protocols=SSLv2Hello,SSLv3,TLSv1
 com.sun.management.jmxremote.ssl.need.client.auth=true
 com.sun.management.jmxremote.authenticate=false
-javax.rmi.ssl.client.enabledCipherSuites=SSL_RSA_WITH_RC4_128_SHA,SSL_RSA_WITH_RC4_128_MD5
+javax.rmi.ssl.client.enabledCipherSuites=TLS_DHE_DSS_WITH_AES_128_GCM_SHA256

jdk/test/sun/management/jmxremote/bootstrap/ssl/Readme.txt

@@ -0,0 +1,11 @@
+The trustore and keystore are to be generated as follows:
+
+1. keytool -genkey -alias duke -keystore keystore -validity 36500
+- use password 'password' for the keystore and key passwords
+- leave all values at default
+- the certificate validity will be 100 years (should be enough for now)
+2. keytool -export -keystore keystore -alias duke -file duke.crt
+3. keytool -import -keystore truststore -alias duke -file duke.crt
+- use password 'trustword' for the keystore and key passwords
+- leave all values at default
+

jdk/test/sun/management/jmxremote/startstop/JMXStartStopTest.java

@@ -765,7 +765,7 @@ static void test_10() throws Exception {
                 "jmxremote.ssl=false",
                 "jmxremote.port=" + pa.getPort1()
             );
-            testConnect(port1);
+            testConnect(pa.getPort1());
 
             jcmd(CMD_STOP);
             jcmd(CMD_START,