diff --git a/Jenkinsfile b/Jenkinsfile index 4b31ebe..d0a3cc1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,5 @@ buildPlugin(useContainerAgent: true, configurations: [ - [platform: 'linux', jdk: 11], + [platform: 'linux', jdk: 17], [platform: 'linux', jdk: 21], [platform: 'windows', jdk: 17], ]) diff --git a/pom.xml b/pom.xml index e13600c..d5b2000 100644 --- a/pom.xml +++ b/pom.xml @@ -160,6 +160,12 @@ test-harness test + + org.jenkins-ci.main + jenkins-test-harness + 2270.v87a_0ea_b_54da_0 + test + diff --git a/src/test/java/com/cloudbees/jenkins/plugins/sshcredentials/impl/BasicSSHUserPrivateKeyFIPSTest.java b/src/test/java/com/cloudbees/jenkins/plugins/sshcredentials/impl/BasicSSHUserPrivateKeyFIPSTest.java index 86fa386..1e56030 100644 --- a/src/test/java/com/cloudbees/jenkins/plugins/sshcredentials/impl/BasicSSHUserPrivateKeyFIPSTest.java +++ b/src/test/java/com/cloudbees/jenkins/plugins/sshcredentials/impl/BasicSSHUserPrivateKeyFIPSTest.java @@ -28,7 +28,7 @@ public class BasicSSHUserPrivateKeyFIPSTest { @Rule public RealJenkinsRule rule = new RealJenkinsRule().omitPlugins("eddsa-api", "trilead-api") - .javaOptions("-Djenkins.security.FIPS140.COMPLIANCE=true"); + .withFIPSEnabled().javaOptions("-Xms256m"); @Test @Issue("JENKINS-73408")