update to Jenkins LTS Version 2.289.2 - to release JENKINS-64639

.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/release-drafter.yml

@@ -0,0 +1,3 @@
+# https://github.com/jenkinsci/.github/blob/master/.github/release-drafter.adoc
+_extends: .github
+tag-template: join-$NEXT_MINOR_VERSION

.github/workflows/release-drafter.yml

@@ -0,0 +1,12 @@
+name: Release Drafter
+on:
+  push:
+    branches:
+      - master
+jobs:
+  update_release_draft:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5.14.0
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -1,2 +1,6 @@
 /target/
-/work/
+/work/
+
+# IDEA
+.idea
+*.iml

Jenkinsfile

@@ -0,0 +1 @@
+buildPlugin()

pom.xml

@@ -3,7 +3,8 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>1.600</version>
+    <version>4.16</version>
+    <relativePath />
   </parent>
 
   <artifactId>join</artifactId>
@@ -35,37 +36,59 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>matrix-project</artifactId>
-      <version>1.6</version>
+      <version>1.18</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>parameterized-trigger</artifactId>
-      <version>2.26</version>
+      <version>2.30</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>downstream-ext</artifactId>
-      <version>1.7</version>
+      <version>1.8</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.main</groupId>
       <artifactId>maven-plugin</artifactId>
-      <version>2.12</version>
+      <version>3.7</version>
       <optional>true</optional>
     </dependency>
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>flexible-publish</artifactId>
-      <version>0.15.2</version>
+      <version>0.16.1</version>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>mailer</artifactId>
+      <version>1.32.1</version>
+      <optional>true</optional>
+    </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.main</groupId>
+      <artifactId>jenkins-test-harness-tools</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>
+<!--
+    <dependency>
+      <groupId>org.jenkins-ci</groupId>
+      <artifactId>htmlunit</artifactId>
+      <version>2.6-jenkins-6</version>
+      <scope>test</scope>
+    </dependency>
+-->
   </dependencies>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    <jenkins.version>2.289.2</jenkins.version>
+    <java.level>8</java.level>
   </properties>
 
   <scm>
@@ -88,21 +111,17 @@
       <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>cobertura-maven-plugin</artifactId>
-          <version>2.4</version>
+          <version>2.7</version>
           <configuration>
               <formats>
                   <format>xml</format>
               </formats>
           </configuration>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>2.3.1</version>
-        <configuration>
-            <findbugsXmlOutput>true</findbugsXmlOutput>
-            <xmlOutput>true</xmlOutput>
-        </configuration>
+        <groupId>com.github.spotbugs</groupId>
+        <artifactId>spotbugs-maven-plugin</artifactId>
+        <version>4.1.4</version>
       </plugin>
     </plugins>
   </reporting>

src/main/java/join/JoinTrigger.java

@@ -88,6 +88,8 @@ public class JoinTrigger extends Recorder implements DependecyDeclarer, MatrixAg
 
     private String joinProjects;
 
+    // https://www.jenkins.io/blog/2018/01/13/jep-200/ Refusing to marshal join.JoinTrigger for security reasons; see https://jenkins.io/redirect/class-filter/
+    // resources/META-INF/hudson.remoting.ClassFilter with Entry join.JoinTrigger
     private DescribableList<Publisher,Descriptor<Publisher>> joinPublishers =
         new DescribableList<Publisher,Descriptor<Publisher>>(Saveable.NOOP);
 
@@ -500,7 +502,7 @@ public static class ItemListenerImpl extends ItemListener {
             public void onRenamed(Item item, String oldName, String newName) {
                 // update BuildTrigger of other projects that point to this object.
                 // can't we generalize this?
-                for( Project<?,?> p : Jenkins.getInstance().getProjects() ) {
+                for( Project<?,?> p : Jenkins.get().getProjects() ) {
                     BuildTrigger t = p.getPublishersList().get(BuildTrigger.class);
                     if ((t!=null) && (t.onJobRenamed(oldName,newName))) {
                         try {

src/main/resources/META-INF/hudson.remoting.ClassFilter

@@ -0,0 +1 @@
+join.JoinTrigger

src/main/resources/join/JoinTrigger/config.jelly

@@ -1,3 +1,4 @@
+<?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form" xmlns:local="local">
     <d:taglib uri="local">
         <d:tag name="blockWrapperTable">

src/main/webapp/help/postbuild.html

@@ -2,9 +2,9 @@
 Run certain post-build actions once the join is achieved.  The authors of the post-build actions
 did not have the join plugin in mind when writing their actions, so only a select few are shown here.
 
-<p>The join plugin can work with the paramaterized-trigger plugin, version 2.0 or later.   Earlier versions
+<p>The join plugin can work with the paramaterized-trigger plugin, version 2.30 or later.   Earlier versions
 will experience a NPE when started by the join plugin.
 
-<p>If there is a post-build action you would like to see supported, <a href="http://issues.hudson-ci.org/secure/CreateIssue!default.jspa">please file an issue</a>.   Use the 'join' component.
-But do <a href="http://issues.hudson-ci.org/secure/IssueNavigator.jspa?mode=hide&reset=true&jqlQuery=project+%3D+HUDSON+AND+status+in+%28Open%2C+%22In+Progress%22%2C+Reopened%29+AND+component+%3D+%27join%27">check the list of join plugin issues</a> first.
+<p>If there is a post-build action you would like to see supported, <a href="https://issues.jenkins.io/secure/CreateIssue!default.jspa">please file an issue</a>.   Use the 'join' component.
+But do <a href="https://issues.jenkins.io/secure/IssueNavigator.jspa?mode=hide&reset=true&jqlQuery=project+%3D+JENKINS+AND+status+in+%28Open%2C+%22In+Progress%22%2C+Reopened%29+AND+component+%3D+%27join-plugin%27">check the list of join plugin issues</a> first.
 </div>

src/test/java/join/BasicJoinPluginTest.java

@@ -1,10 +1,6 @@
 package join;
 
-import hudson.model.AbstractBuild;
-import hudson.model.AbstractProject;
-import hudson.model.Descriptor;
-import hudson.model.FreeStyleProject;
-import hudson.model.Saveable;
+import hudson.model.*;
 import hudson.plugins.parameterizedtrigger.AbstractBuildParameters;
 import hudson.plugins.parameterizedtrigger.BuildTriggerConfig;
 import hudson.plugins.parameterizedtrigger.ResultCondition;
@@ -14,9 +10,7 @@
 import org.apache.commons.lang.StringUtils;
 import org.jvnet.hudson.test.HudsonTestCase;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 
 /**
  *
@@ -217,7 +211,7 @@ public <T extends AbstractBuild<?,?>> void afterFinished(List<T> builds) {
     }
 
     public FreeStyleProject createFreeStyleProjectWithNoQuietPeriod() throws Exception {
-        final FreeStyleProject freestyleProject = createFreeStyleProject();
+        final FreeStyleProject freestyleProject = createFreeStyleProject("FreeStyle_" + UUID.randomUUID());
         freestyleProject.setQuietPeriod(0);
         return freestyleProject;
     }

src/test/java/join/JoinTriggerAllCombinationsTest.java

@@ -9,18 +9,16 @@
 import hudson.model.AbstractProject;
 import hudson.model.Cause;
 import hudson.model.FreeStyleProject;
-import hudson.model.Hudson;
+import jenkins.model.Jenkins;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.jvnet.hudson.test.ExtractResourceSCM;
+import org.jvnet.hudson.test.ToolInstallations;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.logging.Logger;
 
 /**
@@ -47,7 +45,7 @@ public class JoinTriggerAllCombinationsTest extends BasicJoinPluginTest {
                         @Override
                         public AbstractProject<?, ?> apply(JoinTriggerAllCombinationsTest from) {
                             try {
-                                MavenModuleSet mavenProject = from.createMavenProject();
+                                MavenModuleSet mavenProject = from.jenkins.createProject(MavenModuleSet.class, "Maven_" + UUID.randomUUID());
                                 mavenProject.setQuietPeriod(0);
                                 mavenProject.setScm(new ExtractResourceSCM(getClass().getResource("maven-empty-mod.zip")));
 
@@ -62,7 +60,7 @@ public class JoinTriggerAllCombinationsTest extends BasicJoinPluginTest {
                         @Override
                         public AbstractProject<?, ?> apply(JoinTriggerAllCombinationsTest from) {
                             try {
-                                MatrixProject matrixProject = from.createMatrixProject();
+                                MatrixProject matrixProject = from.jenkins.createProject(MatrixProject.class, "Matrix_" + UUID.randomUUID());
                                 matrixProject.setQuietPeriod(0);
                                 return matrixProject;
                             } catch (Exception e) {
@@ -114,14 +112,14 @@ public JoinTriggerAllCombinationsTest(Class<?> splitProjClass, Class<?> intProjC
     @Test
     public void joinProjectShouldBeTriggered() throws Exception {
         assertNotNull(splitProject);
-        configureDefaultMaven();
+        ToolInstallations.configureDefaultMaven();
         AbstractProject<?,?> splitProject = projectType2Supplier.get(splitProjClass).apply(this);
         AbstractProject<?,?> intProject = projectType2Supplier.get(intProjClass).apply(this);
         AbstractProject<?,?> joinProject = projectType2Supplier.get(joinProjClass).apply(this);
         addProjectToSplitProject(splitProject, intProject);
         addJoinTriggerToSplitProject(splitProject, joinProject);
-        Hudson.getInstance().rebuildDependencyGraph();
-        final AbstractBuild<?,?> splitBuild = splitProject.scheduleBuild2(0, new Cause.UserCause()).get();
+        Jenkins.get().rebuildDependencyGraph();
+        final AbstractBuild<?,?> splitBuild = splitProject.scheduleBuild2(0, new Cause.UserIdCause()).get();
         waitUntilNoActivityUpTo(120*1000);
         AbstractBuild<?, ?> intBuild = getUniqueBuild(intProject);
         AbstractBuild<?, ?> joinBuild = getUniqueBuild(joinProject);