Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Mar 24, 2022
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions jck/jtrunner/JavaTestRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
Expand Down