Skip to content

S
spring-boot
Commit 13a3f7c0 authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.4.x' into 1.5.x

parents 18e11282 d45d9452
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
spring-boot-dependencies/pom.xml
View file @ 13a3f7c0
...@@ -46,9 +46,9 @@ ...@@ -46,9 +46,9 @@
<!-- Dependency versions --> <!-- Dependency versions -->
<activemq.version>5.14.4</activemq.version> <activemq.version>5.14.4</activemq.version>
<antlr2.version>2.7.7</antlr2.version> <antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.50</appengine-sdk.version> <appengine-sdk.version>1.9.51</appengine-sdk.version>
<artemis.version>1.5.4</artemis.version> <artemis.version>1.5.4</artemis.version>
<aspectj.version>1.8.9</aspectj.version> <aspectj.version>1.8.10</aspectj.version>
<assertj.version>2.6.0</assertj.version> <assertj.version>2.6.0</assertj.version>
<atomikos.version>3.9.3</atomikos.version> <atomikos.version>3.9.3</atomikos.version>
<bitronix.version>2.1.4</bitronix.version> <bitronix.version>2.1.4</bitronix.version>
...@@ -73,7 +73,7 @@ ...@@ -73,7 +73,7 @@
<ehcache3.version>3.2.1</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>3.2.1</flyway.version> <flyway.version>3.2.1</flyway.version>
<freemarker.version>2.3.25-incubating</freemarker.version> <freemarker.version>2.3.26-incubating</freemarker.version>
<elasticsearch.version>2.4.4</elasticsearch.version> <elasticsearch.version>2.4.4</elasticsearch.version>
<gemfire.version>8.2.3</gemfire.version> <gemfire.version>8.2.3</gemfire.version>
<glassfish-el.version>3.0.0</glassfish-el.version> <glassfish-el.version>3.0.0</glassfish-el.version>
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
<httpclient.version>4.5.3</httpclient.version> <httpclient.version>4.5.3</httpclient.version>
<httpcore.version>4.4.6</httpcore.version> <httpcore.version>4.4.6</httpcore.version>
<infinispan.version>8.2.6.Final</infinispan.version> <infinispan.version>8.2.6.Final</infinispan.version>
<jackson.version>2.8.7</jackson.version> <jackson.version>2.8.8</jackson.version>
<janino.version>2.7.8</janino.version> <janino.version>2.7.8</janino.version>
<javassist.version>3.21.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-cache.version>1.0.0</javax-cache.version>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<jmustache.version>1.13</jmustache.version> <jmustache.version>1.13</jmustache.version>
<jna.version>4.2.2</jna.version> <jna.version>4.2.2</jna.version>
<joda-time.version>2.9.9</joda-time.version> <joda-time.version>2.9.9</joda-time.version>
<jolokia.version>1.3.5</jolokia.version> <jolokia.version>1.3.6</jolokia.version>
<jooq.version>3.9.1</jooq.version> <jooq.version>3.9.1</jooq.version>
<json.version>20140107</json.version> <json.version>20140107</json.version>
<jsonassert.version>1.4.0</jsonassert.version> <jsonassert.version>1.4.0</jsonassert.version>
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<thymeleaf-layout-dialect.version>1.4.0</thymeleaf-layout-dialect.version> <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-data-attribute.version>1.3</thymeleaf-extras-data-attribute.version>
<thymeleaf-extras-java8time.version>2.1.0.RELEASE</thymeleaf-extras-java8time.version> <thymeleaf-extras-java8time.version>2.1.0.RELEASE</thymeleaf-extras-java8time.version>
<tomcat.version>8.5.12</tomcat.version> <tomcat.version>8.5.13</tomcat.version>
<undertow.version>1.4.11.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>9f96c74</webjars-hal-browser.version> <webjars-hal-browser.version>9f96c74</webjars-hal-browser.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