From 360497ca263aca43fda79b0f173e2b6f25f72556 Mon Sep 17 00:00:00 2001
From: Mahmoud Ben Hassine <mbenhassine@vmware.com>
Date: Wed, 12 Aug 2020 15:32:30 +0200
Subject: [PATCH] Remove unnecessary dependency to spring-data-neo4j

As of this commit, Neo4j support in Spring Batch
does not rely on Spring Data Neo4j, it uses Neo4j
APIs directly.

This commit removes the dependency to spring-data-neo4j
and replaces it with a direct (optional) dependency
to neo4j-ogm-core.
---
 build.gradle | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/build.gradle b/build.gradle
index 040b48256..6c3f36e66 100644
--- a/build.gradle
+++ b/build.gradle
@@ -55,7 +55,6 @@ allprojects {
 		springDataGemfireVersion = '2.4.0-SNAPSHOT'
 		springDataJpaVersion = '2.4.0-SNAPSHOT'
 		springDataMongodbVersion = '3.1.0-SNAPSHOT'
-		springDataNeo4jVersion = '5.4.0-SNAPSHOT'
 		springIntegrationVersion = '5.4.0-SNAPSHOT'
 		springKafkaVersion = '2.6.0-SNAPSHOT'
 		springLdapVersion = '2.3.3.RELEASE'
@@ -108,6 +107,7 @@ allprojects {
 		assertjVersion='3.16.1'
 		mongoDbDriverSyncVersion='4.0.4'
 		testcontainersVersion='1.14.3'
+		neo4jVersion='3.2.14'
 	}
 
 	apply plugin: 'idea'
@@ -372,10 +372,8 @@ project('spring-batch-infrastructure') {
 		optional "org.springframework:spring-tx:$springVersion"
 		optional "org.springframework.data:spring-data-commons:$springDataCommonsVersion"
 		optional "org.springframework.data:spring-data-mongodb:$springDataMongodbVersion"
-		optional ("org.springframework.data:spring-data-neo4j:$springDataNeo4jVersion") {
-			exclude group: "org.springframework", module: "spring-aspects"
-		}
 		optional "org.springframework.data:spring-data-gemfire:$springDataGemfireVersion"
+		optional "org.neo4j:neo4j-ogm-core:$neo4jVersion"
 		compile("com.fasterxml.woodstox:woodstox-core:$woodstoxVersion") { dep ->
 			optional dep
 			exclude group: 'stax', module: 'stax-api'
@@ -396,14 +394,6 @@ project('spring-batch-infrastructure') {
 		testCompileOnly("com.google.code.findbugs:jsr305:3.0.2")
 	}
 
-	if (project.hasProperty('platformVersion')) {
-		def dataNeo4jVersion = dependencyManagement.springIoTestRuntime.managedVersions['org.springframework.data:spring-data-neo4j']
-		if (dataNeo4jVersion?.startsWith('4.')) {
-			tasks.withType(Test).matching { it.name =~ "springIoJdk.Test" }.all {
-				exclude '**/Neo4jItemReaderTests.class'
-			}
-		}
-	}
 }
 
 project('spring-batch-docs') {