Merge pull request #26236 from vespa-engine/balder/fresh-jackson

Fresh jackson 2.14.2

5 files changed, 21 insertions, 16 deletions

diff --git a/cloud-tenant-base-dependencies-enforcer/pom.xml b/cloud-tenant-base-dependencies-enforcer/pom.xml
index 82842a8c28b..14b39867348 100644
--- a/cloud-tenant-base-dependencies-enforcer/pom.xml
+++ b/cloud-tenant-base-dependencies-enforcer/pom.xml
@@ -38,8 +38,8 @@
         <aopalliance.version>1.0</aopalliance.version>
         <guava.version>27.1-jre</guava.version>
         <guice.version>4.2.3</guice.version>
-        <jackson2.version>2.13.4</jackson2.version>
-        <jackson-databind.version>2.13.4.2</jackson-databind.version>
+        <jackson2.version>2.14.2</jackson2.version>
+        <jackson-databind.version>2.14.2</jackson-databind.version>
         <javax.inject.version>1</javax.inject.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version>
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index d7600cac927..a95e0061992 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -243,8 +243,8 @@
         <error-prone-annotations.version>2.18.0</error-prone-annotations.version>
         <guava.version>27.1-jre</guava.version>
         <guice.version>4.2.3</guice.version>
-        <jackson2.version>2.13.4</jackson2.version>
-        <jackson-databind.version>2.13.4.2</jackson-databind.version>
+        <jackson2.version>2.14.2</jackson2.version>
+        <jackson-databind.version>2.14.2</jackson-databind.version>
         <javax.inject.version>1</javax.inject.version>
         <javax.servlet-api.version>3.1.0</javax.servlet-api.version>
         <javax.ws.rs-api.version>2.0.1</javax.ws.rs-api.version>
diff --git a/maven-plugins/allowed-maven-dependencies.txt b/maven-plugins/allowed-maven-dependencies.txt
index a3cc4cc7045..5272dd21a31 100644
--- a/maven-plugins/allowed-maven-dependencies.txt
+++ b/maven-plugins/allowed-maven-dependencies.txt
@@ -3,9 +3,9 @@
 #[non-test]
 # Contains dependencies that are not used exclusively in 'test' scope
 aopalliance:aopalliance:1.0
-com.fasterxml.jackson.core:jackson-annotations:2.13.4
-com.fasterxml.jackson.core:jackson-core:2.13.4
-com.fasterxml.jackson.core:jackson-databind:2.13.4.2
+com.fasterxml.jackson.core:jackson-annotations:2.14.2
+com.fasterxml.jackson.core:jackson-core:2.14.2
+com.fasterxml.jackson.core:jackson-databind:2.14.2
 com.google.errorprone:error_prone_annotations:2.18.0
 com.google.guava:failureaccess:1.0.1
 com.google.guava:guava:27.1-jre
diff --git a/parent/pom.xml b/parent/pom.xml
index 273e9b0ef8f..f5bb4ab8855 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -468,6 +468,11 @@
                 <version>3.10.0</version>
             </dependency>
             <dependency>
+                <groupId>com.fasterxml.jackson.dataformat</groupId>
+                <artifactId>jackson-dataformat-cbor</artifactId>
+                <version>${jackson2.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>com.github.cverges.expect4j</groupId>
                 <artifactId>expect4j</artifactId>
                 <version>1.6</version>
diff --git a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
index 5591db26054..d5166a7e22f 100644
--- a/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
+++ b/vespa-dependencies-enforcer/allowed-maven-dependencies.txt
@@ -14,15 +14,15 @@ com.amazonaws:aws-java-sdk-ssm:1.12.331
 com.amazonaws:aws-java-sdk-sts:1.12.331
 com.amazonaws:jmespath-java:1.12.331
 com.auth0:java-jwt:3.10.0
-com.fasterxml.jackson.core:jackson-annotations:2.13.4
-com.fasterxml.jackson.core:jackson-core:2.13.4
-com.fasterxml.jackson.core:jackson-databind:2.13.4.2
-com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.6
-com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.4
-com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.4
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.13.4
-com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.13.4
-com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.13.4
+com.fasterxml.jackson.core:jackson-annotations:2.14.2
+com.fasterxml.jackson.core:jackson-core:2.14.2
+com.fasterxml.jackson.core:jackson-databind:2.14.2
+com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.14.2
+com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.14.2
+com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.14.2
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-base:2.14.2
+com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider:2.14.2
+com.fasterxml.jackson.module:jackson-module-jaxb-annotations:2.14.2
 com.github.spotbugs:spotbugs-annotations:3.1.9
 com.google.code.findbugs:jsr305:3.0.2
 com.google.errorprone:error_prone_annotations:2.18.0