Skip to content

Commit efb726f

Browse files
imonteroperezimonteroperez
authored
Merge pull request #153 from basil/refresh
Refresh plugin for September 2024
2 parents d7f23a1 + e2643cd commit efb726f

12 files changed

+121
-84
lines changed

‎pom.xml

+117-39
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,11 @@
1212

1313
<properties>
1414
<changelist>999999-SNAPSHOT</changelist>
15-
<jenkins.version>2.462</jenkins.version>
16-
<jira-rest-client.version>5.2.6</jira-rest-client.version>
17-
<fugue.version>3.0.0</fugue.version>
18-
<spotbugs.failOnError>false</spotbugs.failOnError>
19-
<java.level>11</java.level>
15+
<jenkins.version>2.462.1</jenkins.version>
16+
<jira-rest-client.version>5.2.7</jira-rest-client.version>
17+
<fugue.version>4.7.2</fugue.version>
2018
<gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
19+
<spotbugs.threshold>High</spotbugs.threshold>
2120
</properties>
2221

2322
<groupId>org.jenkins-ci.plugins</groupId>
@@ -68,7 +67,7 @@
6867
</developers>
6968

7069
<scm>
71-
<connection>scm:git:git://github.com/${gitHubRepo}.git</connection>
70+
<connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
7271
<developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
7372
<url>https://github.com/${gitHubRepo}</url>
7473
<tag>${scmTag}</tag>
@@ -79,39 +78,13 @@
7978
<id>repo.jenkins-ci.org</id>
8079
<url>https://repo.jenkins-ci.org/public/</url>
8180
</repository>
82-
83-
<repository>
84-
<id>atlassian-public</id>
85-
<url>https://m2proxy.atlassian.com/repository/public</url>
86-
<snapshots>
87-
<enabled>true</enabled>
88-
<updatePolicy>daily</updatePolicy>
89-
<checksumPolicy>warn</checksumPolicy>
90-
</snapshots>
91-
<releases>
92-
<enabled>true</enabled>
93-
<checksumPolicy>warn</checksumPolicy>
94-
</releases>
95-
</repository>
9681
</repositories>
9782

9883
<pluginRepositories>
9984
<pluginRepository>
10085
<id>repo.jenkins-ci.org</id>
10186
<url>https://repo.jenkins-ci.org/public/</url>
10287
</pluginRepository>
103-
104-
<pluginRepository>
105-
<id>atlassian-public</id>
106-
<url>https://m2proxy.atlassian.com/repository/public</url>
107-
<releases>
108-
<enabled>true</enabled>
109-
<checksumPolicy>warn</checksumPolicy>
110-
</releases>
111-
<snapshots>
112-
<checksumPolicy>warn</checksumPolicy>
113-
</snapshots>
114-
</pluginRepository>
11588
</pluginRepositories>
11689

11790
<dependencyManagement>
@@ -145,10 +118,21 @@
145118
<artifactId>jira-rest-java-client-api</artifactId>
146119
<version>${jira-rest-client.version}</version>
147120
<exclusions>
121+
<!-- Deprecated and not needed at runtime -->
122+
<exclusion>
123+
<groupId>com.google.code.findbugs</groupId>
124+
<artifactId>jsr305</artifactId>
125+
</exclusion>
126+
<!-- Provided by Jenkins core -->
148127
<exclusion>
149128
<groupId>com.google.guava</groupId>
150129
<artifactId>guava</artifactId>
151130
</exclusion>
131+
<!-- Provided by joda-time-api plugin -->
132+
<exclusion>
133+
<groupId>joda-time</groupId>
134+
<artifactId>joda-time</artifactId>
135+
</exclusion>
152136
</exclusions>
153137
</dependency>
154138
<dependency>
@@ -157,20 +141,103 @@
157141
<version>${jira-rest-client.version}</version>
158142
<exclusions>
159143
<exclusion>
160-
<groupId>org.apache.commons</groupId>
161-
<artifactId>commons-lang3</artifactId>
144+
<groupId>com.atlassian.httpclient</groupId>
145+
<artifactId>atlassian-httpclient-library</artifactId>
146+
</exclusion>
147+
<exclusion>
148+
<groupId>com.atlassian.httpclient</groupId>
149+
<artifactId>atlassian-httpclient-plugin</artifactId>
150+
</exclusion>
151+
<!-- Deprecated and not needed at runtime -->
152+
<exclusion>
153+
<groupId>com.google.code.findbugs</groupId>
154+
<artifactId>jsr305</artifactId>
162155
</exclusion>
156+
<!-- Provided by Jenkins core -->
163157
<exclusion>
164158
<groupId>com.google.guava</groupId>
165159
<artifactId>guava</artifactId>
166160
</exclusion>
161+
<exclusion>
162+
<groupId>commons-codec</groupId>
163+
<artifactId>commons-codec</artifactId>
164+
</exclusion>
165+
<!-- Provided by joda-time-api plugin -->
166+
<exclusion>
167+
<groupId>joda-time</groupId>
168+
<artifactId>joda-time</artifactId>
169+
</exclusion>
170+
<!-- Provided by commons-lang3-api plugin -->
171+
<exclusion>
172+
<groupId>org.apache.commons</groupId>
173+
<artifactId>commons-lang3</artifactId>
174+
</exclusion>
175+
<!-- Provided by apache-httpcomponents-client-4-api plugin -->
176+
<exclusion>
177+
<groupId>org.apache.httpcomponents</groupId>
178+
<artifactId>httpasyncclient</artifactId>
179+
</exclusion>
180+
<exclusion>
181+
<groupId>org.apache.httpcomponents</groupId>
182+
<artifactId>httpasyncclient-cache</artifactId>
183+
</exclusion>
184+
<exclusion>
185+
<groupId>org.apache.httpcomponents</groupId>
186+
<artifactId>httpclient</artifactId>
187+
</exclusion>
188+
<exclusion>
189+
<groupId>org.apache.httpcomponents</groupId>
190+
<artifactId>httpclient-cache</artifactId>
191+
</exclusion>
192+
<exclusion>
193+
<groupId>org.apache.httpcomponents</groupId>
194+
<artifactId>httpcore</artifactId>
195+
</exclusion>
196+
<exclusion>
197+
<groupId>org.apache.httpcomponents</groupId>
198+
<artifactId>httpcore-nio</artifactId>
199+
</exclusion>
200+
<exclusion>
201+
<groupId>org.apache.httpcomponents</groupId>
202+
<artifactId>httpmime</artifactId>
203+
</exclusion>
204+
<!-- Provided by jersey2-api plugin -->
205+
<exclusion>
206+
<groupId>org.codehaus.jettison</groupId>
207+
<artifactId>jettison</artifactId>
208+
</exclusion>
209+
<exclusion>
210+
<groupId>org.glassfish.jersey.core</groupId>
211+
<artifactId>jersey-client</artifactId>
212+
</exclusion>
213+
<exclusion>
214+
<groupId>org.glassfish.jersey.core</groupId>
215+
<artifactId>jersey-common</artifactId>
216+
</exclusion>
217+
<exclusion>
218+
<groupId>org.glassfish.jersey.media</groupId>
219+
<artifactId>jersey-media-jaxb</artifactId>
220+
</exclusion>
221+
<exclusion>
222+
<groupId>org.glassfish.jersey.media</groupId>
223+
<artifactId>jersey-media-json-jettison</artifactId>
224+
</exclusion>
225+
<!-- Provided by Jenkins core -->
226+
<exclusion>
227+
<groupId>org.slf4j</groupId>
228+
<artifactId>slf4j-api</artifactId>
229+
</exclusion>
167230
<exclusion>
168231
<groupId>org.springframework</groupId>
169232
<artifactId>spring-beans</artifactId>
170233
</exclusion>
171234
<exclusion>
172-
<groupId>javax.activation</groupId>
173-
<artifactId>activation</artifactId>
235+
<groupId>org.springframework</groupId>
236+
<artifactId>spring-core</artifactId>
237+
</exclusion>
238+
<exclusion>
239+
<groupId>org.springframework</groupId>
240+
<artifactId>spring-jcl</artifactId>
174241
</exclusion>
175242
</exclusions>
176243
</dependency>
@@ -185,9 +252,20 @@
185252
<artifactId>apache-httpcomponents-client-4-api</artifactId>
186253
</dependency>
187254
<dependency>
188-
<groupId>com.google.code.gson</groupId>
189-
<artifactId>gson</artifactId>
190-
<version>2.10.1</version>
255+
<groupId>io.jenkins.plugins</groupId>
256+
<artifactId>commons-lang3-api</artifactId>
257+
</dependency>
258+
<dependency>
259+
<groupId>io.jenkins.plugins</groupId>
260+
<artifactId>gson-api</artifactId>
261+
</dependency>
262+
<dependency>
263+
<groupId>io.jenkins.plugins</groupId>
264+
<artifactId>jersey2-api</artifactId>
265+
</dependency>
266+
<dependency>
267+
<groupId>io.jenkins.plugins</groupId>
268+
<artifactId>joda-time-api</artifactId>
191269
</dependency>
192270

193271
</dependencies>

‎src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JiraTestDataPublisher.java

-4
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
import com.atlassian.jira.rest.client.internal.async.AsynchronousJiraRestClientFactory;
2929

3030
import edu.umd.cs.findbugs.annotations.CheckForNull;
31-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
3231
import io.atlassian.util.concurrent.Promise;
3332
import hudson.*;
3433
import hudson.matrix.MatrixConfiguration;
@@ -417,7 +416,6 @@ public JiraTestDataPublisherDescriptor() {
417416

418417
private static final String DEFAULT_SUMMARY = "${TEST_FULL_NAME} : ${TEST_ERROR_DETAILS}";
419418
private static final String DEFAULT_DESCRIPTION = "${BUILD_URL}${CRLF}${TEST_STACK_TRACE}";
420-
@SuppressFBWarnings(value = "MS_MUTABLE_COLLECTION_PKGPROTECT")
421419
public static final List<AbstractFields> templates;
422420
public static final StringFields DEFAULT_SUMMARY_FIELD;
423421
public static final StringFields DEFAULT_DESCRIPTION_FIELD;
@@ -589,7 +587,6 @@ public TestDataPublisher newInstance(StaplerRequest req, JSONObject json) throws
589587
* @return
590588
*/
591589
@RequirePOST
592-
@SuppressFBWarnings(value = "RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE")
593590
public FormValidation doValidateGlobal(@QueryParameter String jiraUrl,
594591
@QueryParameter String username,
595592
@QueryParameter String password
@@ -687,7 +684,6 @@ public ListBoxModel doFillIssueTypeItems(@QueryParameter String projectKey) {
687684
* @throws InterruptedException
688685
*/
689686
@JavaScriptMethod
690-
@SuppressFBWarnings(value = {"NP_NULL_ON_SOME_PATH","WMI_WRONG_MAP_ITERATOR"})
691687
public FormValidation validateFieldConfigs(String jsonForm) throws FormException, InterruptedException {
692688
// extracting the configurations for associated with this plugin (we receive the entire form)
693689
StaplerRequest req = Stapler.getCurrentRequest();

‎src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/JobConfigMapping.java

+2-3
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@
1515
*/
1616
package org.jenkinsci.plugins.JiraTestResultReporter;
1717

18-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
19-
2018
import com.google.gson.Gson;
2119
import com.google.gson.GsonBuilder;
2220
import com.google.gson.stream.JsonReader;
2321
import com.google.gson.stream.JsonWriter;
22+
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
2423
import hudson.model.Job;
2524
import jenkins.model.Jenkins;
2625
import org.jenkinsci.plugins.JiraTestResultReporter.config.AbstractFields;
@@ -120,7 +119,7 @@ public List<AbstractFields> getConfigs() {
120119
* See Java documentation for more details.
121120
* @return this object
122121
*/
123-
@SuppressFBWarnings(value = "SE_PRIVATE_READ_RESOLVE_NOT_INHERITED")
122+
@SuppressFBWarnings(value = "SE_PRIVATE_READ_RESOLVE_NOT_INHERITED", justification = "TODO needs triage")
124123
private Object readResolve() {
125124
compileIssueKeyPattern();
126125
return this;

‎src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/MetadataCache.java

-3
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.jenkinsci.plugins.JiraTestResultReporter;
1717

18-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
19-
2018
import com.atlassian.jira.rest.client.api.GetCreateIssueMetadataOptions;
2119
import com.atlassian.jira.rest.client.api.IssueRestClient;
2220
import com.atlassian.jira.rest.client.api.domain.CimFieldInfo;
@@ -125,7 +123,6 @@ public void removeCacheEntry(String projectKey, String issueType) {
125123
* @param issueType
126124
* @return
127125
*/
128-
@SuppressFBWarnings(value = "DCN_NULLPOINTER_EXCEPTION")
129126
public CacheEntry getCacheEntry(String projectKey, String issueType) {
130127
CacheEntry cacheEntry;
131128
try{

‎src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/TestToIssueMapping.java

+1-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.jenkinsci.plugins.JiraTestResultReporter;
1717

18-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
19-
2018
import com.google.gson.Gson;
2119
import com.google.gson.JsonElement;
2220
import com.google.gson.JsonObject;
@@ -66,7 +64,6 @@ private TestToIssueMapping() {
6664
* @param job
6765
* @param map
6866
*/
69-
@SuppressFBWarnings(value = "REC_CATCH_EXCEPTION")
7067
private void saveMap(Job job, HashMap<String, String> map) {
7168
try {
7269
Gson gson = new Gson();
@@ -260,4 +257,4 @@ public JsonElement getMap(Job job) {
260257
}
261258
}
262259
}
263-
}
260+
}

‎src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/api/TestToIssueMappingApi.java

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
package org.jenkinsci.plugins.JiraTestResultReporter.api;
22

3-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
4-
53
import com.google.gson.Gson;
64
import com.google.gson.GsonBuilder;
75
import com.google.gson.JsonElement;
@@ -36,7 +34,6 @@ public TestToIssueMappingApi() {
3634
}
3735

3836
@Override
39-
@SuppressFBWarnings(value = {"RCN_REDUNDANT_NULLCHECK_WOULD_HAVE_BEEN_A_NPE","NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"})
4037
public void doJson(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException {
4138
String jobName = req.getParameter("job");
4239
JsonElement result;
@@ -53,12 +50,8 @@ public void doJson(StaplerRequest req, StaplerResponse rsp) throws IOException,
5350
Item item = Jenkins.getActiveInstance().getItem(matrixJobName);
5451

5552
// check if it is matrix project
56-
if(item.getClass().equals(MatrixProject.class)) {
53+
if (item instanceof MatrixProject) {
5754
MatrixProject matrixProject = (MatrixProject) item;
58-
if(matrixProject == null) {
59-
rsp.sendError(HttpServletResponse.SC_NOT_FOUND);
60-
return;
61-
}
6255
result = TestToIssueMapping.getInstance().getMap(matrixProject, matrixSubJobName);
6356
}
6457
// else consider job resides in a sub-folder

‎src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/config/SelectableArrayFields.java

-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.jenkinsci.plugins.JiraTestResultReporter.config;
1717

18-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
19-
2018
import com.atlassian.jira.rest.client.api.IdentifiableEntity;
2119
import com.atlassian.jira.rest.client.api.NamedEntity;
2220
import com.atlassian.jira.rest.client.api.domain.CustomFieldOption;
@@ -42,7 +40,6 @@
4240
* Created by tuicu.
4341
* Class for fields with predefined values, that can have multiple values (ex. Components, Fix Versions, etc.)
4442
*/
45-
@SuppressFBWarnings(value = {"DE_MIGHT_IGNORE","RE_CATCH_EXCEPTION"})
4643
public class SelectableArrayFields extends AbstractFields {
4744
public static final long serialVersionUID = 312389869891081321L;
4845
private String fieldKey;
@@ -109,7 +106,6 @@ public FieldInput getFieldInput(TestResult test, EnvVars envVars) {
109106
*/
110107
@Symbol("jiraSelectableArrayField")
111108
@Extension
112-
@SuppressFBWarnings(value = {"DCN_NULLPOINTER_EXCEPTION","REC_CATCH_EXCEPTION"})
113109
public static class SelectableArrayFieldsDescriptor extends Descriptor<AbstractFields> {
114110

115111
@Override

‎src/main/java/org/jenkinsci/plugins/JiraTestResultReporter/config/SelectableFields.java

-4
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@
1515
*/
1616
package org.jenkinsci.plugins.JiraTestResultReporter.config;
1717

18-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
19-
2018
import com.atlassian.jira.rest.client.api.IdentifiableEntity;
2119
import com.atlassian.jira.rest.client.api.NamedEntity;
2220
import com.atlassian.jira.rest.client.api.domain.CustomFieldOption;
@@ -38,7 +36,6 @@
3836
* Created by tuicu.
3937
* Class for fields with a single, predefined value (ex. Priority)
4038
*/
41-
@SuppressFBWarnings(value = "DC_NULLPOINTER_EXCEPTION")
4239
public class SelectableFields extends AbstractFields {
4340
public static final long serialVersionUID = 7570781225890517710L;
4441
private String fieldKey;
@@ -99,7 +96,6 @@ public FieldInput getFieldInput(TestResult test, EnvVars envVars) {
9996
*/
10097
@Symbol("jiraSelectableField")
10198
@Extension
102-
@SuppressFBWarnings(value = "DCN_NULLPOINTER_EXCEPTION")
10399
public static class SelectableFieldsDescriptor extends Descriptor<AbstractFields> {
104100
@Override
105101
public String getDisplayName() {

0 commit comments

Comments
 (0)