Update

Author: taoliult

closed/src/java.base/share/classes/openj9/internal/security/RestrictedSecurity.java

@@ -638,20 +638,20 @@ private static void restrictsCheck() {
             }
         } else if (expireMonths <= 0) { // Check if the SunsetDate expired.
             if (ignoreSunsetExpiration) {
-                System.err.println("The requested restricted security profile " + restricts.profileID
+                System.err.format("The requested restricted security profile " + restricts.profileID
                         + " expired on " + restricts.descSunsetDate
-                        + ": certified cryptography use cannot be guaranteed."
-                        + " Use -Dsemeru.restrictedsecurity.suppresssunsetwarning to stop displaying this message."
-                        + " The -Dsemeru.restrictedsecurity.ignoresunsetexpiration option has been specified."
-                        + " WARNING: java will start with the requested restricted security profile but uncertified"
+                        + ": Certified cryptography use cannot be guaranteed.%n"
+                        + " Use -Dsemeru.restrictedsecurity.suppresssunsetwarning to stop displaying this message.%n"
+                        + " The -Dsemeru.restrictedsecurity.ignoresunsetexpiration option has been specified.%n"
+                        + " WARNING: Java will start with the requested restricted security profile but uncertified"
                         + " cryptography may be active.");
             } else {
-                printStackTraceAndExit("The requested restricted security profile " + restricts.profileID
+                printStackTraceAndExit(String.format("The requested restricted security profile " + restricts.profileID
                         + " expired on " + restricts.descSunsetDate
-                        + ": java will stop because certified cryptography use cannot be guaranteed."
-                        + " Use -Dsemeru.restrictedsecurity.suppresssunsetwarning to stop displaying this message."
+                        + ": Java will stop because certified cryptography use cannot be guaranteed.%n"
+                        + " Use -Dsemeru.restrictedsecurity.suppresssunsetwarning to stop displaying this message.%n"
                         + " Use -Dsemeru.restrictedsecurity.ignoresunsetexpiration to allow java to start while"
-                        + " possibly using uncertified cryptography.");
+                        + " possibly using uncertified cryptography."));
             }
         } else if (expireMonths <= 6) { // Check if the SunsetDate will expire within 6 months.
             System.err.println("The restricted security profile " + restricts.profileID

closed/test/jdk/openj9/internal/security/TestPolicySunset.java

@@ -79,7 +79,7 @@ private static Stream<Arguments> patternMatches_testPolicySunset() {
                 Arguments.of("Test-Profile-PolicySunset-Expired",
                         propertyFile,
                         "=false", "=true",
-                        "WARNING: java will start with the requested restricted security profile but uncertified cryptography may be active",
+                        "WARNING: Java will start with the requested restricted security profile but uncertified cryptography may be active",
                         0),
                 // 2 - expired; suppress=true; ignore=true, no warning
                 Arguments.of("Test-Profile-PolicySunset-Expired",
@@ -115,7 +115,7 @@ private static Stream<Arguments> patternMatches_testPolicySunset() {
                 Arguments.of("Test-Profile-PolicySunset-Expired",
                         propertyFile,
                         null, "=true",
-                        "WARNING: java will start with the requested restricted security profile but uncertified cryptography may be active",
+                        "WARNING: Java will start with the requested restricted security profile but uncertified cryptography may be active",
                         0),
                 // 8 - expired; suppress=false; ignore=false
                 Arguments.of("Test-Profile-PolicySunset-Expired",
@@ -161,7 +161,7 @@ public void shouldContain_testPolicySunset(String customprofile, String security
         }
         args.add("TestPolicySunset");
 
-        OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(args.toArray(new String[0]));
+        OutputAnalyzer outputAnalyzer = ProcessTools.executeTestJava(args);
         outputAnalyzer.reportDiagnosticSummary();
         outputAnalyzer.shouldHaveExitValue(exitValue).shouldMatch(expected);
     }