Merge pull request #94 from strangelookingnerd/mirgate

Require Jenkins 2.479.1 or newer and Jakarta EE 9

Author: tomasbjerre

.mvn/wrapper/maven-wrapper.properties

@@ -14,5 +14,5 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.5/apache-maven-3.9.5-bin.zip
-wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip
+wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.2/maven-wrapper-3.3.2.jar

debug.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 mvn versions:update-properties
-mvnDebug hpi:run -Djava.util.logging.config.file=logging.properties -Djenkins.version=2.462.1 -Denforcer.skip=true
+mvnDebug hpi:run -Djava.util.logging.config.file=logging.properties -Djenkins.version=2.479.3 -Denforcer.skip=true

pom.xml

@@ -5,15 +5,14 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.87</version>
+        <version>5.9</version>
         <relativePath />
     </parent>
 
     <properties>
         <!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
-        <jenkins.baseline>2.462</jenkins.baseline>
-        <jenkins.version>${jenkins.baseline}.1</jenkins.version>
-        <maven.compiler.release>17</maven.compiler.release>
+        <jenkins.baseline>2.479</jenkins.baseline>
+        <jenkins.version>${jenkins.baseline}.3</jenkins.version>
         <maven.javadoc.skip>true</maven.javadoc.skip>
         <violations.version>2.2.0</violations.version>
         <changelog-lib>2.6.0</changelog-lib>
@@ -110,7 +109,7 @@
     <licenses>
         <license>
             <name>MIT License</name>
-            <url>http://opensource.org/licenses/MIT</url>
+            <url>https://opensource.org/licenses/MIT</url>
         </license>
     </licenses>
 
@@ -200,6 +199,18 @@
                     <groupId>commons-io</groupId>
                     <artifactId>commons-io</artifactId>
                 </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-tree</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-util</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>org.ow2.asm</groupId>
+                    <artifactId>asm-commons</artifactId>
+                </exclusion>
             </exclusions>
         </dependency>
         <dependency>
@@ -273,7 +284,7 @@
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
                 <artifactId>bom-${jenkins.baseline}.x</artifactId>
-                <version>3358.vea_fa_1f41504d</version>
+                <version>4440.v39a_9eb_b_c6b_4d</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>

run.sh

@@ -1,3 +1,3 @@
 #!/bin/sh
 ./mvnw versions:update-properties
-./mvnw hpi:run -Djava.util.logging.config.file=logging.properties -Djenkins.version=2.462.1 -Denforcer.skip=true
+./mvnw hpi:run -Djava.util.logging.config.file=logging.properties -Djenkins.version=2.479.3 -Denforcer.skip=true

src/main/java/org/jenkinsci/plugins/gitchangelog/GitChangelogDescriptor.java

@@ -12,7 +12,7 @@
 import org.jenkinsci.plugins.gitchangelog.config.CredentialsHelper;
 import org.jenkinsci.plugins.gitchangelog.config.CustomIssue;
 import org.jenkinsci.plugins.gitchangelog.config.GitChangelogConfig;
-import org.kohsuke.stapler.StaplerRequest;
+import org.kohsuke.stapler.StaplerRequest2;
 
 public final class GitChangelogDescriptor extends BuildStepDescriptor<Publisher> {
   private GitChangelogConfig config;
@@ -75,7 +75,7 @@ public boolean isApplicable(
   }
 
   @Override
-  public Publisher newInstance(final StaplerRequest req, final JSONObject formData)
+  public Publisher newInstance(final StaplerRequest2 req, final JSONObject formData)
       throws hudson.model.Descriptor.FormException {
     final GitChangelogConfig c = new GitChangelogConfig();
     c.setUseConfigFile(formData.getBoolean("useConfigFile"));

src/main/java/org/jenkinsci/plugins/gitchangelog/config/CustomIssue.java

@@ -1,9 +1,11 @@
 package org.jenkinsci.plugins.gitchangelog.config;
 
+import java.io.Serial;
 import java.io.Serializable;
 import org.kohsuke.stapler.DataBoundConstructor;
 
 public class CustomIssue implements Serializable {
+  @Serial
   private static final long serialVersionUID = -6202256680695752956L;
   private String link;
   private String name;

src/main/java/org/jenkinsci/plugins/gitchangelog/config/GitChangelogConfig.java

@@ -1,5 +1,6 @@
 package org.jenkinsci.plugins.gitchangelog.config;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -8,6 +9,7 @@
 
 public class GitChangelogConfig implements Serializable {
 
+  @Serial
   private static final long serialVersionUID = -6715117454282183133L;
   private String configFile;
   private String createFileTemplateContent;

src/main/java/org/jenkinsci/plugins/gitchangelog/perform/RemoteCallable.java

@@ -11,14 +11,15 @@
 import static org.jenkinsci.plugins.gitchangelog.config.GitChangelogConfigHelper.FROMTYPE.ref;
 import static se.bjurr.gitchangelog.api.GitChangelogApi.gitChangelogApiBuilder;
 
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;
+import java.io.Serial;
 import java.io.Serializable;
 import java.io.StringWriter;
 import java.net.URISyntaxException;
 import jenkins.security.MasterToSlaveCallable;
+import org.apache.commons.io.FileUtils;
 import org.jenkinsci.plugins.gitchangelog.config.CustomIssue;
 import org.jenkinsci.plugins.gitchangelog.config.GitChangelogConfig;
 import org.jenkinsci.plugins.gitchangelog.config.GitChangelogConfigHelper.FROMTYPE;
@@ -28,6 +29,7 @@
 public class RemoteCallable extends MasterToSlaveCallable<RemoteResult, IOException>
     implements Serializable {
 
+  @Serial
   private static final long serialVersionUID = -2489061314794088231L;
   private final GitChangelogConfig config;
   private String path = "";
@@ -41,7 +43,6 @@ public RemoteCallable(final String workspacePath, final GitChangelogConfig confi
   }
 
   @Override
-  @SuppressFBWarnings("RV_RETURN_VALUE_IGNORED_BAD_PRACTICE")
   public RemoteResult call() throws IOException {
     final RemoteResult remoteResult = new RemoteResult();
     final StringBuilder logString = new StringBuilder();
@@ -179,14 +180,14 @@ public RemoteResult call() throws IOException {
         logString.append("Creating changelog ").append(this.config.toFile());
 
         final File toFile = new File(this.workspacePath + "/" + this.config.toFile());
-        new File(toFile.getParent()).mkdirs();
+        FileUtils.forceMkdir(new File(toFile.getParent()));
         write(gitChangelogApiBuilder.render(), toFile, UTF_8);
       }
     } catch (final Throwable e) {
       StringWriter sw = new StringWriter();
       PrintWriter pw = new PrintWriter(sw);
       e.printStackTrace(pw);
-      logString.append(sw.toString());
+      logString.append(sw);
     }
     remoteResult.setLog(logString.toString());
     return remoteResult;

src/main/java/org/jenkinsci/plugins/gitchangelog/perform/RemoteResult.java

@@ -1,9 +1,11 @@
 package org.jenkinsci.plugins.gitchangelog.perform;
 
+import java.io.Serial;
 import java.io.Serializable;
 
 public class RemoteResult implements Serializable {
 
+  @Serial
   private static final long serialVersionUID = 8363216067945804103L;
   private String leftSideTitle;
   private String leftSideUrl;

src/main/java/org/jenkinsci/plugins/gitchangelog/steps/GetHighestSemanticVersionStep.java

@@ -10,6 +10,7 @@
 import hudson.Extension;
 import hudson.FilePath;
 import java.io.IOException;
+import java.io.Serial;
 import java.io.Serializable;
 import java.text.ParseException;
 import jenkins.security.MasterToSlaveCallable;
@@ -25,6 +26,7 @@
 
 public class GetHighestSemanticVersionStep extends Step implements Serializable {
 
+  @Serial
   private static final long serialVersionUID = 795555442767777209L;
   private String repo;
 
@@ -81,26 +83,28 @@ public DescriptorImpl() {
 
   @Override
   public StepExecution start(final StepContext context) {
-    return new SynchronousNonBlockingStepExecution<Object>(context) {
+    return new SynchronousNonBlockingStepExecution<>(context) {
 
-      private static final long serialVersionUID = 1L;
+        @Serial
+        private static final long serialVersionUID = 1L;
 
-      @Override
-      protected Object run() throws Exception {
-        final FilePath workspace = context.get(FilePath.class);
+        @Override
+        protected Object run() throws Exception {
+            final FilePath workspace = context.get(FilePath.class);
 
-        final MasterToSlaveCallable<Object, Exception> callable =
-            new MasterToSlaveCallable<Object, Exception>() {
-              private static final long serialVersionUID = 1L;
+            final MasterToSlaveCallable<Object, Exception> callable =
+                    new MasterToSlaveCallable<>() {
+                        @Serial
+                        private static final long serialVersionUID = 1L;
 
-              @Override
-              public Object call() throws Exception {
-                return GetHighestSemanticVersionStep.this.perform(workspace);
-              }
-            };
+                        @Override
+                        public Object call() throws Exception {
+                            return GetHighestSemanticVersionStep.this.perform(workspace);
+                        }
+                    };
 
-        return workspace.act(callable);
-      }
+            return workspace.act(callable);
+        }
     };
   }