resolve conflicts

Author: mw-kapilg

CONFIGDOC.md

@@ -69,9 +69,9 @@ You can specify build options for your MATLAB build by first selecting **Build o
 
 MATLAB exits with exit code 0 if the specified tasks run without error. Otherwise, MATLAB terminates with a nonzero exit code, which causes the step to fail.
 
-Starting in R2024a, you can access the result of running a MATLAB build interactively in your Jenkins interface. After your build runs, the Jenkins build summary page displays the number of tasks that ran, failed, and were skipped. You can click the **MATLAB Build Results** link on the page to access the table of task results. The table provides information about each task that was part of the MATLAB build. Clicking a task name in the table displays relevant build log information on the **Console Output** page.
+Starting in R2024a, you can view the results of running a MATLAB build in your Jenkins interface. After your build runs, the Jenkins build summary page displays the number of tasks that ran, failed, and were skipped. You can click the **MATLAB Build Results** link on the page to access the table of task results. The table provides information about each task that was part of the MATLAB build. Click a task name in the table to go to the relevant build log information on the **Console Output** page.
 
-![matlab_build_results](https://github.com/mathworks/jenkins-matlab-plugin/assets/48831250/bf3a8f01-12d6-436e-8a9e-10f465a98f6a)
+![Table of MATLAB build results including three tasks. Each table row includes a clickable task name, its status, description, and duration.](https://github.com/user-attachments/assets/eaef15b8-05d3-49c4-ae85-4aca1e57e324)
 
 #### Run MATLAB Tests
 The **Run MATLAB Tests** build step lets you run MATLAB and Simulink tests and generate artifacts, such as test results in JUnit-style XML format and code coverage results in Cobertura XML format. By default, the plugin includes any test files in your [MATLAB project](https://www.mathworks.com/help/matlab/projects.html) that have a `Test` label. If your build does not use a MATLAB project, or if it uses a MATLAB release before R2019a, then the plugin includes all tests in the root of your repository and in any of its subfolders.
@@ -270,7 +270,7 @@ node {
 }
 ``` 
 
-Starting in R2024a, you can access the result of running a MATLAB build interactively in your Jenkins interface. After your build runs, the Jenkins build summary page displays the number of tasks that ran, failed, and were skipped. You can click the **MATLAB Build Results** link on the page to access the table of task results. The table provides information about each task that was part of the MATLAB build. Clicking a task name in the table displays relevant build log information on the **Console Output** page.
+Starting in R2024a, you can view the results of running a MATLAB build in your Jenkins interface. After your build runs, the Jenkins build summary page displays the number of tasks that ran, failed, and were skipped. You can click the **MATLAB Build Results** link on the page to access the table of task results. The table provides information about each task that was part of the MATLAB build. Click a task name in the table to go to the relevant build log information on the **Console Output** page.
 
 ### Use the `runMATLABTests` Step
 Use the `runMATLABTests` step in your pipeline to run MATLAB and Simulink tests and generate test and coverage artifacts. By default, the plugin includes any test files in your [MATLAB project](https://www.mathworks.com/help/matlab/projects.html) that have a `Test` label. If your pipeline does not use a MATLAB project, or if it uses a MATLAB release before R2019a, then the plugin includes all tests in the root of your repository and in any of its subfolders.

pom.xml

@@ -1,64 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.jenkins-ci.plugins</groupId>
 		<artifactId>plugin</artifactId>
+<<<<<<< HEAD
 		<version>4.47</version>
+=======
+		<version>4.75</version>
+>>>>>>> dev_main
 		<relativePath />
 	</parent>
+
 	<artifactId>matlab</artifactId>
-	<version>2.14.1-SNAPSHOT</version>
+	<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>
+<<<<<<< HEAD
 	<properties>
 		<jenkins.version>2.350</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>
+=======
+
+>>>>>>> dev_main
 	<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://git@github.com/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>
+	</properties>
+
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
 				<groupId>io.jenkins.tools.bom</groupId>
+<<<<<<< HEAD
 				<artifactId>bom-2.346.x</artifactId>
 				<version>1763.v092b_8980a_f5e</version>
 				<scope>import</scope>
+=======
+				<artifactId>bom-${jenkins.baseline}.x</artifactId>
+				<version>2543.vfb_1a_5fb_9496d</version>
+>>>>>>> dev_main
 				<type>pom</type>
+				<scope>import</scope>
 			</dependency>
 		</dependencies>
 	</dependencyManagement>
+
 	<dependencies>
 
 		<!-- JSON Parser -->
@@ -101,18 +134,26 @@
 			<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 to download the matlab run scripts and keep it under class 
-				resource folder -->
+			<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>
 				<groupId>com.googlecode.maven-download-plugin</groupId>
 				<artifactId>download-maven-plugin</artifactId>
@@ -125,7 +166,8 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v2/glnxa64/run-matlab-command</url>
+							<url>
+								https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v2/glnxa64/run-matlab-command</url>
 							<unpack>false</unpack>
 							<outputDirectory>${basedir}/src/main/resources/glnxa64</outputDirectory>
 							<skipCache>true</skipCache>
@@ -139,7 +181,8 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v2/maci64/run-matlab-command</url>
+							<url>
+								https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v2/maci64/run-matlab-command</url>
 							<unpack>false</unpack>
 							<outputDirectory>${basedir}/src/main/resources/maci64</outputDirectory>
 							<skipCache>true</skipCache>
@@ -153,7 +196,8 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v2/maca64/run-matlab-command</url>
+							<url>
+								https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v2/maca64/run-matlab-command</url>
 							<unpack>false</unpack>
 							<outputDirectory>${basedir}/src/main/resources/maca64</outputDirectory>
 							<skipCache>true</skipCache>
@@ -167,7 +211,8 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v2/win64/run-matlab-command.exe</url>
+							<url>
+								https://ssd.mathworks.com/supportfiles/ci/run-matlab-command/v2/win64/run-matlab-command.exe</url>
 							<unpack>false</unpack>
 							<outputDirectory>${basedir}/src/main/resources/win64</outputDirectory>
 							<skipCache>true</skipCache>
@@ -181,7 +226,8 @@
 							<goal>wget</goal>
 						</goals>
 						<configuration>
-							<url>https://ssd.mathworks.com/supportfiles/ci/matlab-script-generator/v0/matlab-script-generator.zip</url>
+							<url>
+								https://ssd.mathworks.com/supportfiles/ci/matlab-script-generator/v0/matlab-script-generator.zip</url>
 							<unpack>false</unpack>
 							<outputDirectory>${basedir}/src/main/resources</outputDirectory>
 							<skipCache>true</skipCache>
@@ -193,8 +239,8 @@
 		</plugins>
 		<pluginManagement>
 			<plugins>
-				<!--This plugin's configuration is used to store Eclipse m2e settings 
-					only. It has no influence on the Maven build itself. -->
+				<!-- This plugin's configuration is used to store Eclipse m2e settings only. It has
+				no influence on the Maven build itself. -->
 				<plugin>
 					<groupId>org.eclipse.m2e</groupId>
 					<artifactId>lifecycle-mapping</artifactId>
@@ -261,4 +307,4 @@
 			</plugins>
 		</pluginManagement>
 	</build>
-</project>
+</project>

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,22 +2,18 @@
 
 /**
  * Copyright 2024 The MathWorks, Inc.
- *
  */
 
 import com.google.common.annotations.VisibleForTesting;
-import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import hudson.Extension;
 import hudson.MarkupText;
 import hudson.console.ConsoleAnnotationDescriptor;
 import hudson.console.ConsoleAnnotator;
 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")
     public static boolean ENABLED = !Boolean.getBoolean(BuildTargetNote.class.getName() + ".disabled");
 
     public BuildTargetNote() {
@@ -26,10 +22,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;