Merge pull request #77 from jtnord/update-docker-jvm-and-base

update plugin and deps
jenkinsci · Jun 13, 2023 · 14f9e6b · 14f9e6b
2 parents 03b167f + 95070c5
commit 14f9e6b
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 35 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1 +1,6 @@
-buildPlugin(failFast:false)
+buildPlugin(useContainerAgent: true,
+            configurations: [
+              [platform: 'linux', jdk: '17'],
+              [platform: 'linux', jdk: '11'],
+              [platform: 'windows', jdk: '11'],
+])
diff --git a/pom.xml b/pom.xml
@@ -27,7 +27,7 @@
   <parent>
     <groupId>org.jenkins-ci.plugins</groupId>
     <artifactId>plugin</artifactId>
-    <version>4.50</version>
+    <version>4.65</version>
     <relativePath />
   </parent>
 
@@ -45,8 +45,8 @@
   <properties>
     <revision>1</revision>
     <changelist>999999-SNAPSHOT</changelist>
-    <jenkins.version>2.332.4</jenkins.version>
-    <bom>2.332.x</bom>
+    <jenkins.version>2.361.4</jenkins.version>
+    <bom>2.361.x</bom>
     <junit5.version>5.7.2</junit5.version>
   </properties>
 
@@ -80,24 +80,39 @@
       <dependency>
         <groupId>io.jenkins.tools.bom</groupId>
         <artifactId>bom-${bom}</artifactId>
-        <version>1706.vc166d5f429f8</version>
+        <version>2102.v854b_fec19c92</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp-bom</artifactId>
+        <!-- needs to be aligned with the version of okhttp-api in the plugin bom -->
+        <version>4.10.0</version>
+        <scope>import</scope>
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>org.jetbrains.kotlin</groupId>
+        <artifactId>kotlin-bom</artifactId>
+        <version>1.8.21</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>aws-credentials</artifactId>
-        <version>1.33</version>
+        <version>189.v3551d5642995</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>docker-commons</artifactId>
-        <version>1.16</version>
+        <version>419.v8e3cd84ef49c</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>openstack-cloud</artifactId>
-        <version>2.47</version>
+        <version>2.63</version>
         <exclusions>
           <exclusion>
             <groupId>com.squareup.okhttp3</groupId>
@@ -109,20 +124,10 @@
           </exclusion>
         </exclusions>
       </dependency>
-      <dependency>
-        <groupId>org.jenkins-ci.plugins</groupId>
-        <artifactId>github-branch-source</artifactId>
-        <version>2.7.1</version>
-      </dependency>
       <dependency>
         <groupId>com.datapipe.jenkins.plugins</groupId>
         <artifactId>hashicorp-vault-plugin</artifactId>
-        <version>3.8.0</version>
-      </dependency>
-      <dependency>
-        <groupId>org.hamcrest</groupId>
-        <artifactId>hamcrest</artifactId>
-        <version>2.2</version>
+        <version>360.v0a_1c04cf807d</version>
       </dependency>
       <dependency>
         <groupId>org.jenkins-ci.ui</groupId>
@@ -142,6 +147,11 @@
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>credentials</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId>
+      <artifactId>variant</artifactId>
+    </dependency>
+
     <dependency>
       <!--  for Secret Text / Secret File -->
       <groupId>org.jenkins-ci.plugins</groupId>
@@ -158,6 +168,7 @@
     <dependency>
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>openstack-cloud</artifactId>
+      <!-- https://github.com/jenkinsci/openstack-cloud-plugin/issues/367 -->
       <exclusions>
         <exclusion>
           <!-- from snakeyaml-api -->
@@ -172,10 +183,6 @@
       <groupId>org.jenkins-ci.plugins</groupId>
       <artifactId>ssh-credentials</artifactId>
       <optional>true</optional>
-    </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.plugins</groupId>
-      <artifactId>variant</artifactId>
     </dependency>
       <!-- GitHub App credentials -->
     <dependency>
@@ -211,15 +218,10 @@
       <artifactId>mockito-core</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.mockito</groupId>
-      <artifactId>mockito-inline</artifactId>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>io.fabric8</groupId>
       <artifactId>kubernetes-server-mock</artifactId>
-      <version>6.3.1</version>
+      <version>6.7.1</version>
       <scope>test</scope>
       <exclusions>
         <!--
@@ -240,12 +242,6 @@
       <scope>provided</scope>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.jenkins-ci.ui</groupId>
-      <artifactId>jquery-detached</artifactId>
-      <scope>test</scope>
-      <optional>true</optional>
-    </dependency>
   </dependencies>
 
   <!-- Jenkins is not synced to central so we need to bootstrap -->