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

Merge branch '1.5.x'

Browse Source 
# Conflicts:
#	spring-boot-dependencies/pom.xml
This commit is contained in:
Stephane Nicoll
2016-10-04 13:02:53 +02:00
parent d0d01b92b9 58050fb72f
commit 39534aea6b
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot-dependencies/pom.xml
View File

@@ -147,12 +147,12 @@
<solr.version>5.5.3</solr.version>
<spock.version>1.0-groovy-2.4</spock.version>
<spring.version>5.0.0.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>1.6.2.RELEASE</spring-amqp.version>
<spring-amqp.version>1.6.3.RELEASE</spring-amqp.version>
<spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version>
<spring-batch.version>3.0.7.RELEASE</spring-batch.version>
<spring-data-releasetrain.version>Ingalls-M1</spring-data-releasetrain.version>
<spring-hateoas.version>0.21.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.3.2.RELEASE</spring-integration.version>
<spring-integration.version>4.3.4.RELEASE</spring-integration.version>
<spring-integration-java-dsl.version>1.2.0.RC1</spring-integration-java-dsl.version>
<spring-loaded.version>1.2.6.RELEASE</spring-loaded.version>
<spring-mobile.version>1.1.5.RELEASE</spring-mobile.version>

2
spring-boot-docs/src/main/asciidoc/build-tool-plugins.adoc
View File

@@ -204,7 +204,7 @@ If you are using a milestone or snapshot release you will also need to add appro
[[build-tool-plugins-gradle-dependency-management]]
=== Gradle dependency management
The `spring-boot` plugin automatically applies the
{dependency-management-plugin}/[Dependency Management Plugin] and configures in to import
{dependency-management-plugin}/[Dependency Management Plugin] and configures it to import
the `spring-boot-starter-parent` bom. This provides a similar dependency management
experience to the one that is enjoyed by Maven users. For example, it allows you to omit
version numbers when declaring dependencies that are managed in the bom. To make use of