Merge branch '1.5.x'

pull/11595/head
Andy Wilkinson 8 years ago
commit b16fcf8269

@ -72,7 +72,7 @@
<dom4j.version>1.6.1</dom4j.version> <dom4j.version>1.6.1</dom4j.version>
<dropwizard-metrics.version>3.1.4</dropwizard-metrics.version> <dropwizard-metrics.version>3.1.4</dropwizard-metrics.version>
<ehcache.version>2.10.3</ehcache.version> <ehcache.version>2.10.3</ehcache.version>
<ehcache3.version>3.2.1</ehcache3.version> <ehcache3.version>3.2.2</ehcache3.version>
<embedded-mongo.version>2.0.0</embedded-mongo.version> <embedded-mongo.version>2.0.0</embedded-mongo.version>
<flyway.version>4.1.2</flyway.version> <flyway.version>4.1.2</flyway.version>
<freemarker.version>2.3.26-incubating</freemarker.version> <freemarker.version>2.3.26-incubating</freemarker.version>
@ -134,7 +134,7 @@
<mongo-driver-reactivestreams.version>1.3.0</mongo-driver-reactivestreams.version> <mongo-driver-reactivestreams.version>1.3.0</mongo-driver-reactivestreams.version>
<mongodb.version>3.4.2</mongodb.version> <mongodb.version>3.4.2</mongodb.version>
<mysql.version>5.1.41</mysql.version> <mysql.version>5.1.41</mysql.version>
<narayana.version>5.5.5.Final</narayana.version> <narayana.version>5.5.6.Final</narayana.version>
<nekohtml.version>1.9.22</nekohtml.version> <nekohtml.version>1.9.22</nekohtml.version>
<neo4j-ogm.version>3.0.0-SNAPSHOT</neo4j-ogm.version> <neo4j-ogm.version>3.0.0-SNAPSHOT</neo4j-ogm.version>
<netty.version>4.1.9.Final</netty.version> <netty.version>4.1.9.Final</netty.version>
@ -186,7 +186,7 @@
<thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version> <thymeleaf-extras-data-attribute.version>2.0.1</thymeleaf-extras-data-attribute.version>
<thymeleaf-extras-java8time.version>3.0.0.RELEASE</thymeleaf-extras-java8time.version> <thymeleaf-extras-java8time.version>3.0.0.RELEASE</thymeleaf-extras-java8time.version>
<tomcat.version>8.5.13</tomcat.version> <tomcat.version>8.5.13</tomcat.version>
<undertow.version>1.4.11.Final</undertow.version> <undertow.version>1.4.12.Final</undertow.version>
<unboundid-ldapsdk.version>3.2.1</unboundid-ldapsdk.version> <unboundid-ldapsdk.version>3.2.1</unboundid-ldapsdk.version>
<webjars-hal-browser.version>3325375</webjars-hal-browser.version> <webjars-hal-browser.version>3325375</webjars-hal-browser.version>
<webjars-locator.version>0.32-1</webjars-locator.version> <webjars-locator.version>0.32-1</webjars-locator.version>

Loading…
Cancel
Save