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

Merge branch '2.1.x'

This commit is contained in:
Stephane Nicoll 2019-04-30 14:33:12 +02:00
parent 727f593408 02ec1911fc
commit 81543873d4
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2742,7 +2742,7 @@
</exclusion>
<exclusion>
<groupId>com.zaxxer</groupId>
<artifactId>HikariCP-java6</artifactId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

1
spring-boot-project/spring-boot-parent/pom.xml
View File

@ -572,6 +572,7 @@
<rules>
<bannedDependencies>
<excludes>
<exclude>com.zaxxer:HikariCP-*</exclude>
<exclude>javax.*:*:*</exclude>
</excludes>
<includes>