From a4a0eef18699dcdd57a19e59c337d3e58c6266f5 Mon Sep 17 00:00:00 2001
From: Raja Kolli <rajadilipkolli@users.noreply.github.com>
Date: Tue, 8 Aug 2017 01:46:08 +0530
Subject: [PATCH] Upgrade to Hibernate Validator 6.0.2.Final

Closes gh-9969
---
 spring-boot-actuator-autoconfigure/pom.xml                | 2 +-
 spring-boot-actuator/pom.xml                              | 2 +-
 spring-boot-autoconfigure/pom.xml                         | 8 +++++++-
 spring-boot-dependencies/pom.xml                          | 4 ++--
 spring-boot-docs/pom.xml                                  | 2 +-
 spring-boot-starters/pom.xml                              | 1 +
 spring-boot-starters/spring-boot-starter-jersey/pom.xml   | 8 ++++++++
 .../spring-boot-starter-validation/pom.xml                | 2 +-
 spring-boot-starters/spring-boot-starter-web/pom.xml      | 2 +-
 spring-boot-starters/spring-boot-starter-webflux/pom.xml  | 2 +-
 spring-boot-test-autoconfigure/pom.xml                    | 2 +-
 spring-boot-tools/spring-boot-test-support/pom.xml        | 2 +-
 spring-boot/pom.xml                                       | 2 +-
 13 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/spring-boot-actuator-autoconfigure/pom.xml b/spring-boot-actuator-autoconfigure/pom.xml
index aaa39aa479b..87a1f031de1 100644
--- a/spring-boot-actuator-autoconfigure/pom.xml
+++ b/spring-boot-actuator-autoconfigure/pom.xml
@@ -209,7 +209,7 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<optional>true</optional>
 		</dependency>
diff --git a/spring-boot-actuator/pom.xml b/spring-boot-actuator/pom.xml
index 3be8e5d812e..23a3afb7018 100644
--- a/spring-boot-actuator/pom.xml
+++ b/spring-boot-actuator/pom.xml
@@ -97,7 +97,7 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<optional>true</optional>
 		</dependency>
diff --git a/spring-boot-autoconfigure/pom.xml b/spring-boot-autoconfigure/pom.xml
index 657a83dc454..2970da817a9 100755
--- a/spring-boot-autoconfigure/pom.xml
+++ b/spring-boot-autoconfigure/pom.xml
@@ -149,6 +149,12 @@
 			<groupId>org.glassfish.jersey.ext</groupId>
 			<artifactId>jersey-spring4</artifactId>
 			<optional>true</optional>
+			<exclusions>
+				<exclusion>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate-validator</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 		<dependency>
 			<groupId>org.glassfish.jersey.media</groupId>
@@ -300,7 +306,7 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<optional>true</optional>
 		</dependency>
diff --git a/spring-boot-dependencies/pom.xml b/spring-boot-dependencies/pom.xml
index 6bbb0a37611..cece3d34d5d 100644
--- a/spring-boot-dependencies/pom.xml
+++ b/spring-boot-dependencies/pom.xml
@@ -85,7 +85,7 @@
 		<hazelcast.version>3.8.5</hazelcast.version>
 		<hazelcast-hibernate5.version>1.2.2</hazelcast-hibernate5.version>
 		<hibernate.version>5.2.11.Final</hibernate.version>
-		<hibernate-validator.version>5.4.1.Final</hibernate-validator.version>
+		<hibernate-validator.version>6.0.2.Final</hibernate-validator.version>
 		<hikaricp.version>2.7.1</hikaricp.version>
 		<hsqldb.version>2.4.0</hsqldb.version>
 		<htmlunit.version>2.27</htmlunit.version>
@@ -1847,7 +1847,7 @@
 				<version>${hibernate.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.hibernate</groupId>
+				<groupId>org.hibernate.validator</groupId>
 				<artifactId>hibernate-validator</artifactId>
 				<version>${hibernate-validator.version}</version>
 			</dependency>
diff --git a/spring-boot-docs/pom.xml b/spring-boot-docs/pom.xml
index 956cba4925b..0b02c0c1e75 100644
--- a/spring-boot-docs/pom.xml
+++ b/spring-boot-docs/pom.xml
@@ -503,7 +503,7 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<optional>true</optional>
 		</dependency>
diff --git a/spring-boot-starters/pom.xml b/spring-boot-starters/pom.xml
index 7b39f950f57..59821bbf521 100644
--- a/spring-boot-starters/pom.xml
+++ b/spring-boot-starters/pom.xml
@@ -93,6 +93,7 @@
 								<bannedDependencies>
 									<excludes>
 										<exclude>commons-logging:*:*</exclude>
+										<exclude>org.hibernate:hibernate-validator:*</exclude>
 									</excludes>
 									<searchTransitive>true</searchTransitive>
 								</bannedDependencies>
diff --git a/spring-boot-starters/spring-boot-starter-jersey/pom.xml b/spring-boot-starters/spring-boot-starter-jersey/pom.xml
index 429377e9c4e..4b837b3d82b 100644
--- a/spring-boot-starters/spring-boot-starter-jersey/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-jersey/pom.xml
@@ -79,6 +79,10 @@
 					<groupId>org.glassfish.hk2.external</groupId>
 					<artifactId>javax.inject</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate-validator</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
@@ -93,6 +97,10 @@
 					<groupId>org.glassfish.hk2.external</groupId>
 					<artifactId>javax.inject</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.hibernate</groupId>
+					<artifactId>hibernate-validator</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-starters/spring-boot-starter-validation/pom.xml b/spring-boot-starters/spring-boot-starter-validation/pom.xml
index a6aa3bd7bba..04139fb7b82 100644
--- a/spring-boot-starters/spring-boot-starter-validation/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-validation/pom.xml
@@ -28,7 +28,7 @@
 			<artifactId>tomcat-embed-el</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 		</dependency>
 	</dependencies>
diff --git a/spring-boot-starters/spring-boot-starter-web/pom.xml b/spring-boot-starters/spring-boot-starter-web/pom.xml
index c849cd9d173..d4b9190e819 100644
--- a/spring-boot-starters/spring-boot-starter-web/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-web/pom.xml
@@ -32,7 +32,7 @@
 			<artifactId>spring-boot-starter-tomcat</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-starters/spring-boot-starter-webflux/pom.xml b/spring-boot-starters/spring-boot-starter-webflux/pom.xml
index b4916c88974..b48c0b84f25 100644
--- a/spring-boot-starters/spring-boot-starter-webflux/pom.xml
+++ b/spring-boot-starters/spring-boot-starter-webflux/pom.xml
@@ -32,7 +32,7 @@
 			<artifactId>spring-boot-starter-reactor-netty</artifactId>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 		</dependency>
 		<dependency>
diff --git a/spring-boot-test-autoconfigure/pom.xml b/spring-boot-test-autoconfigure/pom.xml
index 3743ae3f302..69bd946d7a0 100644
--- a/spring-boot-test-autoconfigure/pom.xml
+++ b/spring-boot-test-autoconfigure/pom.xml
@@ -234,7 +234,7 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<scope>test</scope>
 		</dependency>
diff --git a/spring-boot-tools/spring-boot-test-support/pom.xml b/spring-boot-tools/spring-boot-test-support/pom.xml
index fc889c72356..0a8076dbe55 100644
--- a/spring-boot-tools/spring-boot-test-support/pom.xml
+++ b/spring-boot-tools/spring-boot-test-support/pom.xml
@@ -101,7 +101,7 @@
 		</dependency>
 		<!-- Test -->
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<scope>test</scope>
 		</dependency>
diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index d79aac4d445..0a4d4736332 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -185,7 +185,7 @@
 			<optional>true</optional>
 		</dependency>
 		<dependency>
-			<groupId>org.hibernate</groupId>
+			<groupId>org.hibernate.validator</groupId>
 			<artifactId>hibernate-validator</artifactId>
 			<optional>true</optional>
 		</dependency>