Skip to content

Commit 02f14ec

Browse files
frypfryp
committed
Bug 39053130 - [39052523->14.1.1.0.25] Update Jackson to 2.21.1 (14.1.1.0 cl 119133 --> 14.1.1.0 CE)
[git-p4: depot-paths = "//dev/coherence-ce/release/coherence-ce-v14.1.1.0/": change = 119156]
1 parent f7232ee commit 02f14ec

File tree

5 files changed

+21
-23
lines changed

5 files changed

+21
-23
lines changed

‎prj/coherence-management/pom.xml‎

Lines changed: 2 additions & 3 deletions
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.
@@ -34,7 +34,6 @@
3434
<dependency>
3535
<groupId>com.fasterxml.jackson.core</groupId>
3636
<artifactId>jackson-annotations</artifactId>
37-
<version>${jackson.version}</version>
3837
</dependency>
3938
<dependency>
4039
<groupId>com.fasterxml.jackson.core</groupId>
@@ -181,7 +180,7 @@
181180
<Export-Package>!*.internal.*,com.tangosol.coherence.management.*</Export-Package>
182181
<Private-Package>*.internal.*</Private-Package>
183182
<Import-Package>
184-
!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},org.glassfish.grizzly.*;version=${grizzly.version};resolution:=optional,org.simpleframework.*;version=${simpleframework.version};resolution:=optional,*;resolution:=optional
183+
!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},org.glassfish.grizzly.*;version=${grizzly.version};resolution:=optional,org.simpleframework.*;version=${simpleframework.version};resolution:=optional,*;resolution:=optional
185184
</Import-Package>
186185
</instructions>
187186
</configuration>

‎prj/coherence-metrics/pom.xml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright (c) 2000, 2025, Oracle and/or its affiliates.
4-
~
5-
~ Licensed under the Universal Permissive License v 1.0 as shown at
6-
~ https://oss.oracle.com/licenses/upl.
3+
Copyright (c) 2000, 2026, Oracle and/or its affiliates.
4+
5+
Licensed under the Universal Permissive License v 1.0 as shown at
6+
https://oss.oracle.com/licenses/upl.
77
-->
88
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -34,7 +34,6 @@
3434
<dependency>
3535
<groupId>com.fasterxml.jackson.core</groupId>
3636
<artifactId>jackson-annotations</artifactId>
37-
<version>${jackson.version}</version>
3837
</dependency>
3938
<dependency>
4039
<groupId>com.fasterxml.jackson.core</groupId>
@@ -183,7 +182,7 @@
183182
<Export-Package>!*.internal.*,com.tangosol.coherence.metrics.*</Export-Package>
184183
<Private-Package>*.internal.*</Private-Package>
185184
<Import-Package>
186-
!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},org.glassfish.grizzly.*;version=${grizzly.version};resolution:=optional,org.simpleframework.*;version=${simpleframework.version};resolution:=optional,*;resolution:=optional
185+
!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},org.glassfish.grizzly.*;version=${grizzly.version};resolution:=optional,org.simpleframework.*;version=${simpleframework.version};resolution:=optional,*;resolution:=optional
187186
</Import-Package>
188187
</instructions>
189188
</configuration>

‎prj/coherence-rest/pom.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright (c) 2000, 2025, Oracle and/or its affiliates.
4-
~
5-
~ Licensed under the Universal Permissive License v 1.0 as shown at
6-
~ https://oss.oracle.com/licenses/upl.
3+
Copyright (c) 2000, 2026, Oracle and/or its affiliates.
4+
5+
Licensed under the Universal Permissive License v 1.0 as shown at
6+
https://oss.oracle.com/licenses/upl.
77
-->
88
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
99
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
@@ -347,7 +347,7 @@
347347
<Private-Package>*.internal.*,com.tangosol.coherence.asm.*
348348
</Private-Package>
349349
<Import-Package>
350-
!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},org.glassfish.grizzly.*;version=${grizzly.version};resolution:=optional,org.simpleframework.*;version=${simpleframework.version};resolution:=optional,*;resolution:=optional
350+
!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},org.glassfish.grizzly.*;version=${grizzly.version};resolution:=optional,org.simpleframework.*;version=${simpleframework.version};resolution:=optional,*;resolution:=optional
351351
</Import-Package>
352352
</instructions>
353353
</configuration>

‎prj/pom.xml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@
261261
<dependency>
262262
<groupId>com.fasterxml.jackson.core</groupId>
263263
<artifactId>jackson-annotations</artifactId>
264-
<version>${jackson.version}</version>
264+
<version>${jackson.annotations.version}</version>
265265
</dependency>
266266
<dependency>
267267
<groupId>com.fasterxml.jackson.core</groupId>
@@ -726,8 +726,10 @@
726726
<!-- Force use of a higher version of gson to get CVE fixes -->
727727
<gson.version>2.13.1</gson.version>
728728
<helidon.sitegen.version>2.0.0-RC1</helidon.sitegen.version>
729-
<jackson.version>2.15.0</jackson.version>
730-
<jackson.databind.version>2.15.0</jackson.databind.version>
729+
<jackson.version>2.21.1</jackson.version>
730+
<!-- sometimes Jackson annotations does not get 3rd digit release updates -->
731+
<jackson.annotations.version>2.21</jackson.annotations.version>
732+
<jackson.databind.version>${jackson.version}</jackson.databind.version>
731733
<jacoco.version>0.8.5</jacoco.version>
732734
<javaee.version>5</javaee.version>
733735
<javax.activation.version>1.1.1</javax.activation.version>

‎prj/test/functional/topics/pom.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
~ Copyright (c) 2000, 2021, Oracle and/or its affiliates.
4-
~
5-
~ Licensed under the Universal Permissive License v 1.0 as shown at
6-
~ http://oss.oracle.com/licenses/upl.
3+
Copyright (c) 2000, 2026, Oracle and/or its affiliates.
4+
5+
Licensed under the Universal Permissive License v 1.0 as shown at
6+
https://oss.oracle.com/licenses/upl.
77
-->
88
<project xmlns="http://maven.apache.org/POM/4.0.0"
99
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -66,13 +66,11 @@
6666
<dependency>
6767
<groupId>com.fasterxml.jackson.core</groupId>
6868
<artifactId>jackson-annotations</artifactId>
69-
<version>${jackson.version}</version>
7069
<scope>test</scope>
7170
</dependency>
7271
<dependency>
7372
<groupId>com.fasterxml.jackson.core</groupId>
7473
<artifactId>jackson-core</artifactId>
75-
<version>${jackson.version}</version>
7674
<scope>test</scope>
7775
</dependency>
7876
</dependencies>

0 commit comments

Comments
 (0)