Refresh plugin for June 2022

jenkinsci · Jun 22, 2023 · 6b2e835 · 6b2e835
1 parent aaeba81
commit 6b2e835
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 31 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.51</version>
+        <version>4.67</version>
         <relativePath />
     </parent>
 
@@ -56,10 +56,10 @@
 
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
-        <ivy.plugin.version>2.2</ivy.plugin.version>
-        <jenkins.version>2.332.1</jenkins.version>
+        <jenkins.version>2.361.4</jenkins.version>
+        <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
         <!-- Remove once JENKINS-45055 is fixed -->
-        <spotbugs.failOnError>false</spotbugs.failOnError>
+        <spotbugs.threshold>High</spotbugs.threshold>
         <!--
           Incompatible changes:
             1.93 - Fix of JENKINS-31573 changed the property file parsing approach.
@@ -71,21 +71,46 @@
     </properties>
 
     <scm>
-        <connection>scm:git:https://github.com/jenkinsci/envinject-plugin.git</connection>
-        <developerConnection>scm:git:[email protected]:jenkinsci/envinject-plugin.git</developerConnection>
-        <url>https://github.com/jenkinsci/envinject-plugin</url>
+        <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
+        <developerConnection>scm:git:[email protected]:${gitHubRepo}.git</developerConnection>
+        <url>https://github.com/${gitHubRepo}</url>
         <tag>${scmTag}</tag>
     </scm>
 
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.332.x</artifactId>
-                <version>1382.v7d694476f340</version>
+                <artifactId>bom-2.361.x</artifactId>
+                <version>1580.v47b_429a_c853a</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
+            <!--
+                TODO script-security 1172.v35f6a_0b_8207e breaks
+                EnvInjectEvaluatedGroovyScriptTest#testWorkaroundSecurity86, so downgrade it to the
+                last working version along with anything that depends on the newer broken version
+            -->
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>junit</artifactId>
+                <version>1.63</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>matrix-project</artifactId>
+                <version>771.v574584b_39e60</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins</groupId>
+                <artifactId>script-security</artifactId>
+                <version>1158.v7c1b_73a_69a_08</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jenkins-ci.plugins.workflow</groupId>
+                <artifactId>workflow-support</artifactId>
+                <version>820.vd1a_6cc65ef33</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -99,7 +124,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>ivy</artifactId>
-            <version>${ivy.plugin.version}</version>
+            <version>2.2</version>
             <optional>true</optional>
         </dependency>
 
@@ -108,17 +133,6 @@
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>ant</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <!--Upper bounds conflict-->
-                    <groupId>org.jenkins-ci</groupId>
-                    <artifactId>annotation-indexer</artifactId>
-                </exclusion>
-                <exclusion> <!-- TODO pending update to structs -->
-                    <groupId>org.jenkins-ci</groupId>
-                    <artifactId>symbol-annotation</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
 
         <dependency>
@@ -130,7 +144,6 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>matrix-project</artifactId>
-            <type>jar</type>
         </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
@@ -139,7 +152,6 @@
         <dependency>
             <groupId>org.hamcrest</groupId>
             <artifactId>hamcrest</artifactId>
-            <version>2.2</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -151,12 +163,6 @@
             <groupId>io.jenkins</groupId>
             <artifactId>configuration-as-code</artifactId>
             <scope>test</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-lang3</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
     </dependencies>
 

diff --git a/src/main/java/hudson/plugins/envfile/EnvFileBuildWrapper.java b/src/main/java/hudson/plugins/envfile/EnvFileBuildWrapper.java
@@ -1,5 +1,6 @@
 package hudson.plugins.envfile;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.Launcher;
 import hudson.model.AbstractBuild;
@@ -37,6 +38,7 @@ public Environment setUp(AbstractBuild build, Launcher launcher, BuildListener l
     @Extension
     public static final class DescriptorImpl extends BuildWrapperDescriptor {
         @Override
+        @SuppressFBWarnings(value = "NP_NONNULL_RETURN_VIOLATION", justification = "TODO needs triage")
         public String getDisplayName() {
             return null;
         }

diff --git a/src/main/java/hudson/plugins/setenv/SetEnvBuildWrapper.java b/src/main/java/hudson/plugins/setenv/SetEnvBuildWrapper.java
@@ -1,5 +1,6 @@
 package hudson.plugins.setenv;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.Launcher;
 import hudson.model.AbstractBuild;
@@ -46,6 +47,7 @@ public Environment setUp(AbstractBuild build, Launcher launcher, BuildListener l
     @Extension
     public static final class DescriptorImpl extends BuildWrapperDescriptor {
         @Override
+        @SuppressFBWarnings(value = "NP_NONNULL_RETURN_VIOLATION", justification = "TODO needs triage")
         public String getDisplayName() {
             return null;
         }

diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectGlobalPasswordWrapper.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectGlobalPasswordWrapper.java
@@ -1,5 +1,6 @@
 package org.jenkinsci.plugins.envinject;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.Launcher;
 import hudson.model.AbstractBuild;
@@ -37,6 +38,7 @@ public boolean isApplicable(AbstractProject<?, ?> item) {
         }
 
         @Override
+        @SuppressFBWarnings(value = "NP_NONNULL_RETURN_VIOLATION", justification = "TODO needs triage")
         public String getDisplayName() {
             return null;
         }

diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectPasswordWrapper.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectPasswordWrapper.java
@@ -2,6 +2,7 @@
 
 import com.google.common.base.Function;
 import com.google.common.collect.Lists;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.Launcher;
 import hudson.console.LineTransformationOutputStream;
@@ -233,6 +234,7 @@ static class EnvInjectPasswordsOutputStream extends LineTransformationOutputStre
         }
 
         @Override
+        @SuppressFBWarnings(value = "DM_DEFAULT_ENCODING", justification = "TODO needs triage")
         protected void eol(byte[] bytes, int len) throws IOException {
             String line = new String(bytes, 0, len);
             if (passwordsAsPattern != null) {

diff --git a/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectVarList.java b/src/main/java/org/jenkinsci/plugins/envinject/EnvInjectVarList.java
@@ -1,5 +1,6 @@
 package org.jenkinsci.plugins.envinject;
 
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.model.Api;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
@@ -102,6 +103,7 @@ private void doExportHeaders(@NonNull StaplerRequest request, @NonNull StaplerRe
     }
 
 
+    @SuppressFBWarnings(value = "DM_DEFAULT_ENCODING", justification = "TODO needs triage")
     private void writeTextResponse(@NonNull StaplerResponse response) throws IOException {
         response.setContentType("plain/text");
         StringWriter stringWriter = new StringWriter();
@@ -111,6 +113,7 @@ private void writeTextResponse(@NonNull StaplerResponse response) throws IOExcep
         response.getOutputStream().write(stringWriter.toString().getBytes());
     }
 
+    @SuppressFBWarnings(value = "DM_DEFAULT_ENCODING", justification = "TODO needs triage")
     private void writeXmlResponse(@NonNull StaplerResponse response) throws IOException {
         response.setContentType("application/xml");
         ServletOutputStream outputStream = response.getOutputStream();
@@ -121,6 +124,7 @@ private void writeXmlResponse(@NonNull StaplerResponse response) throws IOExcept
         outputStream.write("</envVars>".getBytes());
     }
 
+    @SuppressFBWarnings(value = "DM_DEFAULT_ENCODING", justification = "TODO needs triage")
     private void writeJsonResponse(@NonNull StaplerResponse response) throws IOException {
         response.setContentType("application/json");
         ServletOutputStream outputStream = response.getOutputStream();

diff --git a/src/test/java/org/jenkinsci/plugins/envinject/EnvInjectEvaluatedGroovyScriptTest.java b/src/test/java/org/jenkinsci/plugins/envinject/EnvInjectEvaluatedGroovyScriptTest.java
@@ -1,7 +1,7 @@
 package org.jenkinsci.plugins.envinject;
 
-import com.gargoylesoftware.htmlunit.HttpMethod;
-import com.gargoylesoftware.htmlunit.WebRequest;
+import org.htmlunit.HttpMethod;
+import org.htmlunit.WebRequest;
 import hudson.EnvVars;
 import hudson.model.*;