Merge branch '1.3.x'

This commit is contained in:
Andy Wilkinson
2016-09-19 21:05:58 +01:00

View File

@@ -97,10 +97,10 @@
<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>
<javax-mail.version>1.5.5</javax-mail.version>
<javax-mail.version>1.5.6</javax-mail.version>
<javax-transaction.version>1.2</javax-transaction.version>
<jaxen.version>1.1.6</jaxen.version>
<jaybird.version>2.2.10</jaybird.version>
<jaybird.version>2.2.11</jaybird.version>
<jboss-logging.version>3.3.0.Final</jboss-logging.version>
<jboss-transaction-spi.version>7.3.2.Final</jboss-transaction-spi.version>
<jdom2.version>2.0.6</jdom2.version>
@@ -113,7 +113,7 @@
<jmustache.version>1.12</jmustache.version>
<jna.version>4.2.2</jna.version>
<joda-time.version>2.9.4</joda-time.version>
<jolokia.version>1.3.3</jolokia.version>
<jolokia.version>1.3.4</jolokia.version>
<jooq.version>3.8.4</jooq.version>
<json.version>20140107</json.version>
<jsonassert.version>1.3.0</jsonassert.version>
@@ -132,7 +132,7 @@
<narayana.version>5.3.3.Final</narayana.version>
<nekohtml.version>1.9.22</nekohtml.version>
<neo4j-ogm.version>2.0.4</neo4j-ogm.version>
<postgresql.version>9.4.1209.jre7</postgresql.version>
<postgresql.version>9.4.1211.jre7</postgresql.version>
<querydsl.version>4.1.3</querydsl.version>
<reactor.version>2.0.8.RELEASE</reactor.version>
<reactor-spring.version>2.0.7.RELEASE</reactor-spring.version>
@@ -158,8 +158,8 @@
<spring-restdocs.version>1.1.1.RELEASE</spring-restdocs.version>
<spring-retry.version>1.1.3.RELEASE</spring-retry.version>
<spring-security.version>4.1.3.RELEASE</spring-security.version>
<spring-security-jwt.version>1.0.4.RELEASE</spring-security-jwt.version>
<spring-security-oauth.version>2.0.10.RELEASE</spring-security-oauth.version>
<spring-security-jwt.version>1.0.5.RELEASE</spring-security-jwt.version>
<spring-security-oauth.version>2.0.11.RELEASE</spring-security-oauth.version>
<spring-session.version>1.2.2.RELEASE</spring-session.version>
<spring-social.version>1.1.4.RELEASE</spring-social.version>
<spring-social-facebook.version>2.0.3.RELEASE</spring-social-facebook.version>