2.15.1 snapshot qualification

azure-pipelines.yml

@@ -19,6 +19,12 @@ trigger:
   - master
 
 steps:
+  - task: JavaToolInstaller@0
+    inputs:
+      versionSpec: '11'
+      jdkArchitectureOption: 'x64'
+      jdkSourceOption: 'PreInstalled'
+
   - task: Maven@4
     inputs:
       mavenPomFile: 'pom.xml'

pom.xml

@@ -4,61 +4,74 @@
 	<parent>
 		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
-		<version>3.57</version>
+		<version>4.75</version>
 		<relativePath />
 	</parent>
+
 	<artifactId>matlab</artifactId>
 	<version>2.15.1-SNAPSHOT</version>
 	<packaging>hpi</packaging>
+
+	<name>MATLAB Plugin</name>
+	<url>https://github.com/jenkinsci/matlab-plugin</url>
+	<description>Jenkins plugin for MATLAB</description>
+
 	<developers>
 		<developer>
 			<id>mathworks_ci_team</id>
 			<name>MathWorks</name>
-			<email>nbhoski@mathworks.com</email>
+			<email>continuous-integration@mathworks.com</email>
 		</developer>
 	</developers>
-	<properties>
-		<jenkins.version>2.164.3</jenkins.version>
-		<java.level>8</java.level>
-	</properties>
-	<name>MATLAB Plugin</name>
-	<description>Jenkins plugin for MATLAB</description>
-	<url>https://github.com/jenkinsci/matlab-plugin</url>
+
 	<licenses>
 		<license>
 			<name>MIT License</name>
 			<url>https://opensource.org/licenses/MIT</url>
 		</license>
 	</licenses>
+
 	<repositories>
 		<repository>
 			<id>repo.jenkins-ci.org</id>
 			<url>https://repo.jenkins-ci.org/public/</url>
 		</repository>
 	</repositories>
+
 	<pluginRepositories>
 		<pluginRepository>
 			<id>repo.jenkins-ci.org</id>
 			<url>https://repo.jenkins-ci.org/public/</url>
 		</pluginRepository>
 	</pluginRepositories>
+
 	<scm>
 		<connection>scm:git:ssh://github.com/jenkinsci/matlab-plugin.git</connection>
 		<developerConnection>scm:git:ssh://[email protected]/jenkinsci/matlab-plugin.git</developerConnection>
-		<url>http://github.com/jenkinsci/matlab-plugin</url>
+		<url>https://github.com/jenkinsci/matlab-plugin</url>
 		<tag>HEAD</tag>
 	</scm>
+
+	<properties>
+		<!-- https://www.jenkins.io/doc/developer/plugin-development/choosing-jenkins-baseline/ -->
+		<jenkins.baseline>2.387</jenkins.baseline>
+		<jenkins.version>${jenkins.baseline}.3</jenkins.version>
+		<!-- TODO fix violations -->
+		<spotbugs.threshold>High</spotbugs.threshold>
+	</properties>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>io.jenkins.tools.bom</groupId>
-				<artifactId>bom-2.164.x</artifactId>
-				<version>4</version>
-				<scope>import</scope>
+				<artifactId>bom-${jenkins.baseline}.x</artifactId>
+				<version>2543.vfb_1a_5fb_9496d</version>
 				<type>pom</type>
+				<scope>import</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+
 	<dependencies>
 		<!-- JSON Parser -->
 		<dependency>
@@ -100,16 +113,25 @@
 			<artifactId>workflow-job</artifactId>
 			<scope>test</scope>
 		</dependency>
-        <!-- Mockito -->
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>3.1.0</version>
-            <scope>test</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>3.1.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.eclipse.jetty</groupId>
+			<artifactId>jetty-util</artifactId>
+			<version>11.0.24</version>
+			<scope>test</scope>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>
+			<plugin>
+				<groupId>org.jenkins-ci.tools</groupId>
+				<artifactId>maven-hpi-plugin</artifactId>
+			</plugin>
 			<!-- Plugin to download the matlab run scripts and keep it under class 
 				resource folder -->
 			<plugin>

src/main/java/com/mathworks/ci/BuildArtifactAction.java

@@ -2,7 +2,6 @@
 
 /**
  * Copyright 2024 The MathWorks, Inc.
- *
  */
 
 import hudson.FilePath;
@@ -36,16 +35,16 @@ public BuildArtifactAction(Run<?, ?> build, String actionID) {
         this.actionID = actionID;
 
         // Setting the counts of task when Action is created.
-        try{
+        try {
             setCounts();
         } catch (ParseException e) {
             throw new RuntimeException(e);
-        } catch (InterruptedException e){
+        } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
     }
 
-    public String getActionID(){
+    public String getActionID() {
         return (this.actionID == null) ? "" : this.actionID;
     }
 
@@ -64,13 +63,13 @@ public String getDisplayName() {
     @CheckForNull
     @Override
     public String getUrlName() {
-        return (this.actionID == null) ? "buildresults" : "buildresults" + this.actionID ;
+        return (this.actionID == null) ? "buildresults" : "buildresults" + this.actionID;
     }
 
     public List<BuildArtifactData> getBuildArtifact() throws ParseException, InterruptedException, IOException {
         List<BuildArtifactData> artifactData = new ArrayList<BuildArtifactData>();
         FilePath fl;
-        if(this.actionID == null){
+        if (this.actionID == null) {
             fl = new FilePath(new File(build.getRootDir().getAbsolutePath() + "/" +
                     MatlabBuilderConstants.BUILD_ARTIFACT + ".json"));
         } else {
@@ -147,7 +146,7 @@ public void setOwner(Run owner) {
     private void setCounts() throws InterruptedException, ParseException {
         List<BuildArtifactData> artifactData = new ArrayList<BuildArtifactData>();
         FilePath fl;
-        if(this.actionID == null){
+        if (this.actionID == null) {
             fl = new FilePath(new File(build.getRootDir().getAbsolutePath() + "/" +
                     MatlabBuilderConstants.BUILD_ARTIFACT + ".json"));
         } else {
@@ -206,11 +205,11 @@ private void setCounts() throws InterruptedException, ParseException {
     private void iterateAllTaskAttributes(Entry pair, BuildArtifactData data) {
         // Iterates across all task attributes and updates
         String key = pair.getKey().toString();
-        switch(key){
+        switch (key) {
             case "duration":
                 data.setTaskDuration(pair.getValue().toString());
                 break;
-            case "name" :
+            case "name":
                 data.setTaskName(pair.getValue().toString());
                 break;
             case "description":
@@ -225,7 +224,7 @@ private void iterateAllTaskAttributes(Entry pair, BuildArtifactData data) {
             case "skipReason":
                 String skipReasonKey = pair.getValue().toString();
                 String skipReason;
-                switch(skipReasonKey){
+                switch (skipReasonKey) {
                     case "UpToDate":
                         skipReason = "up-to-date";
                         break;
@@ -242,7 +241,7 @@ private void iterateAllTaskAttributes(Entry pair, BuildArtifactData data) {
                 }
                 data.setSkipReason(skipReason);
                 break;
-            default :
+            default:
                 break;
         }
     }

src/main/java/com/mathworks/ci/BuildArtifactData.java

@@ -2,7 +2,6 @@
 
 /**
  * Copyright 2024 The MathWorks, Inc.
- *
  */
 
 public class BuildArtifactData {

src/main/java/com/mathworks/ci/BuildConsoleAnnotator.java

@@ -2,7 +2,6 @@
 
 /**
  * Copyright 2024 The MathWorks, Inc.
- *
  */
 
 import com.google.common.base.Charsets;
@@ -39,7 +38,7 @@ private static byte[][] createBuildNotes() {
             ByteArrayOutputStream targetNote = new ByteArrayOutputStream();
             new BuildTargetNote().encodeTo(targetNote);
             ByteArrayOutputStream outcomeNote = new ByteArrayOutputStream();
-            return new byte[][]{targetNote.toByteArray(), outcomeNote.toByteArray()};
+            return new byte[][] { targetNote.toByteArray(), outcomeNote.toByteArray() };
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
@@ -71,7 +70,7 @@ private static class ConsoleLogFilterImpl extends ConsoleLogFilter implements Se
         private static final long serialVersionUID = 1;
         private byte[][] buildNotes = createBuildNotes();
 
-        //Taking care of old MATLAB build actions.
+        // Taking care of old MATLAB build actions.
         private Object readResolve() {
             if (buildNotes == null) {
                 buildNotes = createBuildNotes();

src/main/java/com/mathworks/ci/BuildTargetNote.java

@@ -2,7 +2,6 @@
 
 /**
  * Copyright 2024 The MathWorks, Inc.
- *
  */
 
 import com.google.common.annotations.VisibleForTesting;
@@ -14,7 +13,6 @@
 import hudson.console.ConsoleNote;
 import java.util.regex.Pattern;
 
-
 public class BuildTargetNote extends ConsoleNote {
     @VisibleForTesting
     @SuppressFBWarnings(value = "MS_SHOULD_BE_FINAL", justification = "Visible for testing")
@@ -26,10 +24,10 @@ public BuildTargetNote() {
     @Override
     public ConsoleAnnotator annotate(Object context, MarkupText text, int charPos) {
         MarkupText.SubText t = text.findToken(Pattern.compile("MATLAB-Build-"));
-        String taskName = text.subText(13, text.length()-2).getText();
-        taskName = taskName.replace("]","").trim();
+        String taskName = text.subText(13, text.length() - 2).getText();
+        taskName = taskName.replace("]", "").trim();
         if (t != null)
-            t.addMarkup(0, t.length()-1, "<a id= matlab" + taskName + " name=matlab" + taskName + ">", "</a>");
+            t.addMarkup(0, t.length() - 1, "<a id= matlab" + taskName + " name=matlab" + taskName + ">", "</a>");
         return null;
     }
 

src/main/java/com/mathworks/ci/FormValidationUtil.java

@@ -1,10 +1,9 @@
 package com.mathworks.ci;
 
 /**
- * Copyright 2019-2020 The MathWorks, Inc.
+ * Copyright 2019-2024 The MathWorks, Inc.
  * 
  * This is Utility class which provides commonly used methods for form validations across builders
- * 
  */
 
 import java.util.List;

src/main/java/com/mathworks/ci/ListenerLogDecorator.java

@@ -1,8 +1,8 @@
 package com.mathworks.ci;
 
-/*
-* Copyright 2018 The MathWorks, Inc.
-*/
+/**
+ * Copyright 2018-2024 The MathWorks, Inc.
+ */
 
 import java.io.IOException;
 import java.io.OutputStream;

src/main/java/com/mathworks/ci/MatlabBuildWrapperContent.java

@@ -1,10 +1,9 @@
 package com.mathworks.ci;
 
 /**
- * Copyright 2020 The MathWorks, Inc.
+ * Copyright 2020-2024 The MathWorks, Inc.
  *
  * Class to parse Stapler request for Use MATLAB Version build wrapper.
- *
  */
 
 import org.kohsuke.stapler.DataBoundConstructor;
@@ -15,7 +14,7 @@ public class MatlabBuildWrapperContent {
     private final String matlabRootFolder;
 
     @DataBoundConstructor
-    public MatlabBuildWrapperContent(String matlabInstallationName, String matlabRootFolder){
+    public MatlabBuildWrapperContent(String matlabInstallationName, String matlabRootFolder) {
         this.matlabInstallationName = matlabInstallationName;
         this.matlabRootFolder = matlabRootFolder;
     }

src/main/java/com/mathworks/ci/MatlabBuilderConstants.java

@@ -1,7 +1,7 @@
 package com.mathworks.ci;
 
 /*
- * Copyright 2019-2020 The MathWorks, Inc.
+ * Copyright 2019-2024 The MathWorks, Inc.
  */
 
 public class MatlabBuilderConstants {
@@ -11,43 +11,44 @@ public class MatlabBuilderConstants {
     public static final double BASE_MATLAB_VERSION_COBERTURA_SUPPORT = 9.3;
     public static final double BASE_MATLAB_VERSION_MODELCOVERAGE_SUPPORT = 9.5;
     public static final double BASE_MATLAB_VERSION_EXPORTSTMRESULTS_SUPPORT = 9.6;
-    
+
     public static final String MATLAB_RUNNER_TARGET_FILE = "Builder.matlab.runner.target.file.name";
     public static final String MATLAB_TESTS_RUNNER_TARGET_FILE = "runMatlabTests.m";
     public static final String MATLAB_RUNNER_RESOURCE = "com/mathworks/ci/MatlabBuilder/runMatlabTests.m";
     public static final String AUTOMATIC_OPTION = "RunTestsAutomaticallyOption";
-
-    // Input parameter names (Passed to runMatlabTests.m as name-value pair arguments)
+
+    // Input parameter names (Passed to runMatlabTests.m as name-value pair
+    // arguments)
     public static final String PDF_REPORT = "'PDFReport'";
     public static final String TAP_RESULTS = "'TAPResults'";
     public static final String JUNIT_RESULTS = "'JUnitResults'";
     public static final String STM_RESULTS = "'SimulinkTestResults'";
     public static final String COBERTURA_CODE_COVERAGE = "'CoberturaCodeCoverage'";
     public static final String COBERTURA_MODEL_COVERAGE = "'CoberturaModelCoverage'";
-    
-    //Matlab Script generator package 
+
+    // Matlab Script generator package
     public static final String MATLAB_SCRIPT_GENERATOR = "matlab-script-generator.zip";
-    
-    //Test runner file prefix 
+
+    // Test runner file prefix
     public static final String MATLAB_TEST_RUNNER_FILE_PREFIX = "runner_";
-    
-    //Temporary MATLAB folder name in workspace 
+
+    // Temporary MATLAB folder name in workspace
     public static final String TEMP_MATLAB_FOLDER_NAME = ".matlab";
 
     // MATLAB default function/plugin paths
     public static final String DEFAULT_PLUGIN = "+ciplugins/+jenkins/getDefaultPlugins.m";
     public static final String BUILD_REPORT_PLUGIN = "+ciplugins/+jenkins/BuildReportPlugin.m";
     public static final String TASK_RUN_PROGRESS_PLUGIN = "+ciplugins/+jenkins/TaskRunProgressPlugin.m";
     public static final String BUILD_ARTIFACT = "buildArtifact";
-    
+
     public static final String NEW_LINE = System.getProperty("line.separator");
 
-    //MATLAB Runner Script
+    // MATLAB Runner Script
     public static final String TEST_RUNNER_SCRIPT = String.join(NEW_LINE,
-        "addpath('${TEMP_FOLDER}');",
-    	"testScript = genscript(${PARAMS});",
-        "disp('Running MATLAB script with content:');",
-        "disp(testScript.Contents);",
-    	"fprintf('___________________________________\\n\\n');",
-        "run(testScript);");
+            "addpath('${TEMP_FOLDER}');",
+            "testScript = genscript(${PARAMS});",
+            "disp('Running MATLAB script with content:');",
+            "disp(testScript.Contents);",
+            "fprintf('___________________________________\\n\\n');",
+            "run(testScript);");
 }