Merge branch 'master' into jdk-17

jenkinsci · Apr 19, 2023 · 0559dfc · 0559dfc
2 parents 0b34d98 + bc946b5
commit 0559dfc
Showing 1 changed file with 4 additions and 9 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.43.1</version>
+        <version>4.60</version>
         <relativePath />
     </parent>
     <artifactId>matrix-project</artifactId>
@@ -15,7 +15,7 @@
     <properties>
       <changelist>999999-SNAPSHOT</changelist>
       <gitHubRepo>jenkinsci/${project.artifactId}-plugin</gitHubRepo>
-      <jenkins.version>2.359</jenkins.version>
+      <jenkins.version>2.361.4</jenkins.version>
       <spotbugs.skip>true</spotbugs.skip> <!-- Clean up redundant null check warnings and re-enable after SECURITY-1339 is released -->
     </properties>
     <licenses>
@@ -74,18 +74,13 @@
             <artifactId>mockito-core</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-inline</artifactId>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.346.x</artifactId>
-                <version>1478.v81d3dc4f9a_43</version>
+                <artifactId>bom-2.361.x</artifactId>
+                <version>2000.v4677a_6e0ffea</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>