From 1cd241b44aefa9c9aa352e549d5bc59aad491a18 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Fri, 15 May 2020 14:20:02 +0200
Subject: [PATCH] #553 - Polishing.

Remove version overrides for Elasticsearch. Cleanup dependencies.
---
 elasticsearch/example/pom.xml | 11 -----------
 elasticsearch/pom.xml         | 23 ++++++++---------------
 elasticsearch/rest/pom.xml    | 12 +-----------
 3 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/elasticsearch/example/pom.xml b/elasticsearch/example/pom.xml
index de0c7ef6..edf4ecbd 100644
--- a/elasticsearch/example/pom.xml
+++ b/elasticsearch/example/pom.xml
@@ -18,17 +18,6 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-log4j2</artifactId>
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index 38331df4..fb109602 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -22,25 +22,18 @@
 	</modules>
 
 	<dependencies>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>org.springframework.boot</groupId>
+					<artifactId>spring-boot-starter-logging</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
+
 	</dependencies>
 
-	<profiles>
-		<profile>
-			<id>spring-data-next-releasetrain</id>
-			<properties>
-				<elasticsearch.version>6.8.2</elasticsearch.version>
-			</properties>
-		</profile>
-		<profile>
-			<id>spring-data-next-releasetrain-released</id>
-			<properties>
-				<elasticsearch.version>6.8.2</elasticsearch.version>
-			</properties>
-		</profile>
-	</profiles>
-
 </project>
diff --git a/elasticsearch/rest/pom.xml b/elasticsearch/rest/pom.xml
index bf623974..c7c3d2e9 100644
--- a/elasticsearch/rest/pom.xml
+++ b/elasticsearch/rest/pom.xml
@@ -18,21 +18,11 @@
 
 	<dependencies>
 
-		<dependency>
-			<groupId>org.springframework.boot</groupId>
-			<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-logging</artifactId>
-				</exclusion>
-			</exclusions>
-		</dependency>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-log4j2</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>