Skip to content

Commit 9ce79d2

Browse files
dnaultdnault
committed
JVMCBC-1700 Upgrade to Jackson 2.20.1
Modifications ------------- Use Jackson BOM. In scala-client POM, remove explicit dependencies on jackson-core and jackson-annotations; these are transitive dependencies of jackson-databind, and are included automatically. Also noteworthy, starting with Jackson 2.20.0, the jackson-annotations library version is just `2.20` (no patch version). This isn't a problem if we rely on the BOM (or rely on transitive dependency inclusion instead of explicitly depending on a specific version). Change-Id: Ife4289558c507b93b85d3c8b1dfa0e8597e8686f Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/236250 Tested-by: Build Bot <[email protected]> Reviewed-by: Michael Reiche <[email protected]>
1 parent 19c52e2 commit 9ce79d2

File tree

7 files changed

+16
-40
lines changed

7 files changed

+16
-40
lines changed

‎columnar-java-client/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<dependency>
3737
<groupId>com.fasterxml.jackson.core</groupId>
3838
<artifactId>jackson-databind</artifactId>
39-
<version>${jackson.version}</version>
4039
</dependency>
4140

4241
<!-- Copy this dependency declaration into your own project

‎core-io-deps/pom.xml‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
<!-- When bumping this, it may be necessary to bump the grpc-netty dependency in protostellar/pom.xml also -->
2121
<netty.version>4.1.128.Final</netty.version>
22-
<jackson.version>2.19.4</jackson.version>
22+
<jackson.version>2.20.1</jackson.version>
2323

2424
<shaded.package.prefix>com.couchbase.client.core.deps.</shaded.package.prefix>
2525
<shaded.native.lib.prefix>com_couchbase_client_core_deps_</shaded.native.lib.prefix>
@@ -54,6 +54,13 @@
5454
<type>pom</type>
5555
<scope>import</scope>
5656
</dependency>
57+
<dependency>
58+
<groupId>com.fasterxml.jackson</groupId>
59+
<artifactId>jackson-bom</artifactId>
60+
<version>${jackson.version}</version>
61+
<type>pom</type>
62+
<scope>import</scope>
63+
</dependency>
5764
</dependencies>
5865
</dependencyManagement>
5966

@@ -83,12 +90,10 @@
8390
<dependency>
8491
<groupId>com.fasterxml.jackson.core</groupId>
8592
<artifactId>jackson-databind</artifactId>
86-
<version>${jackson.version}</version>
8793
</dependency>
8894
<dependency>
8995
<groupId>com.fasterxml.jackson.module</groupId>
9096
<artifactId>jackson-module-afterburner</artifactId>
91-
<version>${jackson.version}</version>
9297
</dependency>
9398
<dependency>
9499
<groupId>dnsjava</groupId>

‎java-client/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<dependency>
2828
<groupId>com.fasterxml.jackson.core</groupId>
2929
<artifactId>jackson-databind</artifactId>
30-
<version>${jackson.version}</version>
3130
<optional>true</optional>
3231
</dependency>
3332

‎kotlin-client/pom.xml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,17 +67,14 @@
6767
<dependency>
6868
<groupId>com.fasterxml.jackson.core</groupId>
6969
<artifactId>jackson-databind</artifactId>
70-
<version>${jackson.version}</version>
7170
</dependency>
7271
<dependency>
7372
<groupId>com.fasterxml.jackson.module</groupId>
7473
<artifactId>jackson-module-kotlin</artifactId>
75-
<version>${jackson.version}</version>
7674
</dependency>
7775
<dependency>
7876
<groupId>com.fasterxml.jackson.datatype</groupId>
7977
<artifactId>jackson-datatype-jdk8</artifactId>
80-
<version>${jackson.version}</version>
8178
</dependency>
8279

8380
<!-- Optional, used by KotlinxSerializationJsonSerializer -->

‎pom.xml‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<assertj.version>3.23.1</assertj.version>
2020
<log4j-slf4j-impl.version>2.20.0</log4j-slf4j-impl.version>
2121

22-
<jackson.version>2.19.4</jackson.version>
22+
<jackson.version>2.20.1</jackson.version>
2323
<reactor.version>3.6.9</reactor.version>
2424
<reactive-streams.version>1.0.4</reactive-streams.version>
2525
<blockhound.version>1.0.10.RELEASE</blockhound.version>
@@ -160,6 +160,13 @@
160160
<artifactId>blockhound</artifactId>
161161
<version>${blockhound.version}</version>
162162
</dependency>
163+
<dependency>
164+
<groupId>com.fasterxml.jackson</groupId>
165+
<artifactId>jackson-bom</artifactId>
166+
<version>${jackson.version}</version>
167+
<type>pom</type>
168+
<scope>import</scope>
169+
</dependency>
163170
</dependencies>
164171
</dependencyManagement>
165172

‎scala-client/pom.xml‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,6 @@
322322
<dependency>
323323
<groupId>com.fasterxml.jackson.module</groupId>
324324
<artifactId>jackson-module-scala_${scala.compat.version}</artifactId>
325-
<version>${jackson.version}</version>
326325
<optional>true</optional>
327326
</dependency>
328327

@@ -379,22 +378,9 @@
379378
<optional>true</optional>
380379
</dependency>
381380

382-
<dependency>
383-
<groupId>com.fasterxml.jackson.core</groupId>
384-
<artifactId>jackson-core</artifactId>
385-
<version>${jackson.version}</version>
386-
<scope>test</scope>
387-
</dependency>
388-
<dependency>
389-
<groupId>com.fasterxml.jackson.core</groupId>
390-
<artifactId>jackson-annotations</artifactId>
391-
<version>${jackson.version}</version>
392-
<scope>test</scope>
393-
</dependency>
394381
<dependency>
395382
<groupId>com.fasterxml.jackson.core</groupId>
396383
<artifactId>jackson-databind</artifactId>
397-
<version>${jackson.version}</version>
398384
<scope>test</scope>
399385
</dependency>
400386

@@ -440,28 +426,13 @@
440426
<version>${scala.circe.version}</version>
441427
<scope>test</scope>
442428
</dependency>
443-
<dependency>
444-
<groupId>com.fasterxml.jackson.core</groupId>
445-
<artifactId>jackson-core</artifactId>
446-
<version>${jackson.version}</version>
447-
<scope>test</scope>
448-
</dependency>
449-
450-
<dependency>
451-
<groupId>com.fasterxml.jackson.core</groupId>
452-
<artifactId>jackson-annotations</artifactId>
453-
<version>${jackson.version}</version>
454-
<scope>test</scope>
455-
</dependency>
456429

457430
<dependency>
458431
<groupId>com.fasterxml.jackson.core</groupId>
459432
<artifactId>jackson-databind</artifactId>
460-
<version>${jackson.version}</version>
461433
<scope>test</scope>
462434
</dependency>
463435

464-
465436
<dependency>
466437
<groupId>org.json4s</groupId>
467438
<artifactId>json4s-native_${scala.compat.version}</artifactId>
@@ -479,7 +450,6 @@
479450
<dependency>
480451
<groupId>com.fasterxml.jackson.module</groupId>
481452
<artifactId>jackson-module-scala_${scala.compat.version}</artifactId>
482-
<version>${jackson.version}</version>
483453
<scope>test</scope>
484454
</dependency>
485455
</dependencies>

‎test-utils/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<dependency>
5252
<groupId>com.fasterxml.jackson.core</groupId>
5353
<artifactId>jackson-databind</artifactId>
54-
<version>${jackson.version}</version>
5554
</dependency>
5655
<dependency>
5756
<groupId>org.awaitility</groupId>

0 commit comments

Comments
 (0)