Resolve conflicts

jenkinsci · Apr 20, 2022 · 5301741 · 5301741
1 parent a571ef4
commit 5301741
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.jenkins-ci.plugins</groupId>
         <artifactId>plugin</artifactId>
-        <version>4.18</version>
+        <version>4.40</version>
         <relativePath />
     </parent>
 
@@ -14,7 +14,7 @@
     <name>Audit Trail</name>
     <version>3.11-SNAPSHOT</version>
     <properties>
-        <jenkins.version>2.263.1</jenkins.version>
+        <jenkins.version>2.340</jenkins.version>
         <java.level>8</java.level>
         <slf4jVersion>1.7.30</slf4jVersion>
     </properties>
@@ -80,6 +80,7 @@
         <dependency>
             <groupId>org.jenkins-ci.plugins</groupId>
             <artifactId>credentials</artifactId>
+            <version>1126.ve05618c41e62</version>
         </dependency>
     </dependencies>
 
@@ -116,15 +117,16 @@
         <dependencies>
             <dependency>
                 <groupId>io.jenkins.tools.bom</groupId>
-                <artifactId>bom-2.263.x</artifactId>
-                <version>807.v6d348e44c987</version>
+                <artifactId>bom-2.332.x</artifactId>
+                <version>1246.va_b_50630c1d19</version>
                 <scope>import</scope>
                 <type>pom</type>
             </dependency>
             <!--  See
             https://groups.google.com/d/msgid/jenkinsci-dev/64f55a31-4dfa-4ba9-b15e-aca6e7620864n%40googlegroups.com
             -->
-            <dependency><!-- If caffeine is needed, use version 2.9.1.
+            <dependency>
+                <!-- If caffeine is needed, use version 2.9.1.
                        Resolves an upper bounds dependency message.
                        Does not include caffeine in the hpi file. -->
                 <groupId>com.github.ben-manes.caffeine</groupId>
@@ -145,4 +147,4 @@
         </dependencies>
     </dependencyManagement>
 
-</project>
+</project>