From 89c7579fcdb05a1865ed1f35983e1fcb2b28a836 Mon Sep 17 00:00:00 2001
From: John Blum <jblum@vmware.com>
Date: Tue, 21 Sep 2021 19:34:31 -0700
Subject: [PATCH] Prepare for Jakarta EE 9 migration.

Re-arrange spring dependency declarations.

Remove unnecessary javax.interceptor:javax.interceptor-api and javax.annotation:javax.annotation-api dependencies.

Declare jakarta.enterprise:jakarta.enterprise.cdi-api:3.0.0 dependency (commented out) in preparation for Jarkata EE 9 migration.

Add exclusion on the javax.inject:javax.inject dependency to the org.apache.cassandra:cassandra-all dependency.

Resolves #1170.
---
 spring-data-cassandra/pom.xml | 39 ++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/spring-data-cassandra/pom.xml b/spring-data-cassandra/pom.xml
index 1bee482a0..20a9110a1 100644
--- a/spring-data-cassandra/pom.xml
+++ b/spring-data-cassandra/pom.xml
@@ -21,9 +21,9 @@
 	</url>
 
 	<properties>
-		<validation>1.1.0.Final</validation>
 		<java-module-name>spring.data.cassandra</java-module-name>
 		<project.root>${basedir}/..</project.root>
+		<jakarta.enterprise.cdi-api.version>3.0.0</jakarta.enterprise.cdi-api.version>
 	</properties>
 
 	<dependencies>
@@ -31,7 +31,7 @@
 		<!-- Spring -->
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-context</artifactId>
+			<artifactId>spring-core</artifactId>
 		</dependency>
 
 		<dependency>
@@ -41,12 +41,7 @@
 
 		<dependency>
 			<groupId>org.springframework</groupId>
-			<artifactId>spring-core</artifactId>
-		</dependency>
-
-		<dependency>
-			<groupId>org.springframework</groupId>
-			<artifactId>spring-tx</artifactId>
+			<artifactId>spring-context</artifactId>
 		</dependency>
 
 		<dependency>
@@ -54,6 +49,11 @@
 			<artifactId>spring-expression</artifactId>
 		</dependency>
 
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-tx</artifactId>
+		</dependency>
+
 		<!-- Spring Data -->
 		<dependency>
 			<groupId>${project.groupId}</groupId>
@@ -115,13 +115,6 @@
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>javax.interceptor</groupId>
-			<artifactId>javax.interceptor-api</artifactId>
-			<version>1.2.1</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>javax.enterprise</groupId>
 			<artifactId>cdi-api</artifactId>
@@ -130,12 +123,14 @@
 			<optional>true</optional>
 		</dependency>
 
+<!--
 		<dependency>
-			<groupId>javax.annotation</groupId>
-			<artifactId>javax.annotation-api</artifactId>
-			<version>${javax-annotation-api}</version>
-			<scope>test</scope>
+			<groupId>jakarta.enterprise</groupId>
+			<artifactId>jakarta.enterprise.cdi-api</artifactId>
+			<version>${jakarta.enterprise.cdi-api.version}</version>
+			<optional>true</optional>
 		</dependency>
+-->
 
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
@@ -147,6 +142,12 @@
 		<dependency>
 			<groupId>org.apache.cassandra</groupId>
 			<artifactId>cassandra-all</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.inject</groupId>
+					<artifactId>javax.inject</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>