Skip to content

S
spring-boot
Commit 8973d6ce authored by Andy Wilkinson's avatar Andy Wilkinson
Browse files
Options

Merge branch '1.4.x' into 1.5.x

parents ecea5107 a8788ba6
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
spring-boot-dependencies/pom.xml
View file @ 8973d6ce
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
<!-- Dependency versions --> <!-- Dependency versions -->
<activemq.version>5.14.3</activemq.version> <activemq.version>5.14.3</activemq.version>
<antlr2.version>2.7.7</antlr2.version> <antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.49</appengine-sdk.version> <appengine-sdk.version>1.9.50</appengine-sdk.version>
<artemis.version>1.5.3</artemis.version> <artemis.version>1.5.3</artemis.version>
<aspectj.version>1.8.9</aspectj.version> <aspectj.version>1.8.9</aspectj.version>
<assertj.version>2.6.0</assertj.version> <assertj.version>2.6.0</assertj.version>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<crashub.version>1.3.2</crashub.version> <crashub.version>1.3.2</crashub.version>
<derby.version>10.13.1.1</derby.version> <derby.version>10.13.1.1</derby.version>
<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.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.1</ehcache3.version>
<embedded-mongo.version>1.50.5</embedded-mongo.version> <embedded-mongo.version>1.50.5</embedded-mongo.version>
...@@ -78,9 +78,9 @@ ...@@ -78,9 +78,9 @@
<gemfire.version>8.2.2</gemfire.version> <gemfire.version>8.2.2</gemfire.version>
<glassfish-el.version>3.0.0</glassfish-el.version> <glassfish-el.version>3.0.0</glassfish-el.version>
<gradle.version>2.9</gradle.version> <gradle.version>2.9</gradle.version>
<groovy.version>2.4.9</groovy.version> <groovy.version>2.4.10</groovy.version>
<gson.version>2.8.0</gson.version> <gson.version>2.8.0</gson.version>
<h2.version>1.4.193</h2.version> <h2.version>1.4.194</h2.version>
<hamcrest.version>1.3</hamcrest.version> <hamcrest.version>1.3</hamcrest.version>
<hazelcast.version>3.7.5</hazelcast.version> <hazelcast.version>3.7.5</hazelcast.version>
<hazelcast-hibernate4.version>3.7.1</hazelcast-hibernate4.version> <hazelcast-hibernate4.version>3.7.1</hazelcast-hibernate4.version>
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<javax-validation.version>1.1.0.Final</javax-validation.version> <javax-validation.version>1.1.0.Final</javax-validation.version>
<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.1.Final</jboss-logging.version>
<jboss-transaction-spi.version>7.5.1.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>
...@@ -117,7 +117,7 @@ ...@@ -117,7 +117,7 @@
<jms-api.version>1.1-rev-1</jms-api.version> <jms-api.version>1.1-rev-1</jms-api.version>
<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.7</joda-time.version> <joda-time.version>2.9.9</joda-time.version>
<jolokia.version>1.3.5</jolokia.version> <jolokia.version>1.3.5</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>
...@@ -129,7 +129,7 @@ ...@@ -129,7 +129,7 @@
<liquibase.version>3.5.3</liquibase.version> <liquibase.version>3.5.3</liquibase.version>
<log4j2.version>2.7</log4j2.version> <log4j2.version>2.7</log4j2.version>
<logback.version>1.1.11</logback.version> <logback.version>1.1.11</logback.version>
<lombok.version>1.16.14</lombok.version> <lombok.version>1.16.16</lombok.version>
<mariadb.version>1.5.8</mariadb.version> <mariadb.version>1.5.8</mariadb.version>
<mssql-jdbc.version>6.1.0.jre7</mssql-jdbc.version> <mssql-jdbc.version>6.1.0.jre7</mssql-jdbc.version>
<mockito.version>1.10.19</mockito.version> <mockito.version>1.10.19</mockito.version>
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
<sendgrid.version>2.2.2</sendgrid.version> <sendgrid.version>2.2.2</sendgrid.version>
<servlet-api.version>3.1.0</servlet-api.version> <servlet-api.version>3.1.0</servlet-api.version>
<simple-json.version>1.1.1</simple-json.version> <simple-json.version>1.1.1</simple-json.version>
<slf4j.version>1.7.24</slf4j.version> <slf4j.version>1.7.25</slf4j.version>
<snakeyaml.version>1.17</snakeyaml.version> <snakeyaml.version>1.17</snakeyaml.version>
<solr.version>5.5.4</solr.version> <solr.version>5.5.4</solr.version>
<spock.version>1.0-groovy-2.4</spock.version> <spock.version>1.0-groovy-2.4</spock.version>
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
<spring-integration-java-dsl.version>1.2.1.RELEASE</spring-integration-java-dsl.version> <spring-integration-java-dsl.version>1.2.1.RELEASE</spring-integration-java-dsl.version>
<spring-kafka.version>1.1.3.RELEASE</spring-kafka.version> <spring-kafka.version>1.1.3.RELEASE</spring-kafka.version>
<spring-ldap.version>2.3.1.RELEASE</spring-ldap.version> <spring-ldap.version>2.3.1.RELEASE</spring-ldap.version>
<spring-loaded.version>1.2.6.RELEASE</spring-loaded.version> <spring-loaded.version>1.2.7.RELEASE</spring-loaded.version>
<spring-mobile.version>1.1.5.RELEASE</spring-mobile.version> <spring-mobile.version>1.1.5.RELEASE</spring-mobile.version>
<spring-plugin.version>1.2.0.RELEASE</spring-plugin.version> <spring-plugin.version>1.2.0.RELEASE</spring-plugin.version>
<spring-restdocs.version>1.1.2.RELEASE</spring-restdocs.version> <spring-restdocs.version>1.1.2.RELEASE</spring-restdocs.version>
...@@ -184,11 +184,11 @@ ...@@ -184,11 +184,11 @@
<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.11</tomcat.version> <tomcat.version>8.5.12</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>
<webjars-locator.version>0.32</webjars-locator.version> <webjars-locator.version>0.32-1</webjars-locator.version>
<wsdl4j.version>1.6.3</wsdl4j.version> <wsdl4j.version>1.6.3</wsdl4j.version>
<xml-apis.version>1.4.01</xml-apis.version> <xml-apis.version>1.4.01</xml-apis.version>
<!-- Plugin versions --> <!-- Plugin versions -->
......
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