From 4363def3bd3a988b01dc3fca5f013a8d11cd71be Mon Sep 17 00:00:00 2001
From: Michael Simons <michael@simons.ac>
Date: Thu, 24 Mar 2022 12:53:25 +0100
Subject: [PATCH] Revert "Disable dependency convergence in enforcer plugin."

This reverts commit 564b2b56d6c9366c704798015facc152470392bc.
---
 pom.xml | 98 +++++++++++++++++++++++++++++++++++++++++----------------
 1 file changed, 71 insertions(+), 27 deletions(-)

diff --git a/pom.xml b/pom.xml
index 1207b63c2..c448c0419 100644
--- a/pom.xml
+++ b/pom.xml
@@ -73,12 +73,16 @@
 		<asciidoctorj-diagram.version>2.1.0</asciidoctorj-diagram.version>
 
 		<byte-buddy.version>1.11.0</byte-buddy.version>
+		<cdi>3.0.1</cdi>
+		<checkstyle.skip>${skipTests}</checkstyle.skip>
 		<checkstyle.version>8.40</checkstyle.version>
 		<cypher-dsl.version>2022.2.0</cypher-dsl.version>
 		<dist.id>spring-data-neo4j</dist.id>
 		<dist.key>SDNEO4J</dist.key>
 		<flatten-maven-plugin.version>1.2.5</flatten-maven-plugin.version>
 		<jacoco-maven-plugin.version>0.8.7</jacoco-maven-plugin.version>
+		<jakarta.interceptor-api.version>2.0.1</jakarta.interceptor-api.version>
+		<jakarta.transaction-api.version>2.0.0</jakarta.transaction-api.version>
 		<java-module-name>spring.data.neo4j</java-module-name>
 		<java.version>17</java.version>
 		<jaxb.version>2.3.1</jaxb.version>
@@ -99,7 +103,7 @@
 		<maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
 		<maven.compiler.release>${java.version}</maven.compiler.release>
 		<mockito>${mockito.version}</mockito>
-		<mockito.version>4.0.0</mockito.version>
+		<mockito.version>4.4.0</mockito.version>
 		<neo4j-java-driver.version>4.4.5</neo4j-java-driver.version>
 		<neo4j.version>4.3.6</neo4j.version>
 		<objenesis.version>3.0.1</objenesis.version>
@@ -109,16 +113,20 @@
 		<reactive-streams.version>1.2.1</reactive-streams.version>
 		<skipArchitectureTests>true</skipArchitectureTests>
 		<skipIntegrationTests>${skipTests}</skipIntegrationTests>
-		<checkstyle.skip>${skipTests}</checkstyle.skip>
 
 		<skipUnitTests>${skipTests}</skipUnitTests>
-		<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
 
 		<spring-data-commons-docs.dir>../../../../spring-data-commons/src/main/asciidoc</spring-data-commons-docs.dir>
+		<springdata.commons>3.0.0-SNAPSHOT</springdata.commons>
 	</properties>
 
 	<dependencyManagement>
 		<dependencies>
+			<dependency>
+				<groupId>com.google.code.findbugs</groupId>
+				<artifactId>jsr305</artifactId>
+				<version>3.0.2</version>
+			</dependency>
 			<dependency>
 				<groupId>eu.michael-simons.neo4j</groupId>
 				<artifactId>junit-jupiter-causal-cluster-testcontainer-extension</artifactId>
@@ -137,6 +145,11 @@
 				<artifactId>rxjava</artifactId>
 				<version>${rxjava2}</version>
 			</dependency>
+			<dependency>
+				<groupId>jakarta.interceptor</groupId>
+				<artifactId>jakarta.interceptor-api</artifactId>
+				<version>${jakarta.interceptor-api.version}</version>
+			</dependency>
 			<dependency>
 				<groupId>javax.xml.bind</groupId>
 				<artifactId>jaxb-api</artifactId>
@@ -153,6 +166,11 @@
 				<artifactId>byte-buddy-agent</artifactId>
 				<version>${byte-buddy.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>net.java.dev.jna</groupId>
+				<artifactId>jna</artifactId>
+				<version>5.8.0</version>
+			</dependency>
 			<dependency>
 				<groupId>org.apiguardian</groupId>
 				<artifactId>apiguardian-api</artifactId>
@@ -167,6 +185,12 @@
 				<groupId>org.neo4j</groupId>
 				<artifactId>neo4j-cypher-dsl</artifactId>
 				<version>${cypher-dsl.version}</version>
+				<exclusions>
+					<exclusion>
+						<artifactId>annotations</artifactId>
+						<groupId>org.jetbrains</groupId>
+					</exclusion>
+				</exclusions>
 			</dependency>
 			<dependency>
 				<groupId>org.neo4j.driver</groupId>
@@ -183,6 +207,11 @@
 				<artifactId>objenesis</artifactId>
 				<version>${objenesis.version}</version>
 			</dependency>
+			<dependency>
+				<groupId>org.osgi</groupId>
+				<artifactId>org.osgi.core</artifactId>
+				<version>6.0.0</version>
+			</dependency>
 			<dependency>
 				<groupId>org.slf4j</groupId>
 				<artifactId>slf4j-api</artifactId>
@@ -209,6 +238,18 @@
 			<artifactId>jackson-databind</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.querydsl</groupId>
+			<artifactId>querydsl-core</artifactId>
+			<version>${querydsl}</version>
+			<scope>provided</scope>
+			<exclusions>
+				<exclusion>
+					<artifactId>annotations</artifactId>
+					<groupId>org.jetbrains</groupId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 		<dependency>
 			<groupId>eu.michael-simons.neo4j</groupId>
 			<artifactId>junit-jupiter-causal-cluster-testcontainer-extension</artifactId>
@@ -251,32 +292,32 @@
 		<dependency>
 			<groupId>jakarta.transaction</groupId>
 			<artifactId>jakarta.transaction-api</artifactId>
-			<version>2.0.0</version>
+			<version>${jakarta.transaction-api.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>org.apiguardian</groupId>
-			<artifactId>apiguardian-api</artifactId>
+			<groupId>org.apache.openwebbeans</groupId>
+			<artifactId>openwebbeans-impl</artifactId>
+			<version>${webbeans}</version>
+			<classifier>jakarta</classifier>
+			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-se</artifactId>
-			<classifier>jakarta</classifier>
 			<version>${webbeans}</version>
+			<classifier>jakarta</classifier>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.apache.openwebbeans</groupId>
 			<artifactId>openwebbeans-spi</artifactId>
-			<classifier>jakarta</classifier>
 			<version>${webbeans}</version>
+			<classifier>jakarta</classifier>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.apache.openwebbeans</groupId>
-			<artifactId>openwebbeans-impl</artifactId>
-			<classifier>jakarta</classifier>
-			<version>${webbeans}</version>
-			<scope>test</scope>
+			<groupId>org.apiguardian</groupId>
+			<artifactId>apiguardian-api</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
@@ -286,13 +327,13 @@
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
 			<artifactId>kotlin-stdlib</artifactId>
-			<optional>true</optional>
 			<exclusions>
 				<exclusion>
-					<groupId>org.jetbrains</groupId>
 					<artifactId>annotations</artifactId>
+					<groupId>org.jetbrains</groupId>
 				</exclusion>
 			</exclusions>
+			<optional>true</optional>
 		</dependency>
 		<dependency>
 			<groupId>org.jetbrains.kotlin</groupId>
@@ -354,6 +395,11 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+		<dependency>
+			<groupId>org.testcontainers</groupId>
+			<artifactId>neo4j</artifactId>
+			<scope>test</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.testcontainers</groupId>
 			<artifactId>testcontainers</artifactId>
@@ -361,22 +407,19 @@
 			<!-- Exclusion because there is a Spring Data parent dependency to a newer JUnit version -->
 			<exclusions>
 				<exclusion>
-					<groupId>junit</groupId>
 					<artifactId>junit</artifactId>
+					<groupId>junit</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>annotations</artifactId>
+					<groupId>org.jetbrains</groupId>
+				</exclusion>
+				<exclusion>
+					<artifactId>lombok</artifactId>
+					<groupId>org.projectlombok</groupId>
 				</exclusion>
 			</exclusions>
 		</dependency>
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>neo4j</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.querydsl</groupId>
-			<artifactId>querydsl-core</artifactId>
-			<version>${querydsl}</version>
-			<scope>provided</scope>
-		</dependency>
 	</dependencies>
 
 	<repositories>
@@ -575,6 +618,7 @@
 						</goals>
 						<configuration>
 							<rules>
+								<DependencyConvergence />
 								<requireMavenVersion>
 									<version>3.8.3</version>
 								</requireMavenVersion>