Merge branch '1.5.x'

2017-01-04 11:26:10 +00:00
parent 9a113e3b64 5f74c4c2c8
commit 37f9de7dc8
2 changed files with 4 additions and 1 deletions
--- a/spring-boot-parent/pom.xml
+++ b/spring-boot-parent/pom.xml
@@ -620,6 +620,9 @@
 					<annotations>
 						<annotation>org.springframework.boot.lang.UsesUnsafeJava</annotation>
 					</annotations>
+					<excludeDependencies>
+						<excludeDependency>org.glassfish.hk2.external:asm-all-repackaged</excludeDependency>
+					</excludeDependencies>
 				</configuration>
 				<executions>
 					<execution>