Update for java 17; Finish jenkins core update (#696)

jenkinsci · May 13, 2024 · a1cd5da · a1cd5da
1 parent d9cf7a7
commit a1cd5da
Show file tree

Hide file tree

Showing 29 changed files with 76 additions and 91 deletions.
diff --git a/.github/workflows/license.yml b/.github/workflows/license.yml
@@ -10,14 +10,14 @@ on:
 
 jobs:
   validate-sbom:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout Code
         uses: actions/checkout@v4
-      - name: Set up JDK 11
+      - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
-          java-version: 11
+          java-version: 17
           distribution: adopt
       - name: Generate json bom
         run: mvn clean cyclonedx:makeAggregateBom -f pom.xml

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        java: [11, 17]
+        java: [11, 17, 21]
         os: [ubuntu-latest, windows-latest]
     steps:
       - name: Checkout

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -10,7 +10,9 @@ buildPlugin(
     [platform: 'linux', jdk: 11],
     [platform: 'windows', jdk: 11],
     [platform: 'linux', jdk: 17],
-    [platform: 'windows', jdk: 17]
+    [platform: 'windows', jdk: 17],
+    [platform: 'linux', jdk: 21],
+    [platform: 'windows', jdk: 21]
   ],
   useArtifactCachingProxy: false // Use plugins.jenkins.io directly
 )
diff --git a/Jenkinsfile.internal b/Jenkinsfile.internal
@@ -86,7 +86,7 @@ pipeline {
 
 def mvn(def args) {
     def mvnHome = tool 'M3'
-    def javaHome = tool 'JDK11'
+    def javaHome = tool 'JDK17'
     withEnv(["JAVA_HOME=${javaHome}", "PATH+MAVEN=${mvnHome}/bin:${env.JAVA_HOME}/bin"]) {
         if (isUnix()) {
             sh "${mvnHome}/bin/mvn ${args} -B -V -U -e"

diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.51</version>
+        <version>4.82</version>
         <relativePath />
     </parent>
 
@@ -67,11 +67,12 @@
     <properties>
         <!-- Jenkins base -->
         <jenkins.version>2.414.3</jenkins.version>
-        <javaTargetJDK>11</javaTargetJDK>
+        <javaTargetJDK>17</javaTargetJDK>
+        <maven.compiler.release>17</maven.compiler.release>
 
         <!-- Jenkins plugins -->
         <job-dsl.version>1.87</job-dsl.version>
-        <warnings-ng.version>9.11.1</warnings-ng.version>
+        <warnings-ng.version>10.7.0</warnings-ng.version>
 
         <!-- Direct dependencies -->
         <jacob.version>1.20</jacob.version>
@@ -92,7 +93,9 @@
         <cyclonedx.version>2.7.9</cyclonedx.version>
 
         <!-- Test scope -->
-        <configuration-as-code.version>1.53</configuration-as-code.version>
+        <configuration-as-code.version>1775.v810dc950b_514</configuration-as-code.version>
+        <cloudbees-folder.version>6.858.v898218f3609d</cloudbees-folder.version>
+        <branch-api.version>2.1128.v717130d4f816</branch-api.version>
         <equalsverifier.version>3.16.1</equalsverifier.version>
         <mockito-core.version>4.1.0</mockito-core.version>
         <concurrency>2</concurrency>
@@ -104,26 +107,31 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.319.x</artifactId>
-                <version>1595.v8c71c13cc3a_9</version>
+                <artifactId>bom-2.414.x</artifactId>
+                <version>2982.vdce2153031a_0</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.main</groupId>
-                <artifactId>jenkins-test-harness</artifactId>
-                <version>1802.v9de0d87365d2</version>
-            </dependency>
             <dependency>
                 <groupId>io.jenkins.plugins</groupId>
                 <artifactId>echarts-api</artifactId>
-                <version>5.3.2-1</version>
+                <version>5.4.0-7</version>
             </dependency>
             <dependency>
                 <groupId>org.slf4j</groupId>
                 <artifactId>slf4j-api</artifactId>
                 <version>1.7.36</version>
             </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-xml</artifactId>
+                <version>2.17.0</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.commons</groupId>
+                <artifactId>commons-lang3</artifactId>
+                <version>3.14.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
     <dependencies>
@@ -218,32 +226,6 @@
             <groupId>io.jenkins.plugins</groupId>
             <artifactId>warnings-ng</artifactId>
             <version>${warnings-ng.version}</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-lang3</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.apache.commons</groupId>
-                    <artifactId>commons-text</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.errorprone</groupId>
-                    <artifactId>error_prone_annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-core</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.fasterxml.jackson.core</groupId>
-                    <artifactId>jackson-databind</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.github.spotbugs</groupId>
-                    <artifactId>spotbugs-annotations</artifactId>
-                </exclusion>
-            </exclusions>
             <optional>true</optional>
         </dependency>
 
@@ -510,6 +492,7 @@
             <plugin>
                 <groupId>org.cyclonedx</groupId>
                 <artifactId>cyclonedx-maven-plugin</artifactId>
+                <version>${cyclonedx.version}</version>
                 <configuration>
                     <projectType>library</projectType>
                     <schemaVersion>1.4</schemaVersion>

diff --git a/...main/java/de/tracetronic/jenkins/plugins/ecutest/extension/warnings/WarningsRecorder.java b/...main/java/de/tracetronic/jenkins/plugins/ecutest/extension/warnings/WarningsRecorder.java
@@ -16,8 +16,8 @@
 import hudson.model.TaskListener;
 import io.jenkins.plugins.analysis.core.model.ResultAction;
 import io.jenkins.plugins.analysis.core.steps.IssuesRecorder;
-import io.jenkins.plugins.analysis.core.util.RunResultHandler;
-import io.jenkins.plugins.analysis.core.util.StageResultHandler;
+import io.jenkins.plugins.util.RunResultHandler;
+import io.jenkins.plugins.util.StageResultHandler;
 import io.jenkins.plugins.analysis.warnings.WarningsPlugin;
 import org.apache.commons.lang.RandomStringUtils;
 

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/log/TTConsoleLoggerIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/log/TTConsoleLoggerIT.java
@@ -5,7 +5,7 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.log;
 
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.wrapper.com.ETComException;
 import hudson.Launcher;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/DownStreamPublisherIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/DownStreamPublisherIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.report;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import hudson.model.FreeStyleProject;
 import jenkins.tasks.SimpleBuildStep;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/atx/ATXPublisherIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/atx/ATXPublisherIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.report.atx;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.report.atx.installation.ATXConfig;
 import de.tracetronic.jenkins.plugins.ecutest.report.atx.installation.ATXInstallation;

diff --git a/...a/de/tracetronic/jenkins/plugins/ecutest/report/generator/ReportGeneratorPublisherIT.java b/...a/de/tracetronic/jenkins/plugins/ecutest/report/generator/ReportGeneratorPublisherIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.report.generator;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.tool.installation.ETInstallation;
 import hudson.EnvVars;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/junit/JUnitPublisherIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/junit/JUnitPublisherIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.report.junit;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.tool.installation.ETInstallation;
 import hudson.EnvVars;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/log/ETLogPublisherIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/log/ETLogPublisherIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.report.log;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import hudson.FilePath;
 import hudson.Launcher;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/ta/TraceAnalysisPublisherIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/ta/TraceAnalysisPublisherIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.report.ta;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.tool.installation.ETInstallation;
 import hudson.EnvVars;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/tms/TMSPublisherIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/tms/TMSPublisherIT.java
@@ -8,8 +8,8 @@
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
 import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.tool.installation.ETInstallation;
 import hudson.EnvVars;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/trf/TRFPublisherIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/report/trf/TRFPublisherIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.report.trf;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import hudson.Launcher;
 import hudson.model.AbstractBuild;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/ExportPackageBuilderIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/ExportPackageBuilderIT.java
@@ -8,8 +8,8 @@
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
 import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.ExportPackageAttributeConfig;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.ExportPackageConfig;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/ExportProjectBuilderIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/ExportProjectBuilderIT.java
@@ -8,8 +8,8 @@
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
 import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.ExportProjectAttributeConfig;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.ExportProjectConfig;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/ImportPackageBuilderIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/ImportPackageBuilderIT.java
@@ -8,8 +8,8 @@
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
 import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.ImportPackageAttributeConfig;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.ImportPackageConfig;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/ImportProjectBuilderIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/ImportProjectBuilderIT.java
@@ -8,8 +8,8 @@
 import com.cloudbees.plugins.credentials.CredentialsScope;
 import com.cloudbees.plugins.credentials.SystemCredentialsProvider;
 import com.cloudbees.plugins.credentials.impl.UsernamePasswordCredentialsImpl;
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.ImportProjectArchiveConfig;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.ImportProjectAttributeConfig;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/TestFolderBuilderIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/TestFolderBuilderIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.test;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.ExecutionConfig;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.PackageConfig;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/TestPackageBuilderIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/TestPackageBuilderIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.test;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.ExecutionConfig;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.GlobalConstant;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/TestProjectBuilderIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/test/TestProjectBuilderIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.test;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.ExecutionConfig;
 import de.tracetronic.jenkins.plugins.ecutest.test.config.ProjectConfig;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/tool/CacheBuilderIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/tool/CacheBuilderIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.tool;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.wrapper.com.Caches;
 import hudson.model.FreeStyleProject;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/tool/LicenseETBuilderIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/tool/LicenseETBuilderIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.tool;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.tool.installation.ETInstallation;
 import hudson.EnvVars;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/tool/StartETBuilderIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/tool/StartETBuilderIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.tool;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.tool.installation.ETInstallation;
 import hudson.EnvVars;

diff --git a/src/test/java/de/tracetronic/jenkins/plugins/ecutest/tool/StartTSBuilderIT.java b/src/test/java/de/tracetronic/jenkins/plugins/ecutest/tool/StartTSBuilderIT.java
@@ -5,8 +5,8 @@
  */
 package de.tracetronic.jenkins.plugins.ecutest.tool;
 
-import com.gargoylesoftware.htmlunit.WebAssert;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import org.htmlunit.WebAssert;
+import org.htmlunit.html.HtmlPage;
 import de.tracetronic.jenkins.plugins.ecutest.IntegrationTestBase;
 import de.tracetronic.jenkins.plugins.ecutest.tool.installation.ETInstallation;
 import hudson.EnvVars;