Merge pull request #13 from testingbot/modernization

Modernize plugin: Jenkins 2.541.3/Java 17 baseline, tunnel isolation, secret masking

Author: jochen-testingbot

.github/dependabot.yml

@@ -0,0 +1,10 @@
+version: 2
+updates:
+  - package-ecosystem: maven
+    directory: /
+    schedule:
+      interval: weekly
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: weekly

.github/workflows/cd.yaml

@@ -0,0 +1,16 @@
+name: cd
+on:
+  workflow_dispatch:
+  check_run:
+    types:
+      - completed
+
+permissions:
+  checks: read
+  contents: write
+
+jobs:
+  maven-cd:
+    uses: jenkins-infra/github-reusable-workflows/.github/workflows/maven-cd.yml@7704ec4236e99ca271bdef1adb675b65b8e283a9 # v1
+    secrets:
+      MAVEN_TOKEN: ${{ secrets.MAVEN_TOKEN }}

.github/workflows/ci.yaml

@@ -0,0 +1,28 @@
+name: ci
+on:
+  push:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        jdk: [17, 21]
+    runs-on: ubuntu-latest
+    name: build (JDK ${{ matrix.jdk }})
+    steps:
+      - uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
+        with:
+          persist-credentials: false
+      - name: Set up JDK ${{ matrix.jdk }}
+        uses: actions/setup-java@c1e323688fd81a25caa38c78aa6df2d33d3e20d9 # v4
+        with:
+          distribution: temurin
+          java-version: ${{ matrix.jdk }}
+          cache: maven
+      - name: Build and test
+        run: mvn -B -ntp verify

CHANGELOG

@@ -1,3 +1,16 @@
+Version 1.23
+2026-07-15
+
+- Raise baseline to Jenkins 2.541.3 / Java 17, modern parent POM and plugin BOM
+- Fix per-build tunnel isolation: parallel pipeline tunnels no longer corrupt or stop each other
+- Mask the TestingBot secret in build console logs
+- Fix crashes in the build summary listener on non-TestingBot / mixed test suites
+- Honor tunnel options and expose SELENIUM_HOST/PORT and TESTINGBOT_TUNNEL_IDENTIFIER env vars
+- Add permission checks and POST to credential form endpoints
+- Replace deprecated APIs (ACL.SYSTEM2, lookupCredentialsInItem, commons-cli, Guava)
+- Remove dead code (vestigial build step, unused tunnel config)
+- Add GitHub Actions CI/CD (JEP-229) and Dependabot
+
 Version 1.17
 2022-04-01
 

Jenkinsfile

@@ -0,0 +1,12 @@
+/*
+ See the documentation for more options:
+ https://github.com/jenkins-infra/pipeline-library/
+*/
+buildPlugin(
+  forkCount: '1C', // run this number of tests in parallel for faster feedback
+  useContainerAgent: true, // set to false if you need to use a full VM
+  configurations: [
+    [platform: 'linux', jdk: 21],
+    [platform: 'windows', jdk: 17],
+  ]
+)

README.md

@@ -69,6 +69,20 @@ This will start the tunnel before your job runs. Once the job finishes, the tunn
 
 `testingbotPublisher()` will try to read the JUnit report files and show the test results from TestingBot.
 
+### Environment variables
+
+Inside **both** `testingbot { }` and `testingbotTunnel { }` blocks:
+
+* `TESTINGBOT_KEY` / `TB_KEY` – your TestingBot API key
+* `TESTINGBOT_SECRET` / `TB_SECRET` – your TestingBot API secret (masked in the build log)
+
+Inside a `testingbotTunnel { }` block only (these describe the tunnel started for that block):
+
+* `SELENIUM_HOST` / `SELENIUM_PORT` – host and port to point your Selenium client at when using the tunnel
+* `TESTINGBOT_TUNNEL_IDENTIFIER` – the identifier of the tunnel started for this block. Pass it in your desired capabilities so parallel builds each use their own tunnel.
+
+Each `testingbotTunnel { }` block starts an isolated tunnel with its own identifier, so parallel pipeline branches no longer interfere with one another.
+
 An example:
 
 ```
@@ -115,10 +129,8 @@ To build the plugin, use:
 
 ## Releasing the Plugin
 
-To release the plugin, use:
-
-`mvn release:prepare release:perform`
+Releases are published automatically through the Jenkins [continuous delivery](https://www.jenkins.io/doc/developer/publishing/releasing-cd/) (JEP-229) flow: merging to the default branch triggers the `cd` GitHub Actions workflow, which builds and publishes an incremental release. There is no manual `mvn release:prepare` step.
 
 ## Reporting Issues
 
-Please [file a new issue](https://github.com/testingbot/TestingBot-Jenkins-Plugin/issues).
+Please [file a new issue](https://github.com/jenkinsci/testingbot-plugin/issues) on the GitHub repository.

pom.xml

@@ -4,20 +4,20 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.16</version>
+        <version>5.31</version>
     </parent>
     <properties>
-        <jenkins.version>2.338</jenkins.version>
-        <java.level>8</java.level>
+        <jenkins.version>2.541.3</jenkins.version>
+        <gitHubRepo>jenkinsci/testingbot-plugin</gitHubRepo>
         <hudsonTags>buildwrapper</hudsonTags>
-        <findbugs.skip>true</findbugs.skip>
     </properties>
     <scm>
-        <connection>scm:git:git://github.com/jenkinsci/testingbot-plugin.git</connection>
-        <developerConnection>scm:git:git@github.com:jenkinsci/testingbot-plugin.git</developerConnection>
-        <tag>testingbot-1.20-SNAPSHOT</tag>
+        <connection>scm:git:https://github.com/${gitHubRepo}.git</connection>
+        <developerConnection>scm:git:https://github.com/${gitHubRepo}.git</developerConnection>
+        <tag>HEAD</tag>
+        <url>https://github.com/${gitHubRepo}</url>
     </scm>
-    <url>https://github.com/jenkinsci/testingbot-plugin</url>
+    <url>https://github.com/${gitHubRepo}</url>
     <developers>
         <developer>
             <id>testingbot</id>
@@ -31,8 +31,14 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
+                    <!--
+                      The com.testingbot:TestingBotTunnel artifact is an uber-jar that bundles an
+                      old Jetty, which clashes with the Jenkins test harness' Jetty 12 on the flat
+                      test classpath. That breaks any JenkinsRule-based test, including the
+                      parent-injected one, so it is excluded here. See README (Known limitations).
+                    -->
                     <excludes>
-                        <exclude>InjectedTest.java</exclude>
+                        <exclude>**/InjectedTest.java</exclude>
                     </excludes>
                 </configuration>
             </plugin>
@@ -49,7 +55,7 @@
     <description>This plugin integrates videos/screenshots of your TestingBot.com Selenium tests</description>
     <groupId>testingbot</groupId>
     <artifactId>testingbot</artifactId>
-    <version>1.22-SNAPSHOT</version>
+    <version>1.23-SNAPSHOT</version>
     <packaging>hpi</packaging>
     <repositories>
         <repository>
@@ -67,8 +73,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.235.x</artifactId>
-                <version>25</version>
+                <artifactId>bom-2.541.x</artifactId>
+                <version>6687.v4253d9799d33</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -78,8 +84,23 @@
         <dependency>
             <groupId>com.testingbot</groupId>
             <artifactId>TestingBotTunnel</artifactId>
-            <version>RELEASE</version>
+            <version>4.8</version>
             <scope>compile</scope>
+            <!--
+              Use the self-contained "shaded" classifier and exclude all transitive dependencies.
+              The tunnel embeds its own server stack (Jetty 11, Jackson, Apache HTTP, commons-cli),
+              which conflicts with the versions Jenkins manages (e.g. Jetty 12, Jackson 2.22). Those
+              libraries are only used internally by the tunnel at runtime, where the plugin classloader
+              keeps them isolated from Jenkins core, so we consume the bundled jar rather than leak an
+              unreconcilable transitive tree into the plugin build.
+            -->
+            <classifier>shaded</classifier>
+            <exclusions>
+                <exclusion>
+                    <groupId>*</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.testingbot</groupId>
@@ -100,13 +121,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.jmockit</groupId>
-            <artifactId>jmockit</artifactId>
-            <version>1.24</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

src/main/java/testingbot/TestReporter.java

@@ -20,7 +20,7 @@
 import hudson.model.TaskListener;
 import hudson.tasks.junit.TestResultAction;
 import java.util.logging.Logger;
-import javax.annotation.Nonnull;
+import edu.umd.cs.findbugs.annotations.NonNull;
 import testingbot.TestingBotBuildWrapper.BuildWrapperItem;
 
 /**
@@ -42,7 +42,7 @@ public TestReporter() {
     }
 
     @Override
-    public TestResultAction.Data contributeTestData(Run<?, ?> run, @Nonnull FilePath workspace, Launcher launcher, TaskListener listener, TestResult testResult) throws IOException, InterruptedException {
+    public TestResultAction.Data contributeTestData(Run<?, ?> run, @NonNull FilePath workspace, Launcher launcher, TaskListener listener, TestResult testResult) throws IOException, InterruptedException {
         boolean foundSession = false;
         List<String> sessionIDs = null;
         TestingBotCredentials credentials = null;

src/main/java/testingbot/TestingBotBuildAction.java

@@ -1,13 +1,12 @@
 package testingbot;
 
-import hudson.model.Action;
+import hudson.model.InvisibleAction;
 
-public class TestingBotBuildAction implements Action {
+public class TestingBotBuildAction extends InvisibleAction {
 
     private TestingBotCredentials testingbotCredential;
 
     public TestingBotBuildAction(TestingBotCredentials testingbotCredentials) {
-        super();
         this.testingbotCredential = testingbotCredentials;
     }
 
@@ -18,22 +17,4 @@ public TestingBotCredentials getCredentials() {
     public void setCredentials(TestingBotCredentials testingbotCredential) {
         this.testingbotCredential = testingbotCredential;
     }
-
-    @Override
-    public String getIconFileName() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public String getDisplayName() {
-        // TODO Auto-generated method stub
-        return "tb";
-    }
-
-    @Override
-    public String getUrlName() {
-        // TODO Auto-generated method stub
-        return "tb";
-    }
 }

src/main/java/testingbot/TestingBotBuildSummary.java

@@ -15,16 +15,12 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 public class TestingBotBuildSummary extends InvisibleAction implements Serializable {
     private static final long serialVersionUID = 1L;
-    private final transient AbstractBuild<?,?> build;
-    public List<TestingBotBuildObject> sessionIds;
-    
+    private final List<TestingBotBuildObject> sessionIds;
+
     public TestingBotBuildSummary(AbstractBuild<?,?> build, List<TestingBotBuildObject> sessionIds) {
-        this.build = build;
         this.sessionIds = sessionIds;
     }
 
@@ -43,36 +39,54 @@ public static final class RunListenerImpl extends RunListener<AbstractBuild<?,?>
         @Override
         public void onCompleted(AbstractBuild<?, ?> r, TaskListener listener) {
             if (r == null) {
-                Logger.getLogger(TestingBotBuildSummary.class.getName()).log(Level.INFO, "r is null", "r is null");
                 return;
             }
-            if (r.getAction(AbstractTestResultAction.class) == null) {
-                Logger.getLogger(TestingBotBuildSummary.class.getName()).log(Level.INFO, "getaction is null", "getaction is null");
-            }
-            
+
+            // Only act on builds that are actually configured to use TestingBot.
             TestingBotBuildAction buildAction = r.getAction(TestingBotBuildAction.class);
             TestingBotCredentials credentials = null;
             if (buildAction != null) {
-              credentials = buildAction.getCredentials();
+                credentials = buildAction.getCredentials();
             } else {
-              TestingBotBuildWrapper.BuildWrapperItem<TestingBotBuildWrapper> wrapperItem =
-                  TestingBotBuildWrapper.findBuildWrapper(r.getParent());
-              credentials = TestingBotCredentials.getCredentials(wrapperItem.buildItem,
-                  wrapperItem.buildWrapper.getCredentialsId());
+                TestingBotBuildWrapper.BuildWrapperItem<TestingBotBuildWrapper> wrapperItem =
+                        TestingBotBuildWrapper.findBuildWrapper(r.getParent());
+                if (wrapperItem == null || wrapperItem.buildWrapper == null) {
+                    return;
+                }
+                credentials = TestingBotCredentials.getCredentials(wrapperItem.buildItem,
+                        wrapperItem.buildWrapper.getCredentialsId());
+            }
+            if (credentials == null) {
+                return;
+            }
+
+            AbstractTestResultAction<?> testResultAction = r.getAction(AbstractTestResultAction.class);
+            if (testResultAction == null) {
+                return;
+            }
+            Object result = testResultAction.getResult();
+            if (!(result instanceof TestResult)) {
+                return;
             }
-        
+            TestResult testResult = (TestResult) result;
+
             TestingbotREST apiClient = new TestingbotREST(credentials.getKey(), credentials.getDecryptedSecret());
-            TestResult testResult = (TestResult) r.getAction(AbstractTestResultAction.class).getResult();
             List<TestingBotBuildObject> ids = new ArrayList<>();
             for (SuiteResult sr : testResult.getSuites()) {
                 for (CaseResult cr : sr.getCases()) {
                     List<String> sessionIds = TestingBotReportFactory.findSessionIDs(cr);
-                    TestingbotTest test = apiClient.getTest(sessionIds.get(0));
-                    TestingBotBuildObject tbo = new TestingBotBuildObject(sessionIds.get(0), cr.getClassName(), cr.getName(), cr.isPassed(), apiClient.getAuthenticationHash(sessionIds.get(0)), test);
+                    if (sessionIds.isEmpty()) {
+                        continue;
+                    }
+                    String sessionId = sessionIds.get(0);
+                    TestingbotTest test = apiClient.getTest(sessionId);
+                    TestingBotBuildObject tbo = new TestingBotBuildObject(sessionId, cr.getClassName(), cr.getName(), cr.isPassed(), apiClient.getAuthenticationHash(sessionId), test);
                     ids.add(tbo);
                 }
             }
-            Logger.getLogger(TestingBotBuildSummary.class.getName()).log(Level.INFO, "try to get ids");
+            if (ids.isEmpty()) {
+                return;
+            }
             r.addAction(new TestingBotBuildSummary(r, ids));
             r.addAction(new TestingBotTestEmbed(ids));
         }