Merge branch '1.5.x'

pull/7854/head
Andy Wilkinson 8 years ago
commit b9e3dc574d

@ -43,16 +43,16 @@
</developer>
</developers>
<properties>
<activemq.version>5.13.4</activemq.version>
<activemq.version>5.14.3</activemq.version>
<antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.48</appengine-sdk.version>
<artemis.version>1.5.0</artemis.version>
<artemis.version>1.5.1</artemis.version>
<aspectj.version>1.8.9</aspectj.version>
<assertj.version>2.5.0</assertj.version>
<assertj.version>2.6.0</assertj.version>
<atomikos.version>3.9.3</atomikos.version>
<bitronix.version>2.1.4</bitronix.version>
<caffeine.version>2.3.5</caffeine.version>
<cassandra-driver.version>3.1.0</cassandra-driver.version>
<cassandra-driver.version>3.1.3</cassandra-driver.version>
<classmate.version>1.3.3</classmate.version>
<commons-beanutils.version>1.9.3</commons-beanutils.version>
<commons-collections.version>3.2.2</commons-collections.version>
@ -61,13 +61,13 @@
<commons-digester.version>2.1</commons-digester.version>
<commons-pool.version>1.6</commons-pool.version>
<commons-pool2.version>2.4.2</commons-pool2.version>
<couchbase-client.version>2.2.8</couchbase-client.version>
<couchbase-client.version>2.3.6</couchbase-client.version>
<couchbase-cache-client.version>2.0.0</couchbase-cache-client.version>
<derby.version>10.12.1.1</derby.version>
<derby.version>10.13.1.1</derby.version>
<dom4j.version>1.6.1</dom4j.version>
<dropwizard-metrics.version>3.1.2</dropwizard-metrics.version>
<ehcache.version>2.10.3</ehcache.version>
<ehcache3.version>3.1.3</ehcache3.version>
<ehcache3.version>3.2.0</ehcache3.version>
<embedded-mongo.version>1.50.5</embedded-mongo.version>
<flyway.version>3.2.1</flyway.version>
<freemarker.version>2.3.25-incubating</freemarker.version>
@ -75,15 +75,15 @@
<glassfish-el.version>3.0.0</glassfish-el.version>
<gradle.version>2.9</gradle.version>
<groovy.version>2.4.7</groovy.version>
<gson.version>2.7</gson.version>
<gson.version>2.8.0</gson.version>
<h2.version>1.4.193</h2.version>
<hamcrest.version>1.3</hamcrest.version>
<hazelcast.version>3.7.1</hazelcast.version>
<hazelcast-hibernate4.version>3.6.5</hazelcast-hibernate4.version>
<hazelcast-hibernate5.version>1.0.1</hazelcast-hibernate5.version>
<hazelcast.version>3.7.4</hazelcast.version>
<hazelcast-hibernate4.version>3.7.1</hazelcast-hibernate4.version>
<hazelcast-hibernate5.version>1.1.3</hazelcast-hibernate5.version>
<hibernate.version>5.2.5.Final</hibernate.version>
<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
<hikaricp.version>2.4.7</hikaricp.version>
<hikaricp.version>2.5.1</hikaricp.version>
<hikaricp-java6.version>2.3.13</hikaricp-java6.version>
<hsqldb.version>2.3.3</hsqldb.version>
<htmlunit.version>2.23</htmlunit.version>
@ -93,16 +93,16 @@
<infinispan.version>8.2.5.Final</infinispan.version>
<jackson.version>2.8.5</jackson.version>
<janino.version>2.7.8</janino.version>
<javassist.version>3.20.0-GA</javassist.version> <!-- Same as Hibernate -->
<javassist.version>3.21.0-GA</javassist.version> <!-- Same as Hibernate -->
<javax-cache.version>1.0.0</javax-cache.version>
<javax-jms.version>2.0.1</javax-jms.version>
<javax-mail.version>1.5.6</javax-mail.version>
<javax-transaction.version>1.2</javax-transaction.version>
<javax-validation.version>1.1.0.Final</javax-validation.version>
<jaxen.version>1.1.6</jaxen.version>
<jaybird.version>2.2.11</jaybird.version>
<jaybird.version>2.2.12</jaybird.version>
<jboss-logging.version>3.3.0.Final</jboss-logging.version>
<jboss-transaction-spi.version>7.3.4.Final</jboss-transaction-spi.version>
<jboss-transaction-spi.version>7.5.0.Final</jboss-transaction-spi.version>
<jdom2.version>2.0.6</jdom2.version>
<jedis.version>2.9.0</jedis.version>
<jersey.version>2.24</jersey.version>
@ -110,11 +110,11 @@
<jetty.version>9.4.0.v20161208</jetty.version>
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
<jetty-el.version>8.0.33</jetty-el.version>
<jmustache.version>1.12</jmustache.version>
<jmustache.version>1.13</jmustache.version>
<jna.version>4.2.2</jna.version>
<joda-time.version>2.9.6</joda-time.version>
<joda-time.version>2.9.7</joda-time.version>
<jolokia.version>1.3.5</jolokia.version>
<jooq.version>3.8.6</jooq.version>
<jooq.version>3.9.0</jooq.version>
<json.version>20140107</json.version>
<jsonassert.version>1.3.0</jsonassert.version>
<json-path.version>2.2.0</json-path.version>
@ -125,12 +125,12 @@
<log4j2.version>2.7</log4j2.version>
<logback.version>1.1.8</logback.version>
<lombok.version>1.16.12</lombok.version>
<mariadb.version>1.4.6</mariadb.version>
<mariadb.version>1.5.6</mariadb.version>
<mssql-jdbc.version>6.1.0.jre8</mssql-jdbc.version>
<mockito.version>1.10.19</mockito.version>
<mongodb.version>3.4.0</mongodb.version>
<mongodb.version>3.4.1</mongodb.version>
<mysql.version>5.1.40</mysql.version>
<narayana.version>5.3.5.Final</narayana.version>
<narayana.version>5.5.0.Final</narayana.version>
<nekohtml.version>1.9.22</nekohtml.version>
<neo4j-ogm.version>2.1.0</neo4j-ogm.version>
<postgresql.version>9.4.1212.jre7</postgresql.version>
@ -159,7 +159,7 @@
<spring-restdocs.version>1.2.0.BUILD-SNAPSHOT</spring-restdocs.version>
<spring-retry.version>1.2.0.RC1</spring-retry.version>
<spring-security.version>4.2.1.RELEASE</spring-security.version>
<spring-security-jwt.version>1.0.5.RELEASE</spring-security-jwt.version>
<spring-security-jwt.version>1.0.7.RELEASE</spring-security-jwt.version>
<spring-security-oauth.version>2.0.12.RELEASE</spring-security-oauth.version>
<spring-session.version>1.3.0.RELEASE</spring-session.version>
<spring-social.version>2.0.0.M1</spring-social.version>
@ -167,7 +167,7 @@
<spring-social-linkedin.version>2.0.0.M1</spring-social-linkedin.version>
<spring-social-twitter.version>2.0.0.M1</spring-social-twitter.version>
<spring-ws.version>2.4.0.RELEASE</spring-ws.version>
<sqlite-jdbc.version>3.8.11.2</sqlite-jdbc.version>
<sqlite-jdbc.version>3.15.1</sqlite-jdbc.version>
<statsd-client.version>3.1.0</statsd-client.version>
<sun-mail.version>${javax-mail.version}</sun-mail.version>
<thymeleaf.version>2.1.5.RELEASE</thymeleaf.version>
@ -177,7 +177,7 @@
<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
<thymeleaf-extras-java8time.version>2.1.0.RELEASE</thymeleaf-extras-java8time.version>
<tomcat.version>8.5.6</tomcat.version>
<undertow.version>1.4.3.Final</undertow.version>
<undertow.version>1.4.8.Final</undertow.version>
<webjars-hal-browser.version>9f96c74</webjars-hal-browser.version>
<webjars-locator.version>0.32</webjars-locator.version>
<wsdl4j.version>1.6.3</wsdl4j.version>

Loading…
Cancel
Save