From fdffdc7bd3a8bc9f13e2d25384c6ff179987325a Mon Sep 17 00:00:00 2001
From: Achal Shah <achals@gmail.com>
Date: Thu, 31 Mar 2022 10:16:17 -0700
Subject: [PATCH 1/3] fix: Use a single version of jackson libraries and
 upgrade to 2.12.6.1

Signed-off-by: Achal Shah <achals@gmail.com>
---
 java/common/pom.xml  | 4 ++--
 java/pom.xml         | 1 +
 java/serving/pom.xml | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/java/common/pom.xml b/java/common/pom.xml
index 6b041d444c..26f2412004 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -75,12 +75,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.12.6.1</version>
+            <version>${jackson.version}</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.10.1</version>
+            <version>${jackson.version}</version>
         </dependency>
 
         <!-- Logging -->
diff --git a/java/pom.xml b/java/pom.xml
index c11e7f7df2..3ef1e74397 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -64,6 +64,7 @@
         <swagger.core.version>1.5.24</swagger.core.version>
         <okhttp.version>3.14.7</okhttp.version>
         <commons.lang3.version>3.10</commons.lang3.version>
+        <jackson.version>2.12.6.1</jackson.version>
         <javax.xml.bind.version>2.3.1</javax.xml.bind.version>
         <javax.annotation.version>1.3.2</javax.annotation.version>
         <javax.validation.version>2.0.1.Final</javax.validation.version>
diff --git a/java/serving/pom.xml b/java/serving/pom.xml
index 8c81dfa7e7..47a636d7d5 100644
--- a/java/serving/pom.xml
+++ b/java/serving/pom.xml
@@ -301,13 +301,13 @@
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>
       <artifactId>jackson-dataformat-yaml</artifactId>
-      <version>2.11.0</version>
+      <version>${jackson.version}</version>
     </dependency>
 
     <dependency>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-annotations</artifactId>
-      <version>2.12.2</version>
+      <version>${jackson.version}</version>
     </dependency>
 
     <dependency>

From fbbc2f7b0da9c7837d48144a5e8fa6cb82a9c1c9 Mon Sep 17 00:00:00 2001
From: Achal Shah <achals@gmail.com>
Date: Thu, 31 Mar 2022 10:26:50 -0700
Subject: [PATCH 2/3] jackson-datatype-jsr310

Signed-off-by: Achal Shah <achals@gmail.com>
---
 java/common/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/common/pom.xml b/java/common/pom.xml
index 26f2412004..726a5572ad 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -80,7 +80,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>${jackson.version}</version>
+            <version>2.12.6</version>
         </dependency>
 
         <!-- Logging -->

From aabbee8e7b343e128bdb58c9feec3bf8cc2a8ed8 Mon Sep 17 00:00:00 2001
From: Achal Shah <achals@gmail.com>
Date: Thu, 31 Mar 2022 10:34:48 -0700
Subject: [PATCH 3/3] ugh

Signed-off-by: Achal Shah <achals@gmail.com>
---
 java/common/pom.xml | 4 ++--
 java/pom.xml        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/java/common/pom.xml b/java/common/pom.xml
index 726a5572ad..6b580880f1 100644
--- a/java/common/pom.xml
+++ b/java/common/pom.xml
@@ -75,12 +75,12 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>${jackson.version}</version>
+            <version>2.12.6.1</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.datatype</groupId>
             <artifactId>jackson-datatype-jsr310</artifactId>
-            <version>2.12.6</version>
+            <version>${jackson.version}</version>
         </dependency>
 
         <!-- Logging -->
diff --git a/java/pom.xml b/java/pom.xml
index 3ef1e74397..681f770400 100644
--- a/java/pom.xml
+++ b/java/pom.xml
@@ -64,7 +64,7 @@
         <swagger.core.version>1.5.24</swagger.core.version>
         <okhttp.version>3.14.7</okhttp.version>
         <commons.lang3.version>3.10</commons.lang3.version>
-        <jackson.version>2.12.6.1</jackson.version>
+        <jackson.version>2.12.6</jackson.version>
         <javax.xml.bind.version>2.3.1</javax.xml.bind.version>
         <javax.annotation.version>1.3.2</javax.annotation.version>
         <javax.validation.version>2.0.1.Final</javax.validation.version>