Spring/spring-data-rest
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATAREST-935 - Prepare 3.0 development.

Browse Source 
Upgraded version numbers and dependencies to Spring Data build parent, Commons and store modules. Fixed a compiler issue in DomainObjectReader.
This commit is contained in:
Oliver Gierke
2016-11-16 15:59:38 +01:00
parent f4705c8197
commit 8327b6f4ab
14 changed files with 30 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pom.xml
View File

@@ -5,7 +5,7 @@
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-parent</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Spring Data REST</name>
@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.data.build</groupId>
<artifactId>spring-data-parent</artifactId>
<version>1.9.0.BUILD-SNAPSHOT</version>
<version>2.0.0.BUILD-SNAPSHOT</version>
<relativePath/>
</parent>
@@ -28,13 +28,13 @@
<project.type>multi</project.type>
<dist.id>spring-data-rest</dist.id>
<springdata.commons>1.13.0.BUILD-SNAPSHOT</springdata.commons>
<springdata.jpa>1.11.0.BUILD-SNAPSHOT</springdata.jpa>
<springdata.mongodb>1.10.0.BUILD-SNAPSHOT</springdata.mongodb>
<springdata.gemfire>1.9.0.BUILD-SNAPSHOT</springdata.gemfire>
<springdata.solr>2.1.0.BUILD-SNAPSHOT</springdata.solr>
<springdata.cassandra>1.5.0.BUILD-SNAPSHOT</springdata.cassandra>
<springdata.keyvalue>1.2.0.BUILD-SNAPSHOT</springdata.keyvalue>
<springdata.commons>2.0.0.BUILD-SNAPSHOT</springdata.commons>
<springdata.jpa>2.0.0.BUILD-SNAPSHOT</springdata.jpa>
<springdata.mongodb>2.0.0.BUILD-SNAPSHOT</springdata.mongodb>
<springdata.gemfire>2.0.0.BUILD-SNAPSHOT</springdata.gemfire>
<springdata.solr>3.0.0.BUILD-SNAPSHOT</springdata.solr>
<springdata.cassandra>2.0.0.BUILD-SNAPSHOT</springdata.cassandra>
<springdata.keyvalue>2.0.0.BUILD-SNAPSHOT</springdata.keyvalue>
<hibernate.version>4.3.10.Final</hibernate.version>
<jsonpath>1.1.0</jsonpath>

2
spring-data-rest-core/pom.xml
View File

@@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-parent</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
spring-data-rest-distribution/pom.xml
View File

@@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-parent</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

2
spring-data-rest-hal-browser/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-parent</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
</parent>
<artifactId>spring-data-rest-hal-browser</artifactId>

2
spring-data-rest-tests/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-parent</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

4
spring-data-rest-tests/spring-data-rest-tests-core/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-webmvc</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
</dependency>
<dependency>

4
spring-data-rest-tests/spring-data-rest-tests-gemfire/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests-core</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<type>test-jar</type>
</dependency>

4
spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests-core</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<type>test-jar</type>
</dependency>

4
spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests-core</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<type>test-jar</type>
</dependency>

4
spring-data-rest-tests/spring-data-rest-tests-security/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -21,7 +21,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests-core</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<type>test-jar</type>
</dependency>

2
spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml
View File

@@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
</parent>
<name>Spring Data REST Tests - Shop</name>

4
spring-data-rest-tests/spring-data-rest-tests-solr/pom.xml
View File

@@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
</parent>
<name>Spring Data REST Tests - Solr</name>
@@ -15,7 +15,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests-core</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<type>test-jar</type>
</dependency>

2
spring-data-rest-webmvc/pom.xml
View File

@@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-parent</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>3.0.0.BUILD-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

5
spring-data-rest-webmvc/src/main/java/org/springframework/data/rest/webmvc/json/DomainObjectReader.java
View File

@@ -285,8 +285,9 @@ public class DomainObjectReader {
} else if (child instanceof ArrayNode && sourceValue != null) {
handleArrayNode((ArrayNode) child, asCollection(sourceValue), mapper);
} else {
source.put(entry.getKey(),
mapper.treeToValue(child, sourceValue == null ? Object.class : sourceValue.getClass()));
Class<?> target = sourceValue == null ? Object.class : sourceValue.getClass();
source.put(entry.getKey(), mapper.treeToValue(child, target));
}
fields.remove();