From 7908d463bcd99f64c1cf11d94b78b89054da4894 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Fri, 24 Jun 2022 09:55:38 +0200
Subject: [PATCH] Adopt to changed Elasticsearch dependency property names.

SDE introduced new dependencies and changed version property names to address the older Rest High Level Client and the new Java Rest Client dependencies.

Closes #216
---
 .../springframework/data/release/infra/Dependencies.java    | 5 ++++-
 .../data/release/infra/ProjectDependencies.java             | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/release-tools/src/main/java/org/springframework/data/release/infra/Dependencies.java b/release-tools/src/main/java/org/springframework/data/release/infra/Dependencies.java
index c7e6c4e..5d52e33 100644
--- a/release-tools/src/main/java/org/springframework/data/release/infra/Dependencies.java
+++ b/release-tools/src/main/java/org/springframework/data/release/infra/Dependencies.java
@@ -118,9 +118,12 @@ public class Dependencies {
 
 	public static final Dependency COUCHBASE = Dependency.of("Couchbase Client", "com.couchbase.client:java-client");
 
-	public static final Dependency ELASTICSEARCH = Dependency.of("Elasticsearch",
+	public static final Dependency ELASTICSEARCH_RHLC = Dependency.of("Elasticsearch",
 			"org.elasticsearch.client:elasticsearch-rest-high-level-client");
 
+	public static final Dependency ELASTICSEARCH_REST_CLIENT = Dependency.of("Elasticsearch REST Client",
+			"org.elasticsearch.client:elasticsearch-rest-client");
+
 	public static final Dependency SPRING_LDAP = Dependency.of("Spring LDAP",
 			"org.springframework.ldap:spring-ldap-core");
 
diff --git a/release-tools/src/main/java/org/springframework/data/release/infra/ProjectDependencies.java b/release-tools/src/main/java/org/springframework/data/release/infra/ProjectDependencies.java
index d4d08db..bd49970 100644
--- a/release-tools/src/main/java/org/springframework/data/release/infra/ProjectDependencies.java
+++ b/release-tools/src/main/java/org/springframework/data/release/infra/ProjectDependencies.java
@@ -88,7 +88,11 @@ public class ProjectDependencies implements Streamable<ProjectDependencies.Proje
 
 		config.add(Projects.COUCHBASE, ProjectDependency.ofProperty("couchbase", Dependencies.COUCHBASE));
 
-		config.add(Projects.ELASTICSEARCH, ProjectDependency.ofProperty("elasticsearch", Dependencies.ELASTICSEARCH));
+		config.add(Projects.ELASTICSEARCH, ProjectDependency.ofProperty("elasticsearch", Dependencies.ELASTICSEARCH_RHLC));
+		config.add(Projects.ELASTICSEARCH,
+				ProjectDependency.ofProperty("elasticsearch-rhlc", Dependencies.ELASTICSEARCH_RHLC));
+		config.add(Projects.ELASTICSEARCH,
+				ProjectDependency.ofProperty("elasticsearch-java", Dependencies.ELASTICSEARCH_REST_CLIENT));
 
 		config.add(Projects.LDAP, ProjectDependency.ofProperty("spring-ldap", Dependencies.SPRING_LDAP));
 	}