Merge branch '2.1.x'

81543873 · Stephane Nicoll · 727f5934 · 02ec1911 · 81543873 · 81543873
Commit 81543873 authored Apr 30, 2019 by Stephane Nicoll
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

pom.xml spring-boot-project/spring-boot-dependencies/pom.xml +1 -1

pom.xml spring-boot-project/spring-boot-parent/pom.xml +1 -0

No files found.
--- 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>

--- 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>