Merge branch '1.2.x'

pull/2997/head
Andy Wilkinson 10 years ago
commit 5cd18e121b

@ -74,11 +74,11 @@
<h2.version>1.4.185</h2.version> <h2.version>1.4.185</h2.version>
<hamcrest.version>1.3</hamcrest.version> <hamcrest.version>1.3</hamcrest.version>
<hazelcast.version>3.4.1</hazelcast.version> <hazelcast.version>3.4.1</hazelcast.version>
<hibernate.version>4.3.9.Final</hibernate.version> <hibernate.version>4.3.10.Final</hibernate.version>
<hibernate-entitymanager.version>${hibernate.version}</hibernate-entitymanager.version> <hibernate-entitymanager.version>${hibernate.version}</hibernate-entitymanager.version>
<hibernate-validator.version>5.1.3.Final</hibernate-validator.version> <hibernate-validator.version>5.1.3.Final</hibernate-validator.version>
<hikaricp.version>2.3.7</hikaricp.version> <hikaricp.version>2.3.7</hikaricp.version>
<hornetq.version>2.4.5.Final</hornetq.version> <hornetq.version>2.4.7.Final</hornetq.version>
<hsqldb.version>2.3.2</hsqldb.version> <hsqldb.version>2.3.2</hsqldb.version>
<httpasyncclient.version>4.0.2</httpasyncclient.version> <httpasyncclient.version>4.0.2</httpasyncclient.version>
<httpclient.version>4.4.1</httpclient.version> <httpclient.version>4.4.1</httpclient.version>
@ -93,7 +93,7 @@
<jdom2.version>2.0.6</jdom2.version> <jdom2.version>2.0.6</jdom2.version>
<jedis.version>2.6.2</jedis.version> <jedis.version>2.6.2</jedis.version>
<jersey.version>2.14</jersey.version> <jersey.version>2.14</jersey.version>
<jetty.version>9.2.9.v20150224</jetty.version> <jetty.version>9.2.10.v20150310</jetty.version>
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version> <jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
<jmustache.version>1.10</jmustache.version> <jmustache.version>1.10</jmustache.version>
<joda-time.version>2.7</joda-time.version> <joda-time.version>2.7</joda-time.version>
@ -101,14 +101,14 @@
<json-path.version>2.0.0</json-path.version> <json-path.version>2.0.0</json-path.version>
<jstl.version>1.2</jstl.version> <jstl.version>1.2</jstl.version>
<junit.version>4.12</junit.version> <junit.version>4.12</junit.version>
<liquibase.version>3.3.2</liquibase.version> <liquibase.version>3.3.3</liquibase.version>
<log4j.version>1.2.17</log4j.version> <log4j.version>1.2.17</log4j.version>
<log4j2.version>2.2</log4j2.version> <log4j2.version>2.2</log4j2.version>
<logback.version>1.1.3</logback.version> <logback.version>1.1.3</logback.version>
<mariadb.version>1.1.8</mariadb.version> <mariadb.version>1.1.8</mariadb.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
<mongodb.version>2.13.0</mongodb.version> <mongodb.version>2.13.0</mongodb.version>
<mysql.version>5.1.34</mysql.version> <mysql.version>5.1.35</mysql.version>
<nekohtml.version>1.9.21</nekohtml.version> <nekohtml.version>1.9.21</nekohtml.version>
<postgresql.version>9.4-1201-jdbc41</postgresql.version> <postgresql.version>9.4-1201-jdbc41</postgresql.version>
<reactor.version>2.0.1.RELEASE</reactor.version> <reactor.version>2.0.1.RELEASE</reactor.version>
@ -127,7 +127,7 @@
<spring-data-releasetrain.version>Fowler-RELEASE</spring-data-releasetrain.version> <spring-data-releasetrain.version>Fowler-RELEASE</spring-data-releasetrain.version>
<spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version> <spring-hateoas.version>0.16.0.RELEASE</spring-hateoas.version>
<spring-integration.version>4.2.0.BUILD-SNAPSHOT</spring-integration.version> <spring-integration.version>4.2.0.BUILD-SNAPSHOT</spring-integration.version>
<spring-loaded.version>1.2.1.RELEASE</spring-loaded.version> <spring-loaded.version>1.2.3.RELEASE</spring-loaded.version>
<spring-mobile.version>1.1.3.RELEASE</spring-mobile.version> <spring-mobile.version>1.1.3.RELEASE</spring-mobile.version>
<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version> <spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
<spring-security.version>4.0.1.RELEASE</spring-security.version> <spring-security.version>4.0.1.RELEASE</spring-security.version>
@ -142,7 +142,7 @@
<thymeleaf.version>2.1.4.RELEASE</thymeleaf.version> <thymeleaf.version>2.1.4.RELEASE</thymeleaf.version>
<thymeleaf-extras-springsecurity4.version>2.1.2.RELEASE</thymeleaf-extras-springsecurity4.version> <thymeleaf-extras-springsecurity4.version>2.1.2.RELEASE</thymeleaf-extras-springsecurity4.version>
<thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version> <thymeleaf-extras-conditionalcomments.version>2.1.1.RELEASE</thymeleaf-extras-conditionalcomments.version>
<thymeleaf-layout-dialect.version>1.2.7</thymeleaf-layout-dialect.version> <thymeleaf-layout-dialect.version>1.2.8</thymeleaf-layout-dialect.version>
<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version> <thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
<tomcat.version>8.0.22</tomcat.version> <tomcat.version>8.0.22</tomcat.version>
<undertow.version>1.2.4.Final</undertow.version> <undertow.version>1.2.4.Final</undertow.version>

Loading…
Cancel
Save