Update Jenkins baseline to 2.164.3 (#19)

This is the easiest way to fix the automatic CD build.
jenkinsci · Apr 25, 2023 · e3bcafc · e3bcafc
1 parent 0fadae7
commit e3bcafc
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 83 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1 +1,10 @@
-buildPlugin()
+/*
+ See the documentation for more options:
+ https://github.com/jenkins-infra/pipeline-library/
+*/
+buildPlugin(
+  useContainerAgent: true,
+  configurations: [
+    [platform: 'linux', jdk: 11],
+    [platform: 'windows', jdk: 8],
+])
diff --git a/bitbucket-scm-filter-aged-refs/pom.xml b/bitbucket-scm-filter-aged-refs/pom.xml
@@ -12,17 +12,6 @@
     <packaging>hpi</packaging>
 
     <name>Bitbucket Aged References SCM Filter Plugin</name>
-    <description>Adds a filtering trait according to a ref date to an existing Bitbucket Branch Source Plugin configuration.</description>
-
-    <dependencyManagement>
-        <dependencies>
-            <dependency>
-                <groupId>com.jcraft</groupId>
-                <artifactId>jsch</artifactId>
-                <version>0.1.53</version>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
 
     <dependencies>
         <dependency>

diff --git a/bitbucket-scm-filter-aged-refs/src/main/resources/index.jelly b/bitbucket-scm-filter-aged-refs/src/main/resources/index.jelly
@@ -0,0 +1,5 @@
+<?jelly escape-by-default='true'?>
+<div>
+  Adds a filtering trait according to a ref date to an existing Bitbucket
+  Branch Source Plugin configuration.
+</div>
diff --git a/github-scm-filter-aged-refs/pom.xml b/github-scm-filter-aged-refs/pom.xml
@@ -12,7 +12,6 @@
     <packaging>hpi</packaging>
 
     <name>GitHub Aged References SCM Filter Plugin</name>
-    <description>Adds a filtering trait according to a ref date to an existing GitHub Branch Source Plugin configuration.</description>
 
     <dependencies>
         <dependency>
@@ -25,12 +24,5 @@
             <artifactId>scm-filter-aged-refs-common</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <!-- optional (maybe not so) dependency of git, needed to make InjectedTest works -->
-        <dependency>
-            <groupId>org.jenkins-ci.plugins</groupId>
-            <artifactId>token-macro</artifactId>
-            <version>1.12.1</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 </project>
diff --git a/github-scm-filter-aged-refs/src/main/resources/index.jelly b/github-scm-filter-aged-refs/src/main/resources/index.jelly
@@ -0,0 +1,5 @@
+<?jelly escape-by-default='true'?>
+<div>
+  Adds a filtering trait according to a ref date to an existing GitHub Branch
+  Source Plugin configuration.
+</div>
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>3.57</version>
+        <version>4.39</version>
     </parent>
 
     <artifactId>scm-filter-aged-refs-parent</artifactId>
@@ -26,13 +26,9 @@
     <properties>
         <changelist>999999-SNAPSHOT</changelist>
         <gitHubRepo>jenkinsci/scm-filter-aged-refs-plugin</gitHubRepo>
-        <jenkins.version>2.32.3</jenkins.version>
-        <bitbucket-branch-source.version>2.2.11</bitbucket-branch-source.version>
+        <jenkins.version>2.164.3</jenkins.version>
+        <bitbucket-branch-source.version>2.9.1</bitbucket-branch-source.version>
         <github-branch-source.version>2.3.0</github-branch-source.version>
-        <scm-api.version>2.2.0</scm-api.version>
-        <branch-api.version>2.0.11</branch-api.version>
-        <git.version>3.6.0</git.version>
-        <workflow.version>1.14.2</workflow.version>
         <java.level>8</java.level>
     </properties>
 
@@ -64,72 +60,26 @@
 
     <dependencyManagement>
         <dependencies>
-            <!-- setting transitive dependencies version to comply with the maven-enforcer-plugin RequireUpperBoundDeps rule-->
             <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>scm-api</artifactId>
-                <version>${scm-api.version}</version>
+                <groupId>io.jenkins.tools.bom</groupId>
+                <artifactId>bom-2.164.x</artifactId>
+                <version>10</version>
+                <scope>import</scope>
+                <type>pom</type>
             </dependency>
             <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>branch-api</artifactId>
-                <version>${branch-api.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>cloudbees-folder</artifactId>
-                <version>6.1.0</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>junit</artifactId>
-                <version>1.3</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>display-url-api</artifactId>
-                <version>0.2</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>credentials</artifactId>
-                <version>2.1.15</version>
-            </dependency>
-            <dependency>
-                <groupId>com.infradna.tool</groupId>
-                <artifactId>bridge-method-annotation</artifactId>
-                <version>1.17</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>script-security</artifactId>
-                <version>1.16</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci.plugins</groupId>
-                <artifactId>structs</artifactId>
-                <version>1.10</version>
-            </dependency>
-            <dependency>
-                <groupId>org.jenkins-ci</groupId>
-                <artifactId>symbol-annotation</artifactId>
-                <version>1.13</version>
+                <groupId>javax.mail</groupId>
+                <artifactId>mail</artifactId>
+                <version>1.4.7</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
 
     <dependencies>
-        <!-- Required for hpi:run -->
-        <dependency>
-            <groupId>org.jenkins-ci.plugins.workflow</groupId>
-            <artifactId>workflow-aggregator</artifactId>
-            <version>${workflow.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>org.jenkins-ci.plugins.workflow</groupId>
             <artifactId>workflow-multibranch</artifactId>
-            <version>${workflow.version}</version>
+            <version>2.21</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/scm-filter-aged-refs-common/pom.xml b/scm-filter-aged-refs-common/pom.xml
@@ -26,7 +26,6 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>git</artifactId>
-            <version>${git.version}</version>
         </dependency>
     </dependencies>