Skip to content

Commit 20f4255

Browse files
committed
Bug 39053132 - [39052523->14.1.2.0.6] Update Jackson to 2.21.1 (14.1.2.0 cl 119129 --> 14.1.2.0 CE)
[git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v14.1.2.0/": change = 119192]
1 parent dd6ad9b commit 20f4255

File tree

3 files changed

+24
-6
lines changed

3 files changed

+24
-6
lines changed

prj/coherence-dependencies/pom.xml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,10 @@
173173
<helidon.sitegen.version>2.1.2</helidon.sitegen.version>
174174
<hsqldb.version>2.7.4</hsqldb.version>
175175
<groovy.version>4.0.27</groovy.version>
176-
<jackson.version>2.15.0</jackson.version>
177-
<jackson.databind.version>2.15.0</jackson.databind.version>
176+
<jackson.version>2.21.1</jackson.version>
177+
<!-- sometimes Jackson annotations does not get 3rd digit release updates -->
178+
<jackson.annotations.version>2.21</jackson.annotations.version>
179+
<jackson.databind.version>${jackson.version}</jackson.databind.version>
178180
<jacoco.version>0.8.13</jacoco.version>
179181
<jaeger.version>1.8.1</jaeger.version>
180182
<jakarta.activation.version>1.2.2</jakarta.activation.version>
@@ -433,7 +435,7 @@
433435
<dependency>
434436
<groupId>com.fasterxml.jackson.core</groupId>
435437
<artifactId>jackson-annotations</artifactId>
436-
<version>${jackson.version}</version>
438+
<version>${jackson.annotations.version}</version>
437439
</dependency>
438440
<dependency>
439441
<groupId>com.fasterxml.jackson.core</groupId>

prj/coherence-management/pom.xml

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright (c) 2000, 2025, Oracle and/or its affiliates.
3+
~ Copyright (c) 2000, 2026, Oracle and/or its affiliates.
44
~
55
~ Licensed under the Universal Permissive License v 1.0 as shown at
66
~ https://oss.oracle.com/licenses/upl.
@@ -45,6 +45,12 @@
4545
<scope>provided</scope>
4646
<optional>true</optional>
4747
</dependency>
48+
<dependency>
49+
<groupId>jakarta.xml.bind</groupId>
50+
<artifactId>jakarta.xml.bind-api</artifactId>
51+
<scope>provided</scope>
52+
<optional>true</optional>
53+
</dependency>
4854
<dependency>
4955
<groupId>org.glassfish.jersey.core</groupId>
5056
<artifactId>jersey-server</artifactId>
@@ -88,6 +94,11 @@
8894
<groupId>com.fasterxml.jackson.core</groupId>
8995
<artifactId>jackson-databind</artifactId>
9096
</exclusion>
97+
<!-- exclude javax based XML binding -->
98+
<exclusion>
99+
<groupId>javax.xml.bind</groupId>
100+
<artifactId>jaxb-api</artifactId>
101+
</exclusion>
91102
</exclusions>
92103
</dependency>
93104

prj/coherence-rest/pom.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
Copyright (c) 2000, 2025, Oracle and/or its affiliates.
2+
Copyright (c) 2000, 2026, Oracle and/or its affiliates.
33
44
Licensed under the Universal Permissive License v 1.0 as shown at
55
https://oss.oracle.com/licenses/upl.
@@ -120,6 +120,11 @@
120120
<groupId>com.fasterxml.jackson.core</groupId>
121121
<artifactId>jackson-databind</artifactId>
122122
</exclusion>
123+
<!-- exclude javax based XML binding -->
124+
<exclusion>
125+
<groupId>javax.xml.bind</groupId>
126+
<artifactId>jaxb-api</artifactId>
127+
</exclusion>
123128
</exclusions>
124129
</dependency>
125130

@@ -410,7 +415,7 @@
410415
<Private-Package>*.internal.*
411416
</Private-Package>
412417
<Import-Package>
413-
!com.tangosol.application.*,!com.tangosol.coherence.*,!com.tangosol.injection.*,!com.oracle.common.net.exabus.*,com.tangosol.*;version="[${project.version.short},${project.version.next.short})",com.tangosol.io.*,com.tangosol.net.*,com.tangosol.run.xml.*,com.tangosol.util.*,com.oracle.common.net.*,!com.oracle.common.*,!com.oracle.coherence.common.*,org.glassfish.jersey.*;version=${jersey.version},com.fasterxml.jackson.*;version=${jackson.version}
418+
!com.tangosol.application.*,!com.tangosol.coherence.*,!com.tangosol.injection.*,!com.oracle.common.net.exabus.*,com.tangosol.*;version="[${project.version.short},${project.version.next.short})",com.tangosol.io.*,com.tangosol.net.*,com.tangosol.run.xml.*,com.tangosol.util.*,com.oracle.common.net.*,!com.oracle.common.*,!com.oracle.coherence.common.*,org.glassfish.jersey.*;version=${jersey.version},com.fasterxml.jackson.annotation;version=${jackson.annotations.version},com.fasterxml.jackson.*;version=${jackson.version}
414419
</Import-Package>
415420
</instructions>
416421
</configuration>

0 commit comments

Comments
 (0)