Merge branch '2.1.x'

This commit is contained in:
Andy Wilkinson 2018-12-07 15:25:35 +00:00
commit 2cd3cff608

View File

@ -59,7 +59,7 @@
<ehcache.version>2.10.6</ehcache.version>
<ehcache3.version>3.6.2</ehcache3.version>
<embedded-mongo.version>2.1.1</embedded-mongo.version>
<flyway.version>5.2.4</flyway.version>
<flyway.version>5.2.3</flyway.version>
<freemarker.version>2.3.28</freemarker.version>
<elasticsearch.version>6.4.3</elasticsearch.version>
<glassfish-el.version>3.0.0</glassfish-el.version>
@ -163,19 +163,19 @@
<solr.version>7.4.0</solr.version>
<!-- deprecated in favor of "spring-framework.version" -->
<spring.version>5.1.3.RELEASE</spring.version>
<spring-amqp.version>2.1.2.RELEASE</spring-amqp.version>
<spring-amqp.version>2.1.3.BUILD-SNAPSHOT</spring-amqp.version>
<spring-batch.version>4.1.0.RELEASE</spring-batch.version>
<spring-cloud-connectors.version>2.0.4.RELEASE</spring-cloud-connectors.version>
<spring-data-releasetrain.version>Lovelace-SR3</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.1.RELEASE</spring-integration.version>
<spring-kafka.version>2.2.2.RELEASE</spring-kafka.version>
<spring-integration.version>5.1.2.BUILD-SNAPSHOT</spring-integration.version>
<spring-kafka.version>2.2.3.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.2.RELEASE</spring-restdocs.version>
<spring-retry.version>1.2.2.RELEASE</spring-retry.version>
<spring-security.version>5.1.2.RELEASE</spring-security.version>
<spring-security.version>5.1.3.BUILD-SNAPSHOT</spring-security.version>
<spring-session-bom.version>Bean-SR1</spring-session-bom.version>
<spring-ws.version>3.0.4.RELEASE</spring-ws.version>
<sqlite-jdbc.version>3.25.2</sqlite-jdbc.version>