Merge branch '2.1.x'

liuxuehai · Apr 30, 2019 · 8154387 · 8154387
2 parents 727f593 + 02ec191
commit 8154387
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/spring-boot-project/spring-boot-dependencies/pom.xml b/spring-boot-project/spring-boot-dependencies/pom.xml
@@ -2742,7 +2742,7 @@
 					</exclusion>
 					<exclusion>
 						<groupId>com.zaxxer</groupId>
-						<artifactId>HikariCP-java6</artifactId>
+						<artifactId>*</artifactId>
 					</exclusion>
 				</exclusions>
 			</dependency>

diff --git a/spring-boot-project/spring-boot-parent/pom.xml b/spring-boot-project/spring-boot-parent/pom.xml
@@ -572,6 +572,7 @@
 							<rules>
 								<bannedDependencies>
 									<excludes>
+										<exclude>com.zaxxer:HikariCP-*</exclude>
 										<exclude>javax.*:*:*</exclude>
 									</excludes>
 									<includes>