Release version 5.0.7 (2022.0.7).

See #2547

.mvn/wrapper/maven-wrapper.properties

@@ -1,3 +1,3 @@
-#Thu Apr 06 16:17:39 CEST 2023
+#Tue Jun 13 08:52:21 CEST 2023
 wrapperUrl=https\://repo.maven.apache.org/maven2/io/takari/maven-wrapper/0.5.6/maven-wrapper-0.5.6.jar
-distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.1/apache-maven-3.9.1-bin.zip
+distributionUrl=https\://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.2/apache-maven-3.9.2-bin.zip

README.adoc

@@ -137,9 +137,9 @@ To use the Release candidate versions of the upcoming major version, use our Mav
 </dependency>
 
 <repository>
-  <id>spring-libs-snapshot</id>
+  <id>spring-snapshot</id>
   <name>Spring Snapshot Repository</name>
-  <url>https://repo.spring.io/libs-milestone</url>
+  <url>https://repo.spring.io/milestone</url>
 </repository>
 ----
 
@@ -154,9 +154,9 @@ If you'd rather like the latest snapshots of the upcoming major version, use our
 </dependency>
 
 <repository>
-  <id>spring-libs-snapshot</id>
+  <id>spring-snapshot</id>
   <name>Spring Snapshot Repository</name>
-  <url>https://repo.spring.io/libs-snapshot</url>
+  <url>https://repo.spring.io/snapshot</url>
 </repository>
 ----
 

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>5.0.5</version>
+	<version>5.0.7</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>3.0.5</version>
+		<version>3.0.7</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -18,7 +18,7 @@
 	<url>https://github.com/spring-projects/spring-data-elasticsearch</url>
 
 	<properties>
-		<springdata.commons>3.0.5</springdata.commons>
+		<springdata.commons>3.0.7</springdata.commons>
 
 		<!-- version of the RestHighLevelClient	-->
 		<elasticsearch-rhlc>7.17.9</elasticsearch-rhlc>
@@ -279,24 +279,6 @@
 			<scope>test</scope>
 		</dependency>
 
-
-		<!--
-		  we don't use lombok in Spring Data Elasticsearch anymore. But the dependency is set in the parent project, and so the
-		  lombok compiler stuff is executed regardless of the fact that we don't need it.
-		  On AdoptOpenJdk 16.0.0 this leads to an error, so the project does not build.
-		  Therefore we replace lombok with a jar - that just contains an empty file - that lives in a local maven repository in
-		  src/test/resources/local-maven-repo/
-		  It was installed with
-		   mvn deploy:deploy-file -DgroupId=org.projectlombok -DartifactId=lombok -Dversion=999999 -Durl=file:./src/test/resources/local-maven-repo/ -DrepositoryId=local-maven-repo -DupdateReleaseInfo=true -Dfile=path/to/empty.jar
-		-->
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-			<!--suppress MavenPackageUpdate -->
-			<version>999999</version>
-			<scope>test</scope>
-		</dependency>
-
 		<dependency>
 			<groupId>org.skyscreamer</groupId>
 			<artifactId>jsonassert</artifactId>
@@ -466,7 +448,7 @@
 				<groupId>org.asciidoctor</groupId>
 				<artifactId>asciidoctor-maven-plugin</artifactId>
 			</plugin>
-        </plugins>
+		</plugins>
 	</build>
 
 	<profiles>
@@ -519,23 +501,10 @@
 	</profiles>
 
 	<repositories>
-		<repository>
-			<id>spring-libs-release</id>
-			<url>https://repo.spring.io/libs-release</url>
-		</repository>
+		
 
-		<repository>
-			<id>local-maven-repo</id>
-			<url>file:///${project.basedir}/src/test/resources/local-maven-repo</url>
-		</repository>
+		
 
 	</repositories>
 
-	<pluginRepositories>
-		<pluginRepository>
-			<id>spring-plugins-release</id>
-			<url>https://repo.spring.io/plugins-release</url>
-		</pluginRepository>
-	</pluginRepositories>
-
 </project>

src/main/asciidoc/preface.adoc

@@ -17,9 +17,9 @@ include::reference/elasticsearch-new.adoc[leveloffset=+1]
 * Version Control - https://github.com/spring-projects/spring-data-elasticsearch
 * API Documentation - https://docs.spring.io/spring-data/elasticsearch/docs/current/api/
 * Bugtracker - https://github.com/spring-projects/spring-data-elasticsearch/issues
-* Release repository - https://repo.spring.io/libs-release
-* Milestone repository - https://repo.spring.io/libs-milestone
-* Snapshot repository - https://repo.spring.io/libs-snapshot
+* Release repository - https://repo1.maven.org/maven2/
+* Milestone repository - https://repo.spring.io/milestone/
+* Snapshot repository - https://repo.spring.io/snapshot/
 
 [[preface.requirements]]
 == Requirements

src/main/java/org/springframework/data/elasticsearch/client/elc/NativeQueryBuilder.java

@@ -184,7 +184,7 @@ public class NativeQueryBuilder extends BaseQueryBuilder<NativeQuery, NativeQuer
 
 		Assert.notNull(searchExtensions, "searchExtensions must not be null");
 
-		searchExtensions.putAll(searchExtensions);
+		this.searchExtensions.putAll(searchExtensions);
 		return this;
 	}
 

src/main/java/org/springframework/data/elasticsearch/core/query/BaseQuery.java

@@ -71,7 +71,7 @@ public class BaseQuery implements Query {
 	protected List<RescorerQuery> rescorerQueries = new ArrayList<>();
 	@Nullable protected Boolean requestCache;
 	protected List<IdWithRouting> idsWithRouting = Collections.emptyList();
-	protected final List<RuntimeField> runtimeFields = new ArrayList<>();
+	protected List<RuntimeField> runtimeFields = new ArrayList<>();
 	@Nullable protected PointInTime pointInTime;
 
 	private boolean queryIsUpdatedByConverter = false;
@@ -105,6 +105,14 @@ public class BaseQuery implements Query {
 		this.requestCache = builder.getRequestCache();
 		this.idsWithRouting = builder.getIdsWithRouting();
 		this.pointInTime = builder.getPointInTime();
+		this.runtimeFields = builder.getRuntimeFields();
+	}
+
+	/**
+	 * @since 5.1
+	 */
+	public void setSort(@Nullable Sort sort) {
+		this.sort = sort;
 	}
 
 	@Override

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 5.0.5 (2022.0.5)
+Spring Data Elasticsearch 5.0.7 (2022.0.7)
 Copyright (c) [2013-2021] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -21,3 +21,5 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
 
 
 
+
+