1
0
mirror of synced 2026-07-05 09:40:00 +00:00

Compare commits

...

8 Commits

Author SHA1 Message Date
Oliver Gierke ad55402973 DATAES-400 - Release version 3.0.1 (Kay SR1). 2017-10-27 15:25:13 +02:00
Oliver Gierke ef68623d5b DATAES-400 - Prepare 3.0.1 (Kay SR1). 2017-10-27 15:24:26 +02:00
Oliver Gierke c075f170c3 DATAES-400 - Updated changelog. 2017-10-27 15:24:22 +02:00
Oliver Gierke 02b7dde196 DATAES-410 - Adapt API changes in Property in test cases. 2017-10-27 11:24:54 +02:00
Vladimir Tsanev 51b7fa2a26 DATAES-361 - Move Log4j2 config file to test sources.
The configuration file for Log4j2 had been added to src/main/resources accidentally which caused it to be picked up by user applications, e.g. in a Spring Boot application effectively disabling Boot's auto-configuration. This file has now been moved to the test resources.

Original pull request: #191.
Related tickets: spring-projects/spring-boot#10634
2017-10-13 15:41:11 +02:00
Oliver Gierke 4e5051c57b DATAES-391 - Updated changelog. 2017-10-11 19:03:34 +02:00
Mark Paluch 31d499e6e0 DATAES-392 - After release cleanups. 2017-10-02 11:38:05 +02:00
Mark Paluch 311a06aa67 DATAES-392 - Prepare next development iteration. 2017-10-02 11:38:04 +02:00
5 changed files with 18 additions and 5 deletions
+3 -3
View File
@@ -4,12 +4,12 @@
<groupId>org.springframework.data</groupId> <groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId> <artifactId>spring-data-elasticsearch</artifactId>
<version>3.0.0.RELEASE</version> <version>3.0.1.RELEASE</version>
<parent> <parent>
<groupId>org.springframework.data.build</groupId> <groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId> <artifactId>spring-data-parent</artifactId>
<version>2.0.0.RELEASE</version> <version>2.0.1.RELEASE</version>
</parent> </parent>
<name>Spring Data Elasticsearch</name> <name>Spring Data Elasticsearch</name>
@@ -20,7 +20,7 @@
<commonscollections>3.2.1</commonscollections> <commonscollections>3.2.1</commonscollections>
<commonslang>2.6</commonslang> <commonslang>2.6</commonslang>
<elasticsearch>5.5.0</elasticsearch> <elasticsearch>5.5.0</elasticsearch>
<springdata.commons>2.0.0.RELEASE</springdata.commons> <springdata.commons>2.0.1.RELEASE</springdata.commons>
<java-module-name>spring.data.elasticsearch</java-module-name> <java-module-name>spring.data.elasticsearch</java-module-name>
</properties> </properties>
+12
View File
@@ -1,6 +1,18 @@
Spring Data Elasticsearch Changelog Spring Data Elasticsearch Changelog
=================================== ===================================
Changes in version 3.0.1.RELEASE (2017-10-27)
---------------------------------------------
* DATAES-410 - Adapt API changes in Property in test cases.
* DATAES-400 - Release 3.0.1 (Kay SR1).
* DATAES-361 - log4j2.xml in classpath root of the library prevents Spring Boot's logging auto-configuration to work.
Changes in version 2.1.8.RELEASE (2017-10-11)
---------------------------------------------
* DATAES-391 - Release 2.1.8 (Ingalls SR8).
Changes in version 3.0.0.RELEASE (2017-10-02) Changes in version 3.0.0.RELEASE (2017-10-02)
--------------------------------------------- ---------------------------------------------
* DATAES-397 - Add explicit automatic module name for Java 9. * DATAES-397 - Add explicit automatic module name for Java 9.
+1 -1
View File
@@ -1,4 +1,4 @@
Spring Data Elasticsearch 3.0 GA Spring Data Elasticsearch 3.0.1
Copyright (c) [2013-2016] Pivotal Software, Inc. Copyright (c) [2013-2016] Pivotal Software, Inc.
This product is licensed to you under the Apache License, Version 2.0 (the "License"). This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -66,7 +66,8 @@ public class SimpleElasticsearchPersistentEntityTests {
private static SimpleElasticsearchPersistentProperty createProperty(SimpleElasticsearchPersistentEntity<?> entity, private static SimpleElasticsearchPersistentProperty createProperty(SimpleElasticsearchPersistentEntity<?> entity,
String field) { String field) {
Property property = Property.of(ReflectionUtils.findField(entity.getTypeInformation().getType(), field)); TypeInformation<?> type = entity.getTypeInformation();
Property property = Property.of(type, ReflectionUtils.findField(entity.getType(), field));
return new SimpleElasticsearchPersistentProperty(property, entity, SimpleTypeHolder.DEFAULT); return new SimpleElasticsearchPersistentProperty(property, entity, SimpleTypeHolder.DEFAULT);
} }