From e79b273e73a9a4f75231a4d42e61c9a4a07640f9 Mon Sep 17 00:00:00 2001
From: Anders Swanson <anders.swanson@oracle.com>
Date: Thu, 14 Nov 2024 10:12:09 -0800
Subject: [PATCH 1/2] Dependency updates

Signed-off-by: Anders Swanson <anders.swanson@oracle.com>
---
 database/starters/pom.xml |  9 +--------
 spring-cloud-oci/pom.xml  | 41 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/database/starters/pom.xml b/database/starters/pom.xml
index 80a15443..d2694607 100644
--- a/database/starters/pom.xml
+++ b/database/starters/pom.xml
@@ -82,7 +82,7 @@
     <micrometer-tracing.version>1.1.6</micrometer-tracing.version>
     <junit5.version>5.9.3</junit5.version>
     <testcontainers.version>1.20.1</testcontainers.version>
-    <jackson.version>2.15.3</jackson.version>
+
     <jakarta.json-api.version>2.1.3</jakarta.json-api.version>
     <jakarta.json.bind-api.version>3.0.1</jakarta.json.bind-api.version>
     <orajsoda.version>1.1.7.3</orajsoda.version>
@@ -186,13 +186,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>com.fasterxml.jackson</groupId>
-        <artifactId>jackson-bom</artifactId>
-        <version>${jackson.version}</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
       <dependency>
         <groupId>org.junit</groupId>
         <artifactId>junit-bom</artifactId>
diff --git a/spring-cloud-oci/pom.xml b/spring-cloud-oci/pom.xml
index 33ba65ed..d1a2d23d 100644
--- a/spring-cloud-oci/pom.xml
+++ b/spring-cloud-oci/pom.xml
@@ -80,6 +80,8 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
         <oracle.nosql.driver.version>5.4.15</oracle.nosql.driver.version>
         <jakarta-mail.version>2.0.3</jakarta-mail.version>
         <oci-sdk.version>3.53.1</oci-sdk.version>
+        <jackson.version>2.17.1</jackson.version>
+        <netty.version>4.1.115.Final</netty.version>
         <maven.compiler.source>17</maven.compiler.source>
         <maven.compiler.target>17</maven.compiler.target>
         <maven-source-plugin.version>3.3.1</maven-source-plugin.version>
@@ -129,7 +131,11 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
                 <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
                 <version>${springdoc-openapi-starter-webmvc-ui.version}</version>
             </dependency>
-
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-common</artifactId>
+                <version>${netty.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>
                 <artifactId>commons-lang3</artifactId>
@@ -161,7 +167,38 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-
+            <dependency>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>${jackson.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.module</groupId>
+                <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.datatype</groupId>
+                <artifactId>jackson-datatype-jsr310</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-core</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-annotations</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>com.fasterxml.jackson.core</groupId>
+                <artifactId>jackson-databind</artifactId>
+                <version>${jackson.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>

From e6cacab69baf933765bc995bb8a87410a22199d0 Mon Sep 17 00:00:00 2001
From: Anders Swanson <anders.swanson@oracle.com>
Date: Thu, 14 Nov 2024 10:18:51 -0800
Subject: [PATCH 2/2] Dependency updates

Signed-off-by: Anders Swanson <anders.swanson@oracle.com>
---
 database/starters/pom.xml | 8 ++++++++
 spring-cloud-oci/pom.xml  | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/database/starters/pom.xml b/database/starters/pom.xml
index d2694607..5b1d72d1 100644
--- a/database/starters/pom.xml
+++ b/database/starters/pom.xml
@@ -73,6 +73,7 @@
     <maven.compiler.source>${java.version}</maven.compiler.source>
 
     <okafka.version>23.5.0.0</okafka.version>
+    <jackson.version>2.17.1</jackson.version>
     <kafka-clients.version>3.7.1</kafka-clients.version>
     <oracle.version>23.6.0.24.10</oracle.version>
     <osdt.version>21.15.0.0</osdt.version>
@@ -102,6 +103,13 @@
 
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>com.fasterxml.jackson</groupId>
+        <artifactId>jackson-bom</artifactId>
+        <version>${jackson.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
       <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-configuration-processor</artifactId>
diff --git a/spring-cloud-oci/pom.xml b/spring-cloud-oci/pom.xml
index d1a2d23d..0b9c3290 100644
--- a/spring-cloud-oci/pom.xml
+++ b/spring-cloud-oci/pom.xml
@@ -167,13 +167,6 @@ Licensed under the Universal Permissive License v 1.0 as shown at https://oss.or
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>com.fasterxml.jackson</groupId>
-                <artifactId>jackson-bom</artifactId>
-                <version>${jackson.version}</version>
-                <type>pom</type>
-                <scope>import</scope>
-            </dependency>
             <dependency>
                 <groupId>com.fasterxml.jackson.module</groupId>
                 <artifactId>jackson-module-jakarta-xmlbind-annotations</artifactId>