Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit ec13e12

Browse files
authored
Merge pull request #9 from blackduck-inc/fix-hosting-issue
Fix Hosting Issues
2 parents 00569e6 + 8184f71 commit ec13e12

File tree

2 files changed

+16
-13
lines changed

2 files changed

+16
-13
lines changed

pom.xml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>org.jenkins-ci.plugins</groupId>
66
<artifactId>plugin</artifactId>
7-
<version>4.73</version>
7+
<version>4.85</version>
88
<relativePath />
99
</parent>
1010
<groupId>io.jenkins.plugins</groupId>
@@ -29,7 +29,7 @@
2929
<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
3030
<revision>1.0.0</revision>
3131
<changelist>-SNAPSHOT</changelist>
32-
<jenkins.version>2.401.3</jenkins.version>
32+
<jenkins.version>2.440.3</jenkins.version>
3333
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
3434
<spotless.check.skip>false</spotless.check.skip>
3535
</properties>
@@ -39,25 +39,25 @@
3939
<dependency>
4040
<!-- Pick up common dependencies for the selected LTS line: https://github.com/jenkinsci/bom#usage -->
4141
<groupId>io.jenkins.tools.bom</groupId>
42-
<artifactId>bom-2.401.x</artifactId>
43-
<version>2496.vddfca_753db_80</version>
42+
<artifactId>bom-2.440.x</artifactId>
43+
<version>3387.v0f2773fa_3200</version>
4444
<type>pom</type>
4545
<scope>import</scope>
4646
</dependency>
4747
<dependency>
4848
<groupId>org.springframework.security</groupId>
4949
<artifactId>spring-security-core</artifactId>
50-
<version>5.8.5</version>
50+
<version>5.8.14</version>
5151
</dependency>
5252
<dependency>
5353
<groupId>org.springframework.security</groupId>
5454
<artifactId>spring-security-crypto</artifactId>
55-
<version>5.8.5</version>
55+
<version>5.8.14</version>
5656
</dependency>
5757
<dependency>
5858
<groupId>org.springframework.security</groupId>
5959
<artifactId>spring-security-web</artifactId>
60-
<version>5.8.5</version>
60+
<version>5.8.14</version>
6161
</dependency>
6262
</dependencies>
6363
</dependencyManagement>
@@ -68,6 +68,11 @@
6868
<artifactId>jackson-databind</artifactId>
6969
<version>2.16.1</version>
7070
</dependency>
71+
<dependency>
72+
<groupId>io.jenkins.plugins</groupId>
73+
<artifactId>apache-httpcomponents-client-5-api</artifactId>
74+
<version>5.4-118.v199115451c4d</version>
75+
</dependency>
7176
<dependency>
7277
<groupId>io.jenkins.plugins</groupId>
7378
<artifactId>gitlab-branch-source</artifactId>
@@ -79,11 +84,6 @@
7984
</exclusion>
8085
</exclusions>
8186
</dependency>
82-
<dependency>
83-
<groupId>org.apache.httpcomponents.client5</groupId>
84-
<artifactId>httpclient5</artifactId>
85-
<version>5.3.1</version>
86-
</dependency>
8787
<dependency>
8888
<groupId>org.jenkins-ci.plugins</groupId>
8989
<artifactId>cloudbees-bitbucket-branch-source</artifactId>

src/main/java/io/jenkins/plugins/security/scan/extension/global/ScannerGlobalConfig.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
@Extension
2929
public class ScannerGlobalConfig extends GlobalConfiguration implements Serializable {
3030
private static final long serialVersionUID = -3129542889827231427L;
31-
private final int CONNECTION_TIMEOUT_IN_SECONDS = 120;
31+
private static final int CONNECTION_TIMEOUT_IN_SECONDS = 120;
3232
private String AUTHORIZATION_FAILURE = "Could not perform the authorization request: ";
3333
private String CONNECTION_SUCCESSFUL = "Connection successful.";
3434

@@ -272,14 +272,17 @@ private ListBoxModel getOptionsWithApiTokenCredentials() {
272272
ScanCredentialsHelper.API_TOKEN_CREDENTIALS);
273273
}
274274

275+
@SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
275276
public ListBoxModel doFillBlackDuckSCACredentialsIdItems() {
276277
return getOptionsWithApiTokenCredentials();
277278
}
278279

280+
@SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
279281
public ListBoxModel doFillPolarisCredentialsIdItems() {
280282
return getOptionsWithApiTokenCredentials();
281283
}
282284

285+
@SuppressWarnings({"lgtm[jenkins/no-permission-check]", "lgtm[jenkins/csrf]"})
283286
public ListBoxModel doFillCoverityCredentialsIdItems() {
284287
Jenkins jenkins = Jenkins.getInstanceOrNull();
285288
if (jenkins == null) {

0 commit comments

Comments
 (0)