diff --git a/pom.xml b/pom.xml index ad666b51..59bc3b8d 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.jenkins-ci.plugins plugin - 4.73 + 4.85 io.jenkins.plugins @@ -29,7 +29,7 @@ 1.0.0 -SNAPSHOT - 2.401.3 + 2.440.3 jenkinsci/${project.artifactId}-plugin false @@ -39,25 +39,25 @@ io.jenkins.tools.bom - bom-2.401.x - 2496.vddfca_753db_80 + bom-2.440.x + 3387.v0f2773fa_3200 pom import org.springframework.security spring-security-core - 5.8.5 + 5.8.14 org.springframework.security spring-security-crypto - 5.8.5 + 5.8.14 org.springframework.security spring-security-web - 5.8.5 + 5.8.14 @@ -68,6 +68,11 @@ jackson-databind 2.16.1 + + io.jenkins.plugins + apache-httpcomponents-client-5-api + 5.4-118.v199115451c4d + io.jenkins.plugins gitlab-branch-source @@ -79,11 +84,6 @@ - - org.apache.httpcomponents.client5 - httpclient5 - 5.3.1 - org.jenkins-ci.plugins cloudbees-bitbucket-branch-source diff --git a/src/main/java/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig.java b/src/main/java/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig.java index d8ae8780..d8897be5 100644 --- a/src/main/java/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig.java +++ b/src/main/java/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig.java @@ -28,7 +28,7 @@ @Extension public class ScannerGlobalConfig extends GlobalConfiguration implements Serializable { private static final long serialVersionUID = -3129542889827231427L; - private final int CONNECTION_TIMEOUT_IN_SECONDS = 120; + private static final int CONNECTION_TIMEOUT_IN_SECONDS = 120; private String AUTHORIZATION_FAILURE = "Could not perform the authorization request: "; private String CONNECTION_SUCCESSFUL = "Connection successful."; @@ -272,14 +272,17 @@ private ListBoxModel getOptionsWithApiTokenCredentials() { ScanCredentialsHelper.API_TOKEN_CREDENTIALS); } + @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"}) public ListBoxModel doFillBlackDuckSCACredentialsIdItems() { return getOptionsWithApiTokenCredentials(); } + @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"}) public ListBoxModel doFillPolarisCredentialsIdItems() { return getOptionsWithApiTokenCredentials(); } + @SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"}) public ListBoxModel doFillCoverityCredentialsIdItems() { Jenkins jenkins = Jenkins.getInstanceOrNull(); if (jenkins == null) {