From 81b715b3d2ea06e0216b13bf5c7a79a31b52e4e6 Mon Sep 17 00:00:00 2001
From: Soby Chacko <soby.chacko@broadcom.com>
Date: Tue, 22 Apr 2025 19:09:45 -0400
Subject: [PATCH] Update dependencies and cleanup misc version management

- Extract common dependency versions to properties in root pom
  - Added jsoup.version property
  - Added mockk-jvm.version property
  - Added neo4j-cypher-dsl-bom.version property
- Update dependency versions:
  - djl from 0.30.0 to 0.32.0
  - oci-sdk from 3.51.0 to 3.63.1
  - azure-identity from 1.14.0 to 1.15.4
- Remove hardcoded versions for consistency
- Minor polishing

Signed-off-by: Soby Chacko <soby.chacko@broadcom.com>
---
 .../pom.xml                                            |  3 ---
 document-readers/jsoup-reader/pom.xml                  |  2 +-
 pom.xml                                                | 10 +++++++---
 spring-ai-client-chat/pom.xml                          |  2 +-
 spring-ai-model/pom.xml                                |  2 +-
 vector-stores/spring-ai-azure-cosmos-db-store/pom.xml  |  2 +-
 vector-stores/spring-ai-gemfire-store/pom.xml          |  1 -
 vector-stores/spring-ai-mongodb-atlas-store/pom.xml    |  3 ++-
 vector-stores/spring-ai-neo4j-store/pom.xml            |  2 +-
 9 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/pom.xml b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/pom.xml
index 206c7c709..ac407bd82 100644
--- a/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/pom.xml
+++ b/auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory-neo4j/pom.xml
@@ -21,7 +21,6 @@
 		<developerConnection>git@github.com:spring-projects/spring-ai.git</developerConnection>
 	</scm>
 
-
 	<dependencies>
 
 		<dependency>
@@ -30,8 +29,6 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 
-
-
 		<!-- Boot dependencies -->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
diff --git a/document-readers/jsoup-reader/pom.xml b/document-readers/jsoup-reader/pom.xml
index dd4b65130..610b29ffa 100644
--- a/document-readers/jsoup-reader/pom.xml
+++ b/document-readers/jsoup-reader/pom.xml
@@ -48,7 +48,7 @@
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
-			<version>1.18.3</version>
+			<version>${jsoup.version}</version>
 		</dependency>
 
 		<!-- TESTING -->
diff --git a/pom.xml b/pom.xml
index 7fdacd8c8..17370d94a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -265,15 +265,18 @@
 		<bedrockruntime.version>2.29.29</bedrockruntime.version>
 		<awssdk.version>2.29.29</awssdk.version>
 
-		<djl.version>0.30.0</djl.version>
+		<djl.version>0.32.0</djl.version>
 		<onnxruntime.version>1.19.2</onnxruntime.version>
-		<oci-sdk-version>3.51.0</oci-sdk-version>
+		<oci-sdk-version>3.63.1</oci-sdk-version>
 		<com.google.cloud.version>26.59.0</com.google.cloud.version>
 		<ibm.sdk.version>9.20.0</ibm.sdk.version>
 		<jsonschema.version>4.37.0</jsonschema.version>
 		<swagger-annotations.version>2.2.25</swagger-annotations.version>
+		<mockk-jvm.version>1.13.13</mockk-jvm.version>
 		<spring-cloud-bindings.version>2.0.3</spring-cloud-bindings.version>
 
+		<jsoup.version>1.18.3</jsoup.version>
+
 		<!-- Protobuf -->
 		<protobuf-java.version>3.25.2</protobuf-java.version>
 
@@ -291,7 +294,7 @@
 		<fastjson2.version>2.0.46</fastjson2.version>
 		<azure-core.version>1.53.0</azure-core.version>
 		<azure-json.version>1.3.0</azure-json.version>
-		<azure-identity.version>1.14.0</azure-identity.version>
+		<azure-identity.version>1.15.4</azure-identity.version>
 		<azure-search.version>11.7.6</azure-search.version>
 		<azure-cosmos.version>5.17.1</azure-cosmos.version>
 		<weaviate-client.version>5.2.0</weaviate-client.version>
@@ -303,6 +306,7 @@
 		<commonmark.version>0.22.0</commonmark.version>
 
 		<couchbase.version>3.8.0</couchbase.version>
+		<neo4j-cypher-dsl-bom.version>2024.5.1</neo4j-cypher-dsl-bom.version>
 
 		<!-- testing dependencies -->
 		<okhttp3.version>4.12.0</okhttp3.version>
diff --git a/spring-ai-client-chat/pom.xml b/spring-ai-client-chat/pom.xml
index e296e6489..ed6faabf6 100644
--- a/spring-ai-client-chat/pom.xml
+++ b/spring-ai-client-chat/pom.xml
@@ -135,7 +135,7 @@
 		<dependency>
 			<groupId>io.mockk</groupId>
 			<artifactId>mockk-jvm</artifactId>
-			<version>1.13.13</version>
+			<version>${mockk-jvm.version}</version>
 			<scope>test</scope>
 		</dependency>
 
diff --git a/spring-ai-model/pom.xml b/spring-ai-model/pom.xml
index 500e3cfd2..3475af022 100644
--- a/spring-ai-model/pom.xml
+++ b/spring-ai-model/pom.xml
@@ -134,7 +134,7 @@
 		<dependency>
 			<groupId>io.mockk</groupId>
 			<artifactId>mockk-jvm</artifactId>
-			<version>1.13.13</version>
+			<version>${mockk-jvm.version}</version>
 			<scope>test</scope>
 		</dependency>
 		
diff --git a/vector-stores/spring-ai-azure-cosmos-db-store/pom.xml b/vector-stores/spring-ai-azure-cosmos-db-store/pom.xml
index 154167f09..cf65826d4 100644
--- a/vector-stores/spring-ai-azure-cosmos-db-store/pom.xml
+++ b/vector-stores/spring-ai-azure-cosmos-db-store/pom.xml
@@ -50,7 +50,7 @@
 		<dependency>
 			<groupId>com.azure</groupId>
 			<artifactId>azure-identity</artifactId>
-			<version>1.15.4</version> <!-- or the latest version -->
+			<version>${azure-identity.version}</version> <!-- or the latest version -->
 		</dependency>
 		<dependency>
 			<groupId>org.springframework.ai</groupId>
diff --git a/vector-stores/spring-ai-gemfire-store/pom.xml b/vector-stores/spring-ai-gemfire-store/pom.xml
index 13afc1287..25449c510 100644
--- a/vector-stores/spring-ai-gemfire-store/pom.xml
+++ b/vector-stores/spring-ai-gemfire-store/pom.xml
@@ -91,7 +91,6 @@
         <dependency>
             <groupId>org.awaitility</groupId>
             <artifactId>awaitility</artifactId>
-            <version>3.0.0</version>
             <scope>test</scope>
         </dependency>
 		<dependency>
diff --git a/vector-stores/spring-ai-mongodb-atlas-store/pom.xml b/vector-stores/spring-ai-mongodb-atlas-store/pom.xml
index 0c3956762..f2e1014b9 100644
--- a/vector-stores/spring-ai-mongodb-atlas-store/pom.xml
+++ b/vector-stores/spring-ai-mongodb-atlas-store/pom.xml
@@ -73,7 +73,8 @@
             <groupId>org.testcontainers</groupId>
             <artifactId>junit-jupiter</artifactId>
             <scope>test</scope>
-        </dependency><dependency>
+        </dependency>
+		<dependency>
             <groupId>org.testcontainers</groupId>
             <artifactId>mongodb</artifactId>
 			<version>1.20.2</version>
diff --git a/vector-stores/spring-ai-neo4j-store/pom.xml b/vector-stores/spring-ai-neo4j-store/pom.xml
index 2739fb39c..0f9513843 100644
--- a/vector-stores/spring-ai-neo4j-store/pom.xml
+++ b/vector-stores/spring-ai-neo4j-store/pom.xml
@@ -46,7 +46,7 @@
 			<dependency>
 				<groupId>org.neo4j</groupId>
 				<artifactId>neo4j-cypher-dsl-bom</artifactId>
-				<version>2024.5.1</version>
+				<version>${neo4j-cypher-dsl-bom.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>