Skip to content

S
spring-boot
Commit 81543873 authored by Stephane Nicoll's avatar Stephane Nicoll
Browse files
Options

Merge branch '2.1.x'

parents 727f5934 02ec1911
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
spring-boot-project/spring-boot-dependencies/pom.xml
View file @ 81543873
...@@ -2742,7 +2742,7 @@ ...@@ -2742,7 +2742,7 @@
</exclusion> </exclusion>
<exclusion> <exclusion>
<groupId>com.zaxxer</groupId> <groupId>com.zaxxer</groupId>
<artifactId>HikariCP-java6</artifactId> <artifactId>*</artifactId>
</exclusion> </exclusion>
</exclusions> </exclusions>
</dependency> </dependency>
......
spring-boot-project/spring-boot-parent/pom.xml
View file @ 81543873
...@@ -572,6 +572,7 @@ ...@@ -572,6 +572,7 @@
<rules> <rules>
<bannedDependencies> <bannedDependencies>
<excludes> <excludes>
<exclude>com.zaxxer:HikariCP-*</exclude>
<exclude>javax.*:*:*</exclude> <exclude>javax.*:*:*</exclude>
</excludes> </excludes>
<includes> <includes>
......
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