From e66dac0cb10956e9f2f3556f174ced50d7888550 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@pivotal.io>
Date: Mon, 13 May 2019 11:59:02 +0200
Subject: [PATCH] DATAES-564 - Updated changelog.

---
 src/main/resources/META-INF/spring.schemas    |  4 +-
 src/main/resources/changelog.txt              | 19 +++++++++
 .../custom-method-repository-rest-test.xml    | 40 +++++++++----------
 .../elasticsearch-rest-template-test.xml      | 32 +++++++--------
 4 files changed, 57 insertions(+), 38 deletions(-)

diff --git a/src/main/resources/META-INF/spring.schemas b/src/main/resources/META-INF/spring.schemas
index 9df7fefa6..92df57132 100644
--- a/src/main/resources/META-INF/spring.schemas
+++ b/src/main/resources/META-INF/spring.schemas
@@ -1,2 +1,2 @@
-http\://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-3.2.xsd=org/springframework/data/elasticsearch/config/spring-elasticsearch-3.2.xsd
-http\://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd=org/springframework/data/elasticsearch/config/spring-elasticsearch-3.2.xsd
+http\://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch-3.2.xsd=org/springframework/data/elasticsearch/config/spring-elasticsearch-3.2.xsd
+http\://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd=org/springframework/data/elasticsearch/config/spring-elasticsearch-3.2.xsd
diff --git a/src/main/resources/changelog.txt b/src/main/resources/changelog.txt
index e74df7867..89f755c60 100644
--- a/src/main/resources/changelog.txt
+++ b/src/main/resources/changelog.txt
@@ -1,6 +1,25 @@
 Spring Data Elasticsearch Changelog
 ===================================
 
+Changes in version 3.2.0.M4 (2019-05-13)
+----------------------------------------
+* DATAES-576 - ElasticsearchTransportTemplateTests.shouldDeleteAcrossIndex(…) consistently fails.
+* DATAES-575 - Upgrade to Elasticsearch 6.7.2.
+* DATAES-572 - Indices created in ElasticsearchTemplateTests are retained after tests.
+* DATAES-570 - Use Delete By Query API for delete by query operations.
+* DATAES-569 - Add index operations to reactive Elasticsearch client.
+* DATAES-568 - MappingBuilder must use the @Field annotation's name attribute.
+* DATAES-566 - Double  SearchHit source to string conversion in DefaultResultMapper.
+* DATAES-565 - ElasticsearchTemplate.prepareScroll() doesn't respect SourceFilter from the Query.
+* DATAES-564 - Release 3.2 M4 (Moore).
+* DATAES-563 - Add "elasticsearchTemplate" bean alias for ElasticsearchTemplate.
+* DATAES-562 - Custom name attribute for @Field mapping in ElasticsearchEntityMapper.
+* DATAES-561 - Reuse ObjectMapper in ElasticsearchEntityMapper.
+* DATAES-546 - Documentation code snippet for "using @Query Annotation" does not compile.
+* DATAES-459 - ElasticsearchTemplate does not provide the scroll ID with startScroll.
+* DATAES-457 - ElasticsearchTemplate.prepareScroll() does not add sorting.
+
+
 Changes in version 2.1.21.RELEASE (2019-05-10)
 ----------------------------------------------
 * DATAES-555 - Release 2.1.21 (Ingalls SR21).
diff --git a/src/test/resources/custom-method-repository-rest-test.xml b/src/test/resources/custom-method-repository-rest-test.xml
index d9b283201..fd47615c7 100644
--- a/src/test/resources/custom-method-repository-rest-test.xml
+++ b/src/test/resources/custom-method-repository-rest-test.xml
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
-       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
-
-    <import resource="infrastructure.xml"/>
-
-    <bean name="elasticsearchTemplate"
-          class="org.springframework.data.elasticsearch.repositories.CustomMethodRepositoryRestTests$CleanupOnStartElasticsearchTemplate">
-        <constructor-arg name="client" ref="restClient"/>
-    </bean>
-
-    <elasticsearch:rest-client id="restClient"/>
-
-    <elasticsearch:repositories
-            base-package="org.springframework.data.elasticsearch.repositories.custom"/>
-
-</beans>
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans-3.1.xsd">
+
+    <import resource="infrastructure.xml"/>
+
+    <bean name="elasticsearchTemplate"
+          class="org.springframework.data.elasticsearch.repositories.CustomMethodRepositoryRestTests$CleanupOnStartElasticsearchTemplate">
+        <constructor-arg name="client" ref="restClient"/>
+    </bean>
+
+    <elasticsearch:rest-client id="restClient"/>
+
+    <elasticsearch:repositories
+            base-package="org.springframework.data.elasticsearch.repositories.custom"/>
+
+</beans>
diff --git a/src/test/resources/elasticsearch-rest-template-test.xml b/src/test/resources/elasticsearch-rest-template-test.xml
index 44cdb7aec..8204543b8 100644
--- a/src/test/resources/elasticsearch-rest-template-test.xml
+++ b/src/test/resources/elasticsearch-rest-template-test.xml
@@ -1,17 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
-       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
-		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
-
-    <import resource="infrastructure.xml"/>
-
-    <bean name="elasticsearchTemplate"
-          class="org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate">
-        <constructor-arg name="client" ref="restClient"/>
-    </bean>
-    
-    <elasticsearch:rest-client id="restClient"/>
-
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:elasticsearch="http://www.springframework.org/schema/data/elasticsearch"
+       xsi:schemaLocation="http://www.springframework.org/schema/data/elasticsearch https://www.springframework.org/schema/data/elasticsearch/spring-elasticsearch.xsd
+		http://www.springframework.org/schema/beans https://www.springframework.org/schema/beans/spring-beans.xsd">
+
+    <import resource="infrastructure.xml"/>
+
+    <bean name="elasticsearchTemplate"
+          class="org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate">
+        <constructor-arg name="client" ref="restClient"/>
+    </bean>
+    
+    <elasticsearch:rest-client id="restClient"/>
+
 </beans>
\ No newline at end of file