Skip to content

Commit

Permalink
DATAREST-976 - Embedded properties are now considered in sort propert…
Browse files Browse the repository at this point in the history
…y paths.

Prepare issue branch.
  • Loading branch information
mp911de committed Jan 13, 2017
1 parent 4837ba8 commit 0f9ee7d
Show file tree
Hide file tree
Showing 13 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-parent</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
<packaging>pom</packaging>

<name>Spring Data REST</name>
Expand Down
2 changes: 1 addition & 1 deletion spring-data-rest-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-parent</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion spring-data-rest-distribution/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-parent</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion spring-data-rest-hal-browser/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-parent</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
</parent>

<artifactId>spring-data-rest-hal-browser</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion spring-data-rest-tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-parent</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions spring-data-rest-tests/spring-data-rest-tests-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -17,7 +17,7 @@
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-webmvc</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
</dependency>

<dependency>
Expand Down
4 changes: 2 additions & 2 deletions spring-data-rest-tests/spring-data-rest-tests-gemfire/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -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>2.6.0.DATAREST-976-SNAPSHOT</version>
<type>test-jar</type>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions spring-data-rest-tests/spring-data-rest-tests-jpa/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -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>2.6.0.DATAREST-976-SNAPSHOT</version>
<type>test-jar</type>
</dependency>

Expand Down
4 changes: 2 additions & 2 deletions spring-data-rest-tests/spring-data-rest-tests-mongodb/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -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>2.6.0.DATAREST-976-SNAPSHOT</version>
<type>test-jar</type>
</dependency>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand All @@ -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>2.6.0.DATAREST-976-SNAPSHOT</version>
<type>test-jar</type>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion spring-data-rest-tests/spring-data-rest-tests-shop/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
</parent>

<name>Spring Data REST Tests - Shop</name>
Expand Down
4 changes: 2 additions & 2 deletions spring-data-rest-tests/spring-data-rest-tests-solr/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-tests</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
</parent>

<name>Spring Data REST Tests - Solr</name>
Expand All @@ -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>2.6.0.DATAREST-976-SNAPSHOT</version>
<type>test-jar</type>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion spring-data-rest-webmvc/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<parent>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-rest-parent</artifactId>
<version>2.6.0.BUILD-SNAPSHOT</version>
<version>2.6.0.DATAREST-976-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down

0 comments on commit 0f9ee7d

Please sign in to comment.