Skip to content

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

Merge branch '1.4.x' into 1.5.x

parents 73884d90 80a6f42a
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
spring-boot-dependencies/pom.xml
View file @ 64705740
......@@ -45,13 +45,13 @@
<properties>
<activemq.version>5.13.4</activemq.version>
<antlr2.version>2.7.7</antlr2.version>
<appengine-sdk.version>1.9.44</appengine-sdk.version>
<appengine-sdk.version>1.9.48</appengine-sdk.version>
<artemis.version>1.5.0</artemis.version>
<aspectj.version>1.8.9</aspectj.version>
<aspectj.version>1.8.10</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.4</caffeine.version>
<caffeine.version>2.3.5</caffeine.version>
<cassandra-driver.version>3.1.0</cassandra-driver.version>
<classmate.version>1.3.3</classmate.version>
<commons-beanutils.version>1.9.3</commons-beanutils.version>
......@@ -73,7 +73,7 @@
<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.1</elasticsearch.version>
<elasticsearch.version>2.4.3</elasticsearch.version>
<gemfire.version>8.2.0</gemfire.version>
<glassfish-el.version>3.0.0</glassfish-el.version>
<gradle.version>2.9</gradle.version>
......@@ -93,8 +93,8 @@
<httpasyncclient.version>4.1.2</httpasyncclient.version>
<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.4</jackson.version>
<infinispan.version>8.2.5.Final</infinispan.version>
<jackson.version>2.8.5</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>
......@@ -108,16 +108,16 @@
<jdom2.version>2.0.6</jdom2.version>
<jedis.version>2.9.0</jedis.version>
<jersey.version>2.24</jersey.version>
<jest.version>2.0.3</jest.version>
<jest.version>2.0.4</jest.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>
<jms-api.version>1.1-rev-1</jms-api.version>
<jmustache.version>1.12</jmustache.version>
<jna.version>4.2.2</jna.version>
<joda-time.version>2.9.5</joda-time.version>
<joda-time.version>2.9.6</joda-time.version>
<jolokia.version>1.3.5</jolokia.version>
<jooq.version>3.8.5</jooq.version>
<jooq.version>3.8.6</jooq.version>
<json.version>20140107</json.version>
<jsonassert.version>1.3.0</jsonassert.version>
<json-path.version>2.2.0</json-path.version>
......@@ -145,7 +145,7 @@
<sendgrid.version>2.2.2</sendgrid.version>
<servlet-api.version>3.1.0</servlet-api.version>
<simple-json.version>1.1.1</simple-json.version>
<slf4j.version>1.7.21</slf4j.version>
<slf4j.version>1.7.22</slf4j.version>
<snakeyaml.version>1.17</snakeyaml.version>
<solr.version>5.5.3</solr.version>
<spock.version>1.0-groovy-2.4</spock.version>
......@@ -176,7 +176,7 @@
<statsd-client.version>3.1.0</statsd-client.version>
<sun-mail.version>${javax-mail.version}</sun-mail.version>
<thymeleaf.version>2.1.5.RELEASE</thymeleaf.version>
<thymeleaf-extras-springsecurity4.version>2.1.2.RELEASE</thymeleaf-extras-springsecurity4.version>
<thymeleaf-extras-springsecurity4.version>2.1.3.RELEASE</thymeleaf-extras-springsecurity4.version>
<thymeleaf-extras-conditionalcomments.version>2.1.2.RELEASE</thymeleaf-extras-conditionalcomments.version>
<thymeleaf-layout-dialect.version>1.4.0</thymeleaf-layout-dialect.version>
<thymeleaf-extras-data-attribute.version>1.3</thymeleaf-extras-data-attribute.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