From 8992cc80a101abf24de4104affd0c5a24dc112b0 Mon Sep 17 00:00:00 2001 From: Oliver Gierke Date: Thu, 3 Sep 2015 18:13:50 +0200 Subject: [PATCH] DATACMNS-762 - Polished section on dependencies in reference documentation. Linked back to the release train names from the section on dependency management with Boot for clarity. Added additional line break to avoid the first line in the repositories.adoc being interpreted as text. --- src/main/asciidoc/dependencies.adoc | 10 +++++----- src/main/asciidoc/repositories.adoc | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/asciidoc/dependencies.adoc b/src/main/asciidoc/dependencies.adoc index 86724e4404..1586cf3d82 100644 --- a/src/main/asciidoc/dependencies.adoc +++ b/src/main/asciidoc/dependencies.adoc @@ -21,7 +21,8 @@ Due to different inception dates of individual Spring Data modules, most of them ---- ==== -The current release train version is {releasetrainVersion}. The train names are ascending alphabetically and currently available ones are listed https://github.com/spring-projects/spring-data-commons/wiki/Release-planning[here]. The version name follows the following pattern: `${name}-${release}` where release can be one of the following: +[[dependencies.train-names]] +The current release train version is `{releasetrainVersion}. The train names are ascending alphabetically and currently available ones are listed https://github.com/spring-projects/spring-data-commons/wiki/Release-planning[here]. The version name follows the following pattern: `${name}-${release}` where release can be one of the following: * `BUILD-SNAPSHOT` - current snapshots * `M1`, `M2` etc. - milestones @@ -29,9 +30,7 @@ The current release train version is {releasetrainVersion}. The train names are * `RELEASE` - GA release * `SR1`, `SR2` etc. - service releases -A working example of using the BOMs can be found in our https://github.com/spring-projects/spring-data-examples/tree/master/bom[Spring Data examples repository]. - -If that's in place declare the Spring Data modules you'd like to use without a version in the `` block. +A working example of using the BOMs can be found in our https://github.com/spring-projects/spring-data-examples/tree/master/bom[Spring Data examples repository]. If that's in place declare the Spring Data modules you'd like to use without a version in the `` block. .Declaring a dependency to a Spring Data module ==== @@ -49,9 +48,10 @@ If that's in place declare the Spring Data modules you'd like to use without a v [[dependencies.spring-boot]] == Dependency management with Spring Boot -Spring Boot already selects a very recent version of Spring Data modules for you. In case you want to upgrade to a newer version nonetheless, simply configure the property `spring-data-releasetrain.version` to the train name and iteration you'd like to use. +Spring Boot already selects a very recent version of Spring Data modules for you. In case you want to upgrade to a newer version nonetheless, simply configure the property `spring-data-releasetrain.version` to the <> you'd like to use. [[dependencies.spring-framework]] == Spring Framework The current version of Spring Data modules require Spring Framework in version {springVersion} or better. The modules might also work with an older bugfix version of that minor version. However, using the most recent version within that generation is highly recommended. + diff --git a/src/main/asciidoc/repositories.adoc b/src/main/asciidoc/repositories.adoc index 127fab5ff0..f4c9977ea9 100644 --- a/src/main/asciidoc/repositories.adoc +++ b/src/main/asciidoc/repositories.adoc @@ -1,6 +1,5 @@ :spring-framework-docs: http://docs.spring.io/spring/docs/current/spring-framework-reference/html - [[repositories]] = Working with Spring Data Repositories