Skip to content

Commit 7f79a20

Browse files
authored
Merge pull request #1268 from jenkinsci/dependabot/maven/revision-1.12.772
2 parents 655bc02 + 2422255 commit 7f79a20

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

aws-java-sdk-minimal/pom.xml

+7
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,13 @@
5151
<groupId>com.amazonaws</groupId>
5252
<artifactId>aws-java-sdk-s3</artifactId>
5353
<version>${revision}</version>
54+
<exclusions>
55+
<!-- use the version supplied by jackson2-api -->
56+
<exclusion>
57+
<groupId>com.fasterxml.jackson.core</groupId>
58+
<artifactId>jackson-databind</artifactId>
59+
</exclusion>
60+
</exclusions>
5461
</dependency>
5562
<dependency>
5663
<groupId>com.amazonaws</groupId>

pom.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
<url>https://github.com/jenkinsci/aws-java-sdk-plugin/</url>
6262
</scm>
6363
<properties>
64-
<revision>1.12.767</revision>
64+
<revision>1.12.772</revision>
6565
<changelist>999999-SNAPSHOT</changelist>
66-
<bom>2.401.x</bom>
67-
<jenkins.version>2.401.3</jenkins.version>
66+
<bom>2.440.x</bom>
67+
<jenkins.version>2.440.3</jenkins.version>
6868
<autoVersionSubmodules>true</autoVersionSubmodules>
6969
<spotless.check.skip>false</spotless.check.skip>
7070
</properties>
@@ -80,7 +80,7 @@
8080
<dependency>
8181
<groupId>io.jenkins.tools.bom</groupId>
8282
<artifactId>bom-${bom}</artifactId>
83-
<version>2745.vc7b_fe4c876fa_</version>
83+
<version>3387.v0f2773fa_3200</version>
8484
<type>pom</type>
8585
<scope>import</scope>
8686
</dependency>

0 commit comments

Comments
 (0)