Merge branch '2.1.x'

pull/13916/head
Andy Wilkinson 6 years ago
commit b27242f27b

@ -50,7 +50,7 @@
<commons-dbcp2.version>2.5.0</commons-dbcp2.version>
<commons-lang3.version>3.8.1</commons-lang3.version>
<commons-pool.version>1.6</commons-pool.version>
<commons-pool2.version>2.6.0</commons-pool2.version>
<commons-pool2.version>2.6.1</commons-pool2.version>
<couchbase-client.version>2.7.2</couchbase-client.version>
<couchbase-cache-client.version>2.1.0</couchbase-cache-client.version>
<derby.version>10.14.2.0</derby.version>
@ -124,13 +124,13 @@
<junit-jupiter.version>5.3.2</junit-jupiter.version>
<kafka.version>2.1.0</kafka.version>
<kotlin.version>1.2.71</kotlin.version>
<lettuce.version>5.1.3.RELEASE</lettuce.version>
<lettuce.version>5.1.4.RELEASE</lettuce.version>
<liquibase.version>3.6.3</liquibase.version>
<log4j2.version>2.11.2</log4j2.version>
<logback.version>1.2.3</logback.version>
<lombok.version>1.18.6</lombok.version>
<mariadb.version>2.3.0</mariadb.version>
<micrometer.version>1.1.3-SNAPSHOT</micrometer.version>
<micrometer.version>1.1.3</micrometer.version>
<mimepull.version>1.9.11</mimepull.version>
<mockito.version>2.23.4</mockito.version>
<mongo-driver-reactivestreams.version>1.9.2</mongo-driver-reactivestreams.version>
@ -163,7 +163,7 @@
<solr.version>7.4.0</solr.version>
<!-- deprecated in favor of "spring-framework.version" -->
<spring.version>5.1.5.RELEASE</spring.version>
<spring-amqp.version>2.1.4.BUILD-SNAPSHOT</spring-amqp.version>
<spring-amqp.version>2.1.4.RELEASE</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>Moore-BUILD-SNAPSHOT</spring-data-releasetrain.version>

Loading…
Cancel
Save