Merge branch '2.1.x'

pull/15873/head
Andy Wilkinson 6 years ago
commit 88f563ab4f

@ -130,7 +130,7 @@
<logback.version>1.2.3</logback.version>
<lombok.version>1.18.4</lombok.version>
<mariadb.version>2.3.0</mariadb.version>
<micrometer.version>1.1.2</micrometer.version>
<micrometer.version>1.1.3-SNAPSHOT</micrometer.version>
<mimepull.version>1.9.10</mimepull.version>
<mockito.version>2.23.4</mockito.version>
<mongo-driver-reactivestreams.version>1.9.2</mongo-driver-reactivestreams.version>
@ -162,21 +162,21 @@
<snakeyaml.version>1.23</snakeyaml.version>
<solr.version>7.4.0</solr.version>
<!-- deprecated in favor of "spring-framework.version" -->
<spring.version>5.1.4.RELEASE</spring.version>
<spring-amqp.version>2.1.3.RELEASE</spring-amqp.version>
<spring.version>5.1.5.BUILD-SNAPSHOT</spring.version>
<spring-amqp.version>2.1.4.BUILD-SNAPSHOT</spring-amqp.version>
<spring-batch.version>4.1.1.RELEASE</spring-batch.version>
<spring-cloud-connectors.version>2.0.4.RELEASE</spring-cloud-connectors.version>
<spring-data-releasetrain.version>Lovelace-SR4</spring-data-releasetrain.version>
<spring-data-releasetrain.version>Lovelace-BUILD-SNAPSHOT</spring-data-releasetrain.version>
<spring-framework.version>${spring.version}</spring-framework.version>
<spring-hateoas.version>0.25.0.RELEASE</spring-hateoas.version>
<spring-integration.version>5.1.2.RELEASE</spring-integration.version>
<spring-kafka.version>2.2.3.RELEASE</spring-kafka.version>
<spring-integration.version>5.1.3.BUILD-SNAPSHOT</spring-integration.version>
<spring-kafka.version>2.2.4.BUILD-SNAPSHOT</spring-kafka.version>
<spring-ldap.version>2.3.2.RELEASE</spring-ldap.version>
<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
<spring-restdocs.version>2.0.3.RELEASE</spring-restdocs.version>
<spring-retry.version>1.2.3.RELEASE</spring-retry.version>
<spring-security.version>5.1.3.RELEASE</spring-security.version>
<spring-session-bom.version>Bean-SR2</spring-session-bom.version>
<spring-security.version>5.1.4.BUILD-SNAPSHOT</spring-security.version>
<spring-session-bom.version>Bean-BUILD-SNAPSHOT</spring-session-bom.version>
<spring-ws.version>3.0.6.RELEASE</spring-ws.version>
<sqlite-jdbc.version>3.25.2</sqlite-jdbc.version>
<statsd-client.version>3.1.0</statsd-client.version>

Loading…
Cancel
Save