File tree 2 files changed +27
-2
lines changed
config/openjceplus/jdk/x86-64_windows
2 files changed +27
-2
lines changed Original file line number Diff line number Diff line change @@ -464,12 +464,20 @@ def runTest() {
464
464
}
465
465
}
466
466
if (params. TEST_FLAG == " OpenJCEPlus" ) {
467
- def javaSecurityFile = " ${ env.WORKSPACE} /aqa-tests/config/openjceplus/jdk${ params.JDK_VERSION} /java.security"
467
+ def workdir = " ${ env.WORKSPACE} "
468
+ if (PLATFORM . contains(" windows" )) {
469
+ workdir = env. WORKSPACE . replaceAll(" \\\\ " , " /" )
470
+ }
471
+ def javaSecurityFile = " ${ workdir} /aqa-tests/config/openjceplus/jdk${ params.JDK_VERSION} /${ params.PLATFORM} /java.security"
472
+ if (! fileExists(javaSecurityFile)) {
473
+ javaSecurityFile = " ${ workdir} /aqa-tests/config/openjceplus/jdk/${ params.PLATFORM} /java.security"
474
+ }
468
475
if (! fileExists(javaSecurityFile)) {
469
- javaSecurityFile = " ${ env.WORKSPACE } /aqa-tests/config/openjceplus/jdk/java.security"
476
+ javaSecurityFile = " ${ workdir } /aqa-tests/config/openjceplus/jdk/java.security"
470
477
}
471
478
echo " Set -Djava.security.properties=${ javaSecurityFile} in EXTRA_OPTIONS"
472
479
env. EXTRA_OPTIONS + = " -Djava.security.properties=${ javaSecurityFile} "
480
+ sh " cat ${ javaSecurityFile} "
473
481
}
474
482
jenkinsfile = load " ${ WORKSPACE} /aqa-tests/buildenv/jenkins/JenkinsfileBase"
475
483
if (LABEL . contains(' ci.agent.dynamic' ) && CLOUD_PROVIDER . equals(' azure' )) {
Original file line number Diff line number Diff line change
1
+ # Add OpenJCEPlus to the top of the provider list. This file should be kept in sync with
2
+ # the out of the box security provider list except for placing OpenJCEPlus at the highest
3
+ # priority.
4
+ security.provider.1=com.ibm.crypto.plus.provider.OpenJCEPlus
5
+ security.provider.2=SUN
6
+ security.provider.3=SunRsaSign
7
+ security.provider.4=SunEC
8
+ security.provider.5=SunJSSE
9
+ security.provider.6=SunJCE
10
+ security.provider.7=SunJGSS
11
+ security.provider.8=SunSASL
12
+ security.provider.9=XMLDSig
13
+ security.provider.10=SunPCSC
14
+ security.provider.11=JdkLDAP
15
+ security.provider.12=JdkSASL
16
+ security.provider.13=SunPKCS11
17
+ security.provider.14=SunMSCAPI
You can’t perform that action at this time.
0 commit comments