Commit 598beeea authored by Stephane Nicoll's avatar Stephane Nicoll

Merge branch '1.4.x' into 1.5.x

parents 43292a5e 041c5957
...@@ -151,13 +151,13 @@ ...@@ -151,13 +151,13 @@
<snakeyaml.version>1.17</snakeyaml.version> <snakeyaml.version>1.17</snakeyaml.version>
<solr.version>5.5.4</solr.version> <solr.version>5.5.4</solr.version>
<spock.version>1.0-groovy-2.4</spock.version> <spock.version>1.0-groovy-2.4</spock.version>
<spring.version>4.3.8.BUILD-SNAPSHOT</spring.version> <spring.version>4.3.8.RELEASE</spring.version>
<spring-amqp.version>1.7.2.RELEASE</spring-amqp.version> <spring-amqp.version>1.7.2.RELEASE</spring-amqp.version>
<spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version> <spring-cloud-connectors.version>1.2.3.RELEASE</spring-cloud-connectors.version>
<spring-batch.version>3.0.7.RELEASE</spring-batch.version> <spring-batch.version>3.0.7.RELEASE</spring-batch.version>
<spring-data-releasetrain.version>Ingalls-SR1</spring-data-releasetrain.version> <spring-data-releasetrain.version>Ingalls-SR1</spring-data-releasetrain.version>
<spring-hateoas.version>0.23.0.RELEASE</spring-hateoas.version> <spring-hateoas.version>0.23.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.3.9.BUILD-SNAPSHOT</spring-integration.version> <spring-integration.version>4.3.9.RELEASE</spring-integration.version>
<spring-integration-java-dsl.version>1.2.1.RELEASE</spring-integration-java-dsl.version> <spring-integration-java-dsl.version>1.2.1.RELEASE</spring-integration-java-dsl.version>
<spring-kafka.version>1.1.4.RELEASE</spring-kafka.version> <spring-kafka.version>1.1.4.RELEASE</spring-kafka.version>
<spring-ldap.version>2.3.1.RELEASE</spring-ldap.version> <spring-ldap.version>2.3.1.RELEASE</spring-ldap.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment