root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge branch '1.5.x'

This commit is contained in:
Andy Wilkinson 2017-01-04 11:26:10 +00:00
parent 9a113e3b64 5f74c4c2c8
commit 37f9de7dc8
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-dependencies/pom.xml
View File

@ -105,7 +105,7 @@
<jboss-transaction-spi.version>7.5.0.Final</jboss-transaction-spi.version> <jboss-transaction-spi.version>7.5.0.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.24</jersey.version> <jersey.version>2.25</jersey.version>
<jest.version>2.0.4</jest.version> <jest.version>2.0.4</jest.version>
<jetty.version>9.4.0.v20161208</jetty.version> <jetty.version>9.4.0.v20161208</jetty.version>
<jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version> <jetty-jsp.version>2.2.0.v201112011158</jetty-jsp.version>

3
spring-boot-parent/pom.xml
View File

@ -620,6 +620,9 @@
<annotations> <annotations>
<annotation>org.springframework.boot.lang.UsesUnsafeJava</annotation> <annotation>org.springframework.boot.lang.UsesUnsafeJava</annotation>
</annotations> </annotations>
<excludeDependencies>
<excludeDependency>org.glassfish.hk2.external:asm-all-repackaged</excludeDependency>
</excludeDependencies>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>