diff --git a/.github/workflows/jenkins-security-scan.yml b/.github/workflows/jenkins-security-scan.yml index c3b6b4be..82213d97 100644 --- a/.github/workflows/jenkins-security-scan.yml +++ b/.github/workflows/jenkins-security-scan.yml @@ -13,4 +13,4 @@ jobs: uses: jenkins-infra/jenkins-security-scan/.github/workflows/jenkins-security-scan.yaml@v2 with: java-cache: '' # Optionally enable use of a build dependency cache. Specify 'maven' or 'gradle' as appropriate. - java-version: 11 # What version of Java to set up for the build. + java-version: 17 # What version of Java to set up for the build. diff --git a/pom.xml b/pom.xml index 4606b512..b904ed69 100644 --- a/pom.xml +++ b/pom.xml @@ -46,9 +46,13 @@ under the License. 4 999999-SNAPSHOT - 2.401.3 + + 2.464-rc35069.54d5e6a_108a_0 jenkinsci/${project.artifactId}-plugin 3.343.vb_63a_6c3df23c + + 2230.v4fa_477b_634f4 + 17 @@ -300,6 +304,12 @@ under the License. pom import + + + jakarta.servlet + jakarta.servlet-api + 5.0.0 + org.apache.santuario xmlsec diff --git a/src/test/java/org/jenkinsci/plugins/saml/OpenSamlWrapperTest.java b/src/test/java/org/jenkinsci/plugins/saml/OpenSamlWrapperTest.java index d2c8b23c..7be1f565 100644 --- a/src/test/java/org/jenkinsci/plugins/saml/OpenSamlWrapperTest.java +++ b/src/test/java/org/jenkinsci/plugins/saml/OpenSamlWrapperTest.java @@ -23,10 +23,10 @@ import org.junit.Test; import org.jvnet.hudson.test.JenkinsRule; import org.kohsuke.stapler.HttpResponse; -import org.kohsuke.stapler.StaplerResponse; +import org.kohsuke.stapler.StaplerResponse2; import org.mockito.Mockito; -import javax.servlet.ServletException; +import jakarta.servlet.ServletException; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; @@ -60,7 +60,7 @@ public void metadataWrapper() throws IOException, ServletException { jenkinsRule.jenkins.setSecurityRealm(samlSecurity); SamlSPMetadataWrapper samlSPMetadataWrapper = new SamlSPMetadataWrapper(samlSecurity.getSamlPluginConfig(), null, null); HttpResponse process = samlSPMetadataWrapper.get(); - StaplerResponse mockResponse = Mockito.mock(StaplerResponse.class); + StaplerResponse2 mockResponse = Mockito.mock(StaplerResponse2.class); StringWriter stringWriter = new StringWriter(); when(mockResponse.getWriter()).thenReturn(new PrintWriter(stringWriter)); process.generateResponse(null, mockResponse, null); @@ -89,7 +89,7 @@ public void metadataWrapperWitEncrytionConfigured() throws IOException, ServletE jenkinsRule.jenkins.setSecurityRealm(samlSecurity); SamlSPMetadataWrapper samlSPMetadataWrapper = new SamlSPMetadataWrapper(samlSecurity.getSamlPluginConfig(), null, null); HttpResponse process = samlSPMetadataWrapper.get(); - StaplerResponse mockResponse = Mockito.mock(StaplerResponse.class); + StaplerResponse2 mockResponse = Mockito.mock(StaplerResponse2.class); StringWriter stringWriter = new StringWriter(); when(mockResponse.getWriter()).thenReturn(new PrintWriter(stringWriter)); process.generateResponse(null, mockResponse, null);