Commit a638401c authored by Andy Wilkinson's avatar Andy Wilkinson

Merge branch '1.5.x'

parents 833220f8 730e3744
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<dom4j.version>1.6.1</dom4j.version> <dom4j.version>1.6.1</dom4j.version>
<dropwizard-metrics.version>3.1.3</dropwizard-metrics.version> <dropwizard-metrics.version>3.1.3</dropwizard-metrics.version>
<ehcache.version>2.10.3</ehcache.version> <ehcache.version>2.10.3</ehcache.version>
<ehcache3.version>3.2.0</ehcache3.version> <ehcache3.version>3.2.1</ehcache3.version>
<embedded-mongo.version>1.50.5</embedded-mongo.version> <embedded-mongo.version>1.50.5</embedded-mongo.version>
<flyway.version>4.0.3</flyway.version> <flyway.version>4.0.3</flyway.version>
<freemarker.version>2.3.25-incubating</freemarker.version> <freemarker.version>2.3.25-incubating</freemarker.version>
...@@ -105,12 +105,12 @@ ...@@ -105,12 +105,12 @@
<jaxen.version>1.1.6</jaxen.version> <jaxen.version>1.1.6</jaxen.version>
<jaybird.version>2.2.12</jaybird.version> <jaybird.version>2.2.12</jaybird.version>
<jboss-logging.version>3.3.0.Final</jboss-logging.version> <jboss-logging.version>3.3.0.Final</jboss-logging.version>
<jboss-transaction-spi.version>7.5.0.Final</jboss-transaction-spi.version> <jboss-transaction-spi.version>7.5.1.Final</jboss-transaction-spi.version>
<jdom2.version>2.0.6</jdom2.version> <jdom2.version>2.0.6</jdom2.version>
<jedis.version>2.9.0</jedis.version> <jedis.version>2.9.0</jedis.version>
<jersey.version>2.25.1</jersey.version> <jersey.version>2.25.1</jersey.version>
<jest.version>2.0.4</jest.version> <jest.version>2.0.4</jest.version>
<jetty.version>9.4.1.v20170120</jetty.version> <jetty.version>9.4.2.v20170220</jetty.version>
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version> <jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>
<jetty-el.version>8.0.33</jetty-el.version> <jetty-el.version>8.0.33</jetty-el.version>
<jmustache.version>1.13</jmustache.version> <jmustache.version>1.13</jmustache.version>
...@@ -135,7 +135,7 @@ ...@@ -135,7 +135,7 @@
<mongo-driver-reactivestreams.version>1.2.0</mongo-driver-reactivestreams.version> <mongo-driver-reactivestreams.version>1.2.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.2.Final</narayana.version> <narayana.version>5.5.3.Final</narayana.version>
<nekohtml.version>1.9.22</nekohtml.version> <nekohtml.version>1.9.22</nekohtml.version>
<neo4j-ogm.version>2.1.1</neo4j-ogm.version> <neo4j-ogm.version>2.1.1</neo4j-ogm.version>
<netty.version>4.1.8.Final</netty.version> <netty.version>4.1.8.Final</netty.version>
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,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.11</tomcat.version> <tomcat.version>8.5.11</tomcat.version>
<undertow.version>1.4.10.Final</undertow.version> <undertow.version>1.4.11.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</webjars-locator.version> <webjars-locator.version>0.32</webjars-locator.version>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment