Skip to content

Commit 1fef1e6

Browse files
authored
Merge pull request #5556 from gchq/dependabot/maven/java/jackson.version-2.20
Bump jackson.version from 2.19.2 to 2.20 in /java
2 parents 6145338 + 93b177b commit 1fef1e6

File tree

7 files changed

+26
-21
lines changed

7 files changed

+26
-21
lines changed

java/build-uptime-lambda/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@
6666
<dependency>
6767
<groupId>org.wiremock</groupId>
6868
<artifactId>wiremock</artifactId>
69-
<version>${wiremock.version}</version>
7069
<scope>test</scope>
7170
</dependency>
7271
<dependency>

java/build/pom.xml

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -30,55 +30,49 @@
3030
<dependency>
3131
<groupId>com.fasterxml.jackson.dataformat</groupId>
3232
<artifactId>jackson-dataformat-yaml</artifactId>
33-
<version>${jackson.version}</version>
3433
</dependency>
3534
<dependency>
3635
<groupId>com.fasterxml.jackson.dataformat</groupId>
3736
<artifactId>jackson-dataformat-xml</artifactId>
38-
<version>${jackson.version}</version>
3937
</dependency>
4038
<dependency>
4139
<groupId>com.fasterxml.jackson.core</groupId>
4240
<artifactId>jackson-databind</artifactId>
43-
<version>${jackson.version}</version>
4441
</dependency>
4542
<dependency>
4643
<groupId>com.fasterxml.jackson.core</groupId>
4744
<artifactId>jackson-annotations</artifactId>
48-
<version>${jackson.version}</version>
4945
</dependency>
5046
<dependency>
5147
<groupId>com.fasterxml.jackson.datatype</groupId>
5248
<artifactId>jackson-datatype-jsr310</artifactId>
53-
<version>${jackson.version}</version>
5449
</dependency>
5550
<dependency>
5651
<groupId>com.fasterxml.jackson.core</groupId>
5752
<artifactId>jackson-core</artifactId>
58-
<version>${jackson.version}</version>
5953
</dependency>
6054
<dependency>
6155
<groupId>org.glassfish.jersey.core</groupId>
6256
<artifactId>jersey-client</artifactId>
63-
<version>${jersey.version}</version>
57+
<version>${jersey.build.version}</version>
6458
<scope>runtime</scope>
6559
</dependency>
6660
<dependency>
6761
<groupId>org.glassfish.jersey.media</groupId>
6862
<artifactId>jersey-media-json-jackson</artifactId>
69-
<version>${jersey.version}</version>
63+
<version>${jersey.build.version}</version>
7064
<scope>runtime</scope>
7165
</dependency>
7266
<dependency>
7367
<groupId>org.glassfish.jersey.inject</groupId>
7468
<artifactId>jersey-hk2</artifactId>
75-
<version>${jersey.version}</version>
69+
<version>${jersey.build.version}</version>
7670
<scope>runtime</scope>
7771
</dependency>
7872
<dependency>
7973
<groupId>jakarta.ws.rs</groupId>
8074
<artifactId>jakarta.ws.rs-api</artifactId>
81-
<version>${jakarta.ws.version}</version>
75+
<version>${jakarta.ws.build.version}</version>
8276
</dependency>
8377
<dependency>
8478
<groupId>com.github.spotbugs</groupId>
@@ -122,7 +116,6 @@
122116
<dependency>
123117
<groupId>org.wiremock</groupId>
124118
<artifactId>wiremock</artifactId>
125-
<version>${wiremock.version}</version>
126119
<scope>test</scope>
127120
</dependency>
128121
<dependency>

java/cdk-custom-resources/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@
7474
<dependency>
7575
<groupId>org.wiremock</groupId>
7676
<artifactId>wiremock</artifactId>
77-
<version>${wiremock.version}</version>
7877
<scope>test</scope>
7978
</dependency>
8079
</dependencies>

java/common/common-task/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
<dependency>
7171
<groupId>org.wiremock</groupId>
7272
<artifactId>wiremock</artifactId>
73-
<version>${wiremock.version}</version>
7473
<scope>test</scope>
7574
</dependency>
7675
</dependencies>

java/common/localstack-test/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
<dependency>
4444
<groupId>org.wiremock</groupId>
4545
<artifactId>wiremock</artifactId>
46-
<version>${wiremock.version}</version>
4746
</dependency>
4847
<dependency>
4948
<groupId>software.amazon.awssdk</groupId>

java/ingest/ingest-batcher-store/pom.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@
6161
<dependency>
6262
<groupId>org.wiremock</groupId>
6363
<artifactId>wiremock</artifactId>
64-
<version>${wiremock.version}</version>
6564
<scope>test</scope>
6665
</dependency>
6766
</dependencies>

java/pom.xml

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@
176176
<guice.version>7.0.0</guice.version>
177177
<jol.version>0.17</jol.version>
178178
<zookeeper.version>3.9.4</zookeeper.version>
179-
<jackson.version>2.19.2</jackson.version>
179+
<jackson.version>2.20.0</jackson.version>
180+
<jackson.annotations.version>2.20</jackson.annotations.version>
180181
<!-- Trino integration uses a different version of JJWT, this is the version used in the build module -->
181182
<jjwt.build.version>0.13.0</jjwt.build.version>
182183
<facebook.collections.version>0.1.32</facebook.collections.version>
@@ -198,9 +199,10 @@
198199
<trino.version>435</trino.version>
199200
<!-- Trino requires an old version of JGraphT -->
200201
<trino.jgrapht.version>0.9.2</trino.jgrapht.version>
201-
<!-- Build module uses Jersey w/Jakarta WS for communicating with GitHub API -->
202-
<jersey.version>2.45</jersey.version>
203-
<jakarta.ws.version>2.1.6</jakarta.ws.version>
202+
<!-- Build module uses Jersey w/Jakarta WS for communicating with GitHub API. -->
203+
<!-- This is not managed for the whole project as it conflicts with Trino. -->
204+
<jersey.build.version>2.45</jersey.build.version>
205+
<jakarta.ws.build.version>2.1.6</jakarta.ws.build.version>
204206
<!-- Netty version is managed because S3, Athena and Arrow depend on it but use incompatible versions -->
205207
<netty.version>4.2.4.Final</netty.version>
206208
<!-- netty-tcnative is a fork of Tomcat Native, and is only used by spark-sql -->
@@ -1332,7 +1334,7 @@
13321334
<dependency>
13331335
<groupId>com.fasterxml.jackson.core</groupId>
13341336
<artifactId>jackson-annotations</artifactId>
1335-
<version>${jackson.version}</version>
1337+
<version>${jackson.annotations.version}</version>
13361338
</dependency>
13371339
<dependency>
13381340
<groupId>com.fasterxml.jackson.core</groupId>
@@ -1374,6 +1376,16 @@
13741376
<artifactId>jackson-datatype-jsr310</artifactId>
13751377
<version>${jackson.version}</version>
13761378
</dependency>
1379+
<dependency>
1380+
<groupId>com.fasterxml.jackson.dataformat</groupId>
1381+
<artifactId>jackson-dataformat-yaml</artifactId>
1382+
<version>${jackson.version}</version>
1383+
</dependency>
1384+
<dependency>
1385+
<groupId>com.fasterxml.jackson.dataformat</groupId>
1386+
<artifactId>jackson-dataformat-xml</artifactId>
1387+
<version>${jackson.version}</version>
1388+
</dependency>
13771389
<dependency>
13781390
<groupId>com.fasterxml.jackson.jaxrs</groupId>
13791391
<artifactId>jackson-jaxrs-base</artifactId>
@@ -1477,6 +1489,11 @@
14771489
<artifactId>json-unit-assertj</artifactId>
14781490
<version>${jsonunit.version}</version>
14791491
</dependency>
1492+
<dependency>
1493+
<groupId>org.wiremock</groupId>
1494+
<artifactId>wiremock</artifactId>
1495+
<version>${wiremock.version}</version>
1496+
</dependency>
14801497
</dependencies>
14811498
</dependencyManagement>
14821499

0 commit comments

Comments
 (0)