Skip to content

Commit 446e661

Browse files
Bump org.jenkins-ci.plugins:plugin from 5.8 to 5.9 (#1658)
* Bump org.jenkins-ci.plugins:plugin from 5.8 to 5.9 Bumps [org.jenkins-ci.plugins:plugin](https://github.com/jenkinsci/plugin-pom) from 5.8 to 5.9. - [Release notes](https://github.com/jenkinsci/plugin-pom/releases) - [Changelog](https://github.com/jenkinsci/plugin-pom/blob/master/CHANGELOG.md) - [Commits](jenkinsci/plugin-pom@plugin-5.8...plugin-5.9) --- updated-dependencies: - dependency-name: org.jenkins-ci.plugins:plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Clean up SpotBugs suppressions --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Vincent Latombe <[email protected]>
1 parent dde429f commit 446e661

File tree

6 files changed

+2
-30
lines changed

6 files changed

+2
-30
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
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>5.8</version>
7+
<version>5.9</version>
88
<relativePath />
99
</parent>
1010

src/main/java/org/csanchez/jenkins/plugins/kubernetes/KubernetesCloud.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.cloudbees.plugins.credentials.domains.URIRequirementBuilder;
1111
import edu.umd.cs.findbugs.annotations.CheckForNull;
1212
import edu.umd.cs.findbugs.annotations.NonNull;
13-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
1413
import hudson.Extension;
1514
import hudson.Main;
1615
import hudson.TcpSlaveAgentListener;
@@ -188,11 +187,6 @@ public KubernetesCloud(String name) {
188187
* @param source Source Kubernetes cloud implementation
189188
* @since 0.13
190189
*/
191-
@SuppressFBWarnings(
192-
value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR",
193-
justification = "Problem raised for calling unmarshal. Ignoring the "
194-
+ "warning cause it leads to too many changes, with "
195-
+ "unclear impact.")
196190
public KubernetesCloud(@NonNull String name, @NonNull KubernetesCloud source) {
197191
super(name);
198192
XStream2 xs = new XStream2();
@@ -592,7 +586,6 @@ public void setPodRetention(PodRetention podRetention) {
592586
*
593587
* @return Kubernetes client.
594588
*/
595-
@SuppressFBWarnings({"IS2_INCONSISTENT_SYNC", "DC_DOUBLECHECK"})
596589
public KubernetesClient connect() throws KubernetesAuthException, IOException {
597590

598591
LOGGER.log(Level.FINEST, "Building connection to Kubernetes {0} URL {1} namespace {2}", new String[] {

src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplate.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import edu.umd.cs.findbugs.annotations.CheckForNull;
44
import edu.umd.cs.findbugs.annotations.NonNull;
5-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
65
import hudson.Extension;
76
import hudson.Util;
87
import hudson.model.AbstractDescribableImpl;
@@ -258,11 +257,6 @@ public PodTemplate(@CheckForNull String id) {
258257
recomputeLabelDerivedFields();
259258
}
260259

261-
@SuppressFBWarnings(
262-
value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR",
263-
justification = "Warning raised for the call to unmarshal. Ignoring as"
264-
+ " it would require too many changes and uncertain "
265-
+ "impact.")
266260
public PodTemplate(PodTemplate from) {
267261
XStream2 xs = new XStream2();
268262
xs.unmarshal(XStream2.getDefaultDriver().createReader(new StringReader(xs.toXML(from))), this);
@@ -276,10 +270,6 @@ public PodTemplate(String image, List<? extends PodVolume> volumes) {
276270
this(null, image, volumes);
277271
}
278272

279-
@SuppressFBWarnings(
280-
value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR",
281-
justification = "Warning raised for calling the getContainers method. As "
282-
+ "this current method is deprecated anyway, it is " + "probably safer to not change it.")
283273
@Deprecated
284274
PodTemplate(String name, String image, List<? extends PodVolume> volumes) {
285275
this(name, volumes, Collections.emptyList());
@@ -367,9 +357,6 @@ public void setRemoteFs(String remoteFs) {
367357
}
368358

369359
@Deprecated
370-
@SuppressFBWarnings(
371-
value = "NM_CONFUSING",
372-
justification = "Naming confusion with a getRemoteFS method, but the current one is deprecated.")
373360
public String getRemoteFs() {
374361
return getFirstContainer().map(ContainerTemplate::getWorkingDir).orElse(ContainerTemplate.DEFAULT_WORKING_DIR);
375362
}
@@ -851,7 +838,7 @@ public void setContainers(@NonNull List<ContainerTemplate> items) {
851838
}
852839

853840
@NonNull
854-
public List<ContainerTemplate> getContainers() {
841+
public final List<ContainerTemplate> getContainers() {
855842
if (containers == null) {
856843
return Collections.emptyList();
857844
}

src/main/java/org/csanchez/jenkins/plugins/kubernetes/PodTemplateBuilder.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
import edu.umd.cs.findbugs.annotations.CheckForNull;
3535
import edu.umd.cs.findbugs.annotations.NonNull;
36-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
3736
import hudson.TcpSlaveAgentListener;
3837
import hudson.Util;
3938
import hudson.slaves.SlaveComputer;
@@ -107,7 +106,6 @@ public class PodTemplateBuilder {
107106
private static final String JENKINS_AGENT_FILE_ENVVAR = "JENKINS_AGENT_FILE";
108107
private static final String JENKINS_AGENT = "/jenkins-agent";
109108

110-
@SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "tests")
111109
@Restricted(NoExternalUse.class)
112110
static String DEFAULT_JNLP_DOCKER_REGISTRY_PREFIX =
113111
System.getProperty(PodTemplateStepExecution.class.getName() + ".dockerRegistryPrefix");

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pipeline/PodTemplateAction.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.csanchez.jenkins.plugins.kubernetes.pipeline;
22

33
import edu.umd.cs.findbugs.annotations.NonNull;
4-
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
54
import hudson.BulkChange;
65
import hudson.model.Run;
76
import java.io.IOException;
@@ -31,7 +30,6 @@ protected static void push(@NonNull Run<?, ?> run, @NonNull String item) throws
3130
}
3231

3332
@Deprecated
34-
@SuppressFBWarnings("DLS_DEAD_LOCAL_STORE")
3533
public void push(String template) throws IOException {
3634
if (run == null) {
3735
LOGGER.warning("run is null, cannot push");

src/main/java/org/csanchez/jenkins/plugins/kubernetes/pod/retention/Reaper.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,6 @@ public void onClose(WatcherException e) {
371371
* @param node a {@link Node#getNodeName}
372372
* @return a possibly empty set of {@link ContainerStateTerminated#getReason} or {@link PodStatus#getReason}
373373
*/
374-
@SuppressFBWarnings(
375-
value = "NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE",
376-
justification =
377-
"Confused by @org.checkerframework.checker.nullness.qual.Nullable on LoadingCache.get? Never null here.")
378374
@NonNull
379375
public Set<String> terminationReasons(@NonNull String node) {
380376
synchronized (terminationReasons) {

0 commit comments

Comments
 (0)