Merge branch '1.5.x'

pull/7300/head
Andy Wilkinson 8 years ago
commit 571e429449

@ -45,16 +45,16 @@
<properties>
<activemq.version>5.13.4</activemq.version>
<antlr2.version>2.7.7</antlr2.version>
<appengine.version>1.9.42</appengine.version>
<appengine.version>1.9.44</appengine.version>
<artemis.version>1.3.0</artemis.version>
<aspectj.version>1.8.9</aspectj.version>
<assertj.version>2.5.0</assertj.version>
<atomikos.version>3.9.3</atomikos.version>
<bitronix.version>2.1.4</bitronix.version>
<caffeine.version>2.3.3</caffeine.version>
<caffeine.version>2.3.4</caffeine.version>
<cassandra-driver.version>3.1.0</cassandra-driver.version>
<classmate.version>1.3.1</classmate.version>
<commons-beanutils.version>1.9.2</commons-beanutils.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>
<commons-codec.version>1.10</commons-codec.version>
<commons-dbcp2.version>2.1.1</commons-dbcp2.version>
@ -66,12 +66,12 @@
<derby.version>10.12.1.1</derby.version>
<dom4j.version>1.6.1</dom4j.version>
<dropwizard-metrics.version>3.1.2</dropwizard-metrics.version>
<ehcache.version>2.10.2.2.21</ehcache.version>
<ehcache3.version>3.1.2</ehcache3.version>
<ehcache.version>2.10.3</ehcache.version>
<ehcache3.version>3.1.3</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>
<elasticsearch.version>2.4.0</elasticsearch.version>
<elasticsearch.version>2.4.1</elasticsearch.version>
<gemfire.version>8.2.0</gemfire.version>
<glassfish-el.version>3.0.0</glassfish-el.version>
<gradle.version>2.9</gradle.version>
@ -92,7 +92,7 @@
<httpclient.version>4.5.2</httpclient.version>
<httpcore.version>4.4.5</httpcore.version>
<infinispan.version>8.2.4.Final</infinispan.version>
<jackson.version>2.8.3</jackson.version>
<jackson.version>2.8.4</jackson.version>
<janino.version>2.7.8</janino.version>
<javassist.version>3.20.0-GA</javassist.version> <!-- Same as Hibernate -->
<javax-cache.version>1.0.0</javax-cache.version>
@ -107,14 +107,14 @@
<jedis.version>2.9.0</jedis.version>
<jersey.version>2.23.2</jersey.version>
<jest.version>2.0.3</jest.version>
<jetty.version>9.3.11.v20160721</jetty.version>
<jetty.version>9.3.14.v20161028</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>
<jna.version>4.2.2</jna.version>
<joda-time.version>2.9.4</joda-time.version>
<jolokia.version>1.3.4</jolokia.version>
<jooq.version>3.8.4</jooq.version>
<jolokia.version>1.3.5</jolokia.version>
<jooq.version>3.8.5</jooq.version>
<json.version>20140107</json.version>
<jsonassert.version>1.3.0</jsonassert.version>
<json-path.version>2.2.0</json-path.version>
@ -128,11 +128,11 @@
<mariadb.version>1.4.6</mariadb.version>
<mockito.version>1.10.19</mockito.version>
<mongodb.version>3.2.2</mongodb.version>
<mysql.version>5.1.39</mysql.version>
<narayana.version>5.3.4.Final</narayana.version>
<mysql.version>5.1.40</mysql.version>
<narayana.version>5.3.5.Final</narayana.version>
<nekohtml.version>1.9.22</nekohtml.version>
<neo4j-ogm.version>2.0.5</neo4j-ogm.version>
<postgresql.version>9.4.1211.jre7</postgresql.version>
<postgresql.version>9.4.1212.jre7</postgresql.version>
<querydsl.version>4.1.4</querydsl.version>
<reactor.version>2.0.8.RELEASE</reactor.version>
<reactor-spring.version>2.0.7.RELEASE</reactor-spring.version>
@ -175,7 +175,7 @@
<thymeleaf-layout-dialect.version>1.4.0</thymeleaf-layout-dialect.version>
<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.5</tomcat.version>
<tomcat.version>8.5.6</tomcat.version>
<undertow.version>1.4.3.Final</undertow.version>
<webjars-hal-browser.version>9f96c74</webjars-hal-browser.version>
<webjars-locator.version>0.32</webjars-locator.version>

Loading…
Cancel
Save