Skip to content

Commit 26c5a3e

Browse files
odrotbohmDave Syer
authored and
Dave Syer
committed
Import Spring Data release train BOM instead of individual modules.
The dependencies pom.xml now declares an import to the spring-data-releasetrain BOM pom.xml which in turn constraints version numbers for a dedicated release train release. This has the effect of users being able to upgrade to a certain release train by redeclaring the spring-data-releasetrain.version property to e.g. Dijkstra-M1. Individual modules can be upgraded by simply declaring the dependency in the desired version manually in a <dependencies /> or <dependencyManagement /> block. Removed the explicit declaration for Spring HATEOAS as it is pulled in transitively by Spring Data REST anyway and thus makes sure it's in a compatible version.
1 parent d597cc3 commit 26c5a3e

File tree

2 files changed

+5
-29
lines changed
  • spring-boot-dependencies
  • spring-boot-starters/spring-boot-starter-data-rest

2 files changed

+5
-29
lines changed

spring-boot-dependencies/pom.xml

+5-25
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,8 @@
8383
<spring.version>4.0.3.RELEASE</spring.version>
8484
<spring-integration.version>3.0.2.RELEASE</spring-integration.version>
8585
<spring-batch.version>2.2.6.RELEASE</spring-batch.version>
86-
<spring-data-jpa.version>1.5.2.RELEASE</spring-data-jpa.version>
87-
<spring-data-mongodb.version>1.4.2.RELEASE</spring-data-mongodb.version>
8886
<spring-data-redis.version>1.1.1.RELEASE</spring-data-redis.version>
89-
<spring-data-rest.version>2.0.2.RELEASE</spring-data-rest.version>
87+
<spring-data-releasetrain.version>Codd-SR2</spring-data-releasetrain.version>
9088
<spring-hateoas.version>0.9.0.RELEASE</spring-hateoas.version>
9189
<spring-plugin.version>1.0.0.RELEASE</spring-plugin.version>
9290
<spring-rabbit.version>1.2.2.RELEASE</spring-rabbit.version>
@@ -515,23 +513,10 @@
515513
</dependency>
516514
<dependency>
517515
<groupId>org.springframework.data</groupId>
518-
<artifactId>spring-data-jpa</artifactId>
519-
<version>${spring-data-jpa.version}</version>
520-
<exclusions>
521-
<exclusion>
522-
<groupId>org.springframework</groupId>
523-
<artifactId>spring-jdbc</artifactId>
524-
</exclusion>
525-
<exclusion>
526-
<groupId>org.springframework</groupId>
527-
<artifactId>spring-orm</artifactId>
528-
</exclusion>
529-
</exclusions>
530-
</dependency>
531-
<dependency>
532-
<groupId>org.springframework.data</groupId>
533-
<artifactId>spring-data-mongodb</artifactId>
534-
<version>${spring-data-mongodb.version}</version>
516+
<artifactId>spring-data-releasetrain</artifactId>
517+
<version>${spring-data-releasetrain.version}</version>
518+
<type>pom</type>
519+
<scope>import</scope>
535520
</dependency>
536521
<dependency>
537522
<groupId>org.springframework.data</groupId>
@@ -548,11 +533,6 @@
548533
<artifactId>spring-plugin-core</artifactId>
549534
<version>${spring-plugin.version}</version>
550535
</dependency>
551-
<dependency>
552-
<groupId>org.springframework.data</groupId>
553-
<artifactId>spring-data-rest-webmvc</artifactId>
554-
<version>${spring-data-rest.version}</version>
555-
</dependency>
556536
<dependency>
557537
<groupId>org.springframework.integration</groupId>
558538
<artifactId>spring-integration-core</artifactId>

spring-boot-starters/spring-boot-starter-data-rest/pom.xml

-4
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@
2323
<artifactId>spring-boot-starter-web</artifactId>
2424
<version>${project.version}</version>
2525
</dependency>
26-
<dependency>
27-
<groupId>org.springframework.hateoas</groupId>
28-
<artifactId>spring-hateoas</artifactId>
29-
</dependency>
3026
<dependency>
3127
<groupId>org.springframework.data</groupId>
3228
<artifactId>spring-data-rest-webmvc</artifactId>

0 commit comments

Comments
 (0)