Merge branch 'main' into remove-prototype

jenkinsci · Jun 30, 2023 · 38bc67d · 38bc67d
2 parents 2d45d8f + 1d330fb
commit 38bc67d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 23 deletions.
diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml
@@ -2,6 +2,6 @@
   <extension>
     <groupId>io.jenkins.tools.incrementals</groupId>
     <artifactId>git-changelist-maven-extension</artifactId>
-    <version>1.4</version>
+    <version>1.6</version>
   </extension>
 </extensions>
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -1,2 +1,5 @@
 // Build the plugin using https://github.com/jenkins-infra/pipeline-library
-buildPlugin()
+buildPlugin(useContainerAgent: true, configurations: [
+  [platform: 'linux', jdk: 17],
+  [platform: 'windows', jdk: 11],
+])
diff --git a/pom.xml b/pom.xml
@@ -28,27 +28,28 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.19</version>
+        <version>4.69</version>
+        <relativePath />
     </parent>
 
-  <properties>
-    <revision>1.25</revision>
-    <changelist>-SNAPSHOT</changelist>
-    <gitHubRepo>jenkinsci/publish-over-ssh-plugin</gitHubRepo>
-    <jenkins.version>2.289.3</jenkins.version>
-    <java.level>8</java.level>
-  </properties>
+    <properties>
+        <revision>1.25</revision>
+        <changelist>-SNAPSHOT</changelist>
+        <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
+        <jenkins.version>2.361.4</jenkins.version>
+    </properties>
 
   <artifactId>publish-over-ssh</artifactId>
     <packaging>hpi</packaging>
     <name>Publish Over SSH</name>
     <version>${revision}${changelist}</version>
     <description>Send build artifacts over SSH</description>
-    <url>https://github.com/jenkinsci/publish-over-ssh-plugin</url>
+    <url>https://github.com/jenkinsci/${project.artifactId}-plugin</url>
 
     <licenses>
         <license>
             <name>The MIT license</name>
+            <url>https://opensource.org/license/mit/</url>
             <comments>All source code is under the MIT license.</comments>
         </license>
     </licenses>
@@ -66,8 +67,8 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.289.x</artifactId>
-                <version>1500.ve4d05cd32975</version>
+                <artifactId>bom-2.361.x</artifactId>
+                <version>2102.v854b_fec19c92</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
@@ -88,11 +89,10 @@
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>structs</artifactId>
         </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson.core</groupId>
-        <artifactId>jackson-databind</artifactId>
-        <version>2.14.0</version>
-      </dependency>
+        <dependency>
+            <groupId>org.jenkins-ci.plugins</groupId>
+            <artifactId>jackson2-api</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
@@ -112,7 +112,7 @@
         </dependency>
         <dependency>
             <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
+            <artifactId>hamcrest</artifactId>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/src/test/java/jenkins/plugins/publish_over_ssh/jenkins/IntegrationTest.java b/src/test/java/jenkins/plugins/publish_over_ssh/jenkins/IntegrationTest.java
@@ -24,9 +24,9 @@
 
 package jenkins.plugins.publish_over_ssh.jenkins;
 
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -124,7 +124,7 @@ public boolean perform(final AbstractBuild<?, ?> build, final Launcher launcher,
         verify(mockSftp).connect(timeout);
         verify(mockSftp).cd(transfer.getRemoteDirectory());
         verify(mockSftp).cd("build-dir");
-        verify(mockSftp).put((InputStream) anyObject(), eq(buildFileName));
+        verify(mockSftp).put((InputStream) any(), eq(buildFileName));
     }
 
 }