Enable SHA1 jar signing for jdk-18 api/java_util (#3496)

Signed-off-by: Andrew Leonard <anleonar@redhat.com>
adoptium · Mar 24, 2022 · e0e394f · e0e394f
1 parent 46131c1
commit e0e394f
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/jck/jtrunner/JavaTestRunner.java b/jck/jtrunner/JavaTestRunner.java
@@ -329,7 +329,7 @@ public static boolean generateJTB() throws Exception {
 			bw.close();
 		}
 
-		if ( getJckVersionInt(jckVersionNo) >= 18 && tests.contains("api/java_net") ) {
+		if ( getJckVersionInt(jckVersionNo) >= 18 && (tests.contains("api/java_net") || tests.contains("api/java_util")) ) {
 			// Requires SHA1 enabling for jar signers in jdk-18+
 			secPropsFile = resultDir + File.separator + "security.properties";
 			System.out.println("Custom security properties to be stored in: " + secPropsFile);
@@ -1159,7 +1159,7 @@ private static boolean testsRequireDisplay (String tests) {
 	private static String getTestSpecificJvmOptions(String jckVersion, String tests) {
 		String testSpecificJvmOptions = "";
 
-		if ( tests.contains("api/javax_net") || tests.contains("api/javax_xml") || (getJckVersionInt(jckVersionNo) >= 18 && tests.contains("api/java_net")) ) {
+		if ( tests.contains("api/javax_net") || tests.contains("api/javax_xml") || (getJckVersionInt(jckVersionNo) >= 18 && (tests.contains("api/java_net") || tests.contains("api/java_util"))) ) {
 			// Needs extra security.properties
 			testSpecificJvmOptions += " -Djava.security.properties=" + secPropsFile;
 		}