You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pluto-scm@portals.apache.org by as...@apache.org on 2021/12/17 02:27:37 UTC

[portals-pluto] branch master updated: PLUTO-794 Downgrade to hibernate-validator-5.4.3.Final and validation-api-1.1.0.Final in order to conform to Java EE 7

This is an automated email from the ASF dual-hosted git repository.

asfgriff pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/portals-pluto.git


The following commit(s) were added to refs/heads/master by this push:
     new 4b7fc65  PLUTO-794 Downgrade to hibernate-validator-5.4.3.Final and validation-api-1.1.0.Final in order to conform to Java EE 7
4b7fc65 is described below

commit 4b7fc65344c885bea0d09faaf7cb46bb21df844d
Author: Neil Griffin <ne...@gmail.com>
AuthorDate: Thu Dec 16 21:26:30 2021 -0500

    PLUTO-794 Downgrade to hibernate-validator-5.4.3.Final and validation-api-1.1.0.Final in order to conform to Java EE 7
---
 demo/applicant-mvcbean-cdi-jsp-portlet/pom.xml     | 20 ++++++-------
 .../controller/PreferencesActionController.java    |  3 +-
 .../applicant/mvcbean/cdi/jsp/dto/Applicant.java   |  9 +++---
 .../applicant/mvcbean/cdi/jsp/dto/Preferences.java |  2 +-
 .../pom.xml                                        | 20 ++++++-------
 .../controller/PreferencesActionController.java    |  2 +-
 .../mvcbean/cdi/thymeleaf/dto/Applicant.java       |  9 +++---
 .../mvcbean/cdi/thymeleaf/dto/Preferences.java     |  2 +-
 demo/chat-room-demo-portlet/pom.xml                |  2 +-
 demo/hub-demo-portlet/pom.xml                      |  2 +-
 demo/v3-annotated-demo-portlet/pom.xml             |  2 +-
 demo/v3-demo-portlet/pom.xml                       |  2 +-
 .../resources/archetype-resources/build.gradle     |  3 +-
 .../src/main/resources/archetype-resources/pom.xml | 33 +++++++++++++---------
 .../java/__packageInPathFormat__/dto/User.java     |  2 +-
 .../resources/archetype-resources/build.gradle     |  3 +-
 .../src/main/resources/archetype-resources/pom.xml | 33 +++++++++++++---------
 .../java/__packageInPathFormat__/dto/User.java     |  2 +-
 .../apache/pluto/maven/InstallationDependency.java |  4 +--
 .../container/bean/mvc/BeanValidationProducer.java |  5 ++--
 pom.xml                                            |  8 +++---
 .../pom.xml                                        |  2 +-
 .../pom.xml                                        |  2 +-
 .../pom.xml                                        |  2 +-
 .../V3AnnotationPortletConfigTests/pom.xml         |  2 +-
 portlet-tck_3.0/V3HeaderPortletTests/pom.xml       |  2 +-
 portlet-tck_3.0/V3PortletConfigTests/pom.xml       |  2 +-
 portlet-tck_3.0/V3PortletContextTests/pom.xml      |  2 +-
 portlet-tck_3.0/V3PortletHubTests/pom.xml          |  2 +-
 portlet-tck_3.0/V3PortletParametersTests/pom.xml   |  2 +-
 portlet-tck_3.0/V3RenderStateTests/pom.xml         |  2 +-
 portlet-tck_3.0/V3ResourceAsyncTests/pom.xml       |  2 +-
 portlet-tck_3.0/V3URLTests/pom.xml                 |  2 +-
 33 files changed, 105 insertions(+), 87 deletions(-)

diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/pom.xml b/demo/applicant-mvcbean-cdi-jsp-portlet/pom.xml
index cede119..e708605 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/pom.xml
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/pom.xml
@@ -38,16 +38,6 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.hibernate</groupId>
-					<artifactId>hibernate-validator</artifactId>
-					<exclusions>
-						<exclusion>
-							<groupId>javax.validation</groupId>
-							<artifactId>validation-api</artifactId>
-						</exclusion>
-					</exclusions>
-				</dependency>
-				<dependency>
-					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator-cdi</artifactId>
 				</dependency>
 			</dependencies>
@@ -107,5 +97,15 @@
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.validation</groupId>
+					<artifactId>validation-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/PreferencesActionController.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/PreferencesActionController.java
index 79d4708..85c29d1 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/PreferencesActionController.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/controller/PreferencesActionController.java
@@ -35,13 +35,14 @@ import javax.portlet.PortletPreferences;
 import javax.portlet.WindowState;
 import javax.portlet.annotations.ActionMethod;
 import javax.portlet.annotations.PortletRequestScoped;
-import javax.validation.constraints.NotBlank;
 import javax.validation.executable.ExecutableType;
 import javax.validation.executable.ValidateOnExecution;
 import javax.ws.rs.FormParam;
 
 import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto.Preferences;
 
+import org.hibernate.validator.constraints.NotBlank;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Applicant.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Applicant.java
index 12d3c8f..f0d53a5 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Applicant.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Applicant.java
@@ -24,14 +24,15 @@ import java.util.List;
 
 import javax.enterprise.context.Dependent;
 import javax.inject.Inject;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Past;
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
 import javax.ws.rs.FormParam;
 
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.Range;
+
 
 /**
  * @author  Neil Griffin
@@ -86,7 +87,7 @@ public class Applicant implements Serializable {
 	@Inject
 	@FormParam("provinceId")
 	@NotNull
-	@Positive
+	@Range(min = 1L)
 	private Long provinceId;
 
 	public Applicant() {
diff --git a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Preferences.java b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Preferences.java
index 2cc1784..1f8fdda 100644
--- a/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Preferences.java
+++ b/demo/applicant-mvcbean-cdi-jsp-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/jsp/dto/Preferences.java
@@ -16,7 +16,7 @@
  */
 package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.jsp.dto;
 
-import javax.validation.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotBlank;
 
 
 /**
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/pom.xml b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/pom.xml
index 371179c..da62050 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/pom.xml
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/pom.xml
@@ -38,16 +38,6 @@
 			<dependencies>
 				<dependency>
 					<groupId>org.hibernate</groupId>
-					<artifactId>hibernate-validator</artifactId>
-					<exclusions>
-						<exclusion>
-							<groupId>javax.validation</groupId>
-							<artifactId>validation-api</artifactId>
-						</exclusion>
-					</exclusions>
-				</dependency>
-				<dependency>
-					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator-cdi</artifactId>
 				</dependency>
 			</dependencies>
@@ -106,5 +96,15 @@
 			<groupId>org.apache.logging.log4j</groupId>
 			<artifactId>log4j-slf4j-impl</artifactId>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.validation</groupId>
+					<artifactId>validation-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesActionController.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesActionController.java
index c4acaf7..7775fdf 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesActionController.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/controller/PreferencesActionController.java
@@ -35,13 +35,13 @@ import javax.portlet.PortletPreferences;
 import javax.portlet.WindowState;
 import javax.portlet.annotations.ActionMethod;
 import javax.portlet.annotations.PortletRequestScoped;
-import javax.validation.constraints.NotBlank;
 import javax.validation.executable.ExecutableType;
 import javax.validation.executable.ValidateOnExecution;
 import javax.ws.rs.FormParam;
 
 import org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto.Preferences;
 
+import org.hibernate.validator.constraints.NotBlank;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Applicant.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Applicant.java
index 0924cbc..03decea 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Applicant.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Applicant.java
@@ -24,14 +24,15 @@ import java.util.List;
 
 import javax.enterprise.context.Dependent;
 import javax.inject.Inject;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Past;
 import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Positive;
 import javax.ws.rs.FormParam;
 
+import org.hibernate.validator.constraints.Email;
+import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.Range;
+
 
 /**
  * @author  Neil Griffin
@@ -86,7 +87,7 @@ public class Applicant implements Serializable {
 	@Inject
 	@FormParam("provinceId")
 	@NotNull
-	@Positive
+	@Range(min = 1L)
 	private Long provinceId;
 
 	public Applicant() {
diff --git a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Preferences.java b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Preferences.java
index 3127084..4462904 100644
--- a/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Preferences.java
+++ b/demo/applicant-mvcbean-cdi-thymeleaf-portlet/src/main/java/org/apache/portals/pluto/demo/applicant/mvcbean/cdi/thymeleaf/dto/Preferences.java
@@ -16,7 +16,7 @@
  */
 package org.apache.portals.pluto.demo.applicant.mvcbean.cdi.thymeleaf.dto;
 
-import javax.validation.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotBlank;
 
 
 /**
diff --git a/demo/chat-room-demo-portlet/pom.xml b/demo/chat-room-demo-portlet/pom.xml
index ecc0fe8..0500d92 100644
--- a/demo/chat-room-demo-portlet/pom.xml
+++ b/demo/chat-room-demo-portlet/pom.xml
@@ -138,7 +138,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/demo/hub-demo-portlet/pom.xml b/demo/hub-demo-portlet/pom.xml
index b5dde78..3296c2e 100644
--- a/demo/hub-demo-portlet/pom.xml
+++ b/demo/hub-demo-portlet/pom.xml
@@ -131,7 +131,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/demo/v3-annotated-demo-portlet/pom.xml b/demo/v3-annotated-demo-portlet/pom.xml
index 91a66e8..68f797a 100644
--- a/demo/v3-annotated-demo-portlet/pom.xml
+++ b/demo/v3-annotated-demo-portlet/pom.xml
@@ -120,7 +120,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/demo/v3-demo-portlet/pom.xml b/demo/v3-demo-portlet/pom.xml
index be82cad..e4afd05 100644
--- a/demo/v3-demo-portlet/pom.xml
+++ b/demo/v3-demo-portlet/pom.xml
@@ -139,7 +139,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/build.gradle b/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/build.gradle
index adbcf3d..5175934 100644
--- a/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/build.gradle
+++ b/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/build.gradle
@@ -10,7 +10,8 @@ dependencies {
     compile group: 'org.apache.taglibs', name: 'taglibs-standard-jstlel', version:'1.2.1'
     providedCompile group: 'javax.mvc', name: 'javax.mvc-api', version:'1.0-pfd'
     providedCompile group: 'javax.portlet', name: 'portlet-api', version:'3.0.0'
-    providedCompile group: 'javax.validation', name: 'validation-api', version:'2.0.1.Final'
+    providedCompile group: 'javax.validation', name: 'validation-api', version:'1.1.0.Final'
     providedCompile group: 'javax.ws.rs', name: 'javax.ws.rs-api', version:'2.1.1'
+    providedCompile group: 'org.hibernate', name: 'hibernate-validator', version:'5.4.3.Final'
 }
 
diff --git a/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/pom.xml
index 0bbd9fe..3cf0753 100644
--- a/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/pom.xml
@@ -6,6 +6,9 @@
 	<packaging>war</packaging>
 	<name>${artifactId}</name>
 	<version>${version}</version>
+	<properties>
+		<hibernate.validator.scope>provided</hibernate.validator.scope>
+	</properties>
 	<profiles>
 		<profile>
 			<id>pluto</id>
@@ -22,22 +25,14 @@
 		</profile>
 		<profile>
 			<id>liferay</id>
+			<properties>
+				<hibernate.validator.scope>compile</hibernate.validator.scope>
+			</properties>
 			<dependencies>
 				<dependency>
 					<groupId>org.hibernate</groupId>
-					<artifactId>hibernate-validator</artifactId>
-					<version>6.0.14.Final</version>
-					<exclusions>
-						<exclusion>
-							<groupId>javax.validation</groupId>
-							<artifactId>validation-api</artifactId>
-						</exclusion>
-					</exclusions>
-				</dependency>
-				<dependency>
-					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator-cdi</artifactId>
-					<version>6.0.14.Final</version>
+					<version>5.4.3.Final</version>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -86,7 +81,7 @@
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-			<version>2.0.1.Final</version>
+			<version>1.1.0.Final</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -106,5 +101,17 @@
 			<version>2.16.0</version>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>5.4.3.Final</version>
+			<scope>${hibernate.validator.scope}</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.validation</groupId>
+					<artifactId>validation-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/dto/User.java b/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/dto/User.java
index e0fbaf2..96c1c56 100644
--- a/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/dto/User.java
+++ b/maven-archetypes/mvcbean-jsp-portlet-archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/dto/User.java
@@ -1,9 +1,9 @@
 package ${package}.dto;
 
 import javax.inject.Inject;
-import javax.validation.constraints.NotBlank;
 import javax.ws.rs.FormParam;
 import java.io.Serializable;
+import org.hibernate.validator.constraints.NotBlank;
 
 public class User implements Serializable {
 
diff --git a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/build.gradle b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/build.gradle
index 0ed77e9..9440848 100644
--- a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/build.gradle
+++ b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/build.gradle
@@ -10,7 +10,8 @@ dependencies {
     compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version:'2.16.0'
     providedCompile group: 'javax.mvc', name: 'javax.mvc-api', version:'1.0-pfd'
     providedCompile group: 'javax.portlet', name: 'portlet-api', version:'3.0.0'
-    providedCompile group: 'javax.validation', name: 'validation-api', version:'2.0.1.Final'
+    providedCompile group: 'javax.validation', name: 'validation-api', version:'1.1.0.Final'
     providedCompile group: 'javax.ws.rs', name: 'javax.ws.rs-api', version:'2.1.1'
+    providedCompile group: 'org.hibernate', name: 'hibernate-validator', version:'5.4.3.Final'
 }
 
diff --git a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/pom.xml b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/pom.xml
index 160faf0..d39aac1 100644
--- a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/pom.xml
@@ -6,25 +6,20 @@
 	<packaging>war</packaging>
 	<name>${artifactId}</name>
 	<version>${version}</version>
+	<properties>
+		<hibernate.validator.scope>provided</hibernate.validator.scope>
+	</properties>
 	<profiles>
 		<profile>
 			<id>liferay</id>
+			<properties>
+				<hibernate.validator.scope>compile</hibernate.validator.scope>
+			</properties>
 			<dependencies>
 				<dependency>
 					<groupId>org.hibernate</groupId>
-					<artifactId>hibernate-validator</artifactId>
-					<version>6.0.14.Final</version>
-					<exclusions>
-						<exclusion>
-							<groupId>javax.validation</groupId>
-							<artifactId>validation-api</artifactId>
-						</exclusion>
-					</exclusions>
-				</dependency>
-				<dependency>
-					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator-cdi</artifactId>
-					<version>6.0.14.Final</version>
+					<version>5.4.3.Final</version>
 				</dependency>
 			</dependencies>
 		</profile>
@@ -73,7 +68,7 @@
 		<dependency>
 			<groupId>javax.validation</groupId>
 			<artifactId>validation-api</artifactId>
-			<version>2.0.1.Final</version>
+			<version>1.1.0.Final</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -98,5 +93,17 @@
 			<version>2.16.0</version>
 			<scope>runtime</scope>
 		</dependency>
+		<dependency>
+			<groupId>org.hibernate</groupId>
+			<artifactId>hibernate-validator</artifactId>
+			<version>5.4.3.Final</version>
+			<scope>${hibernate.validator.scope}</scope>
+			<exclusions>
+				<exclusion>
+					<groupId>javax.validation</groupId>
+					<artifactId>validation-api</artifactId>
+				</exclusion>
+			</exclusions>
+		</dependency>
 	</dependencies>
 </project>
diff --git a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/dto/User.java b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/dto/User.java
index e0fbaf2..96c1c56 100644
--- a/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/dto/User.java
+++ b/maven-archetypes/mvcbean-thymeleaf-portlet-archetype/src/main/resources/archetype-resources/src/main/java/__packageInPathFormat__/dto/User.java
@@ -1,9 +1,9 @@
 package ${package}.dto;
 
 import javax.inject.Inject;
-import javax.validation.constraints.NotBlank;
 import javax.ws.rs.FormParam;
 import java.io.Serializable;
+import org.hibernate.validator.constraints.NotBlank;
 
 public class User implements Serializable {
 
diff --git a/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java b/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
index 84e80da..74d3800 100644
--- a/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
+++ b/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
@@ -55,11 +55,11 @@ class InstallationDependency {
             VERSION_PROPERTIES.getProperty("classmate.version"));
 
     public static final InstallationDependency HIBERNATE_VALIDATOR =
-        new InstallationDependency("org.hibernate.validator", "hibernate-validator",
+        new InstallationDependency("org.hibernate", "hibernate-validator",
             VERSION_PROPERTIES.getProperty("hibernate-validator.version"));
 
     public static final InstallationDependency HIBERNATE_VALIDATOR_CDI =
-        new InstallationDependency("org.hibernate.validator", "hibernate-validator-cdi",
+        new InstallationDependency("org.hibernate", "hibernate-validator-cdi",
             VERSION_PROPERTIES.getProperty("hibernate-validator.version"));
 
     public static final InstallationDependency JAXRS_API =
diff --git a/pluto-container/src/main/java/org/apache/pluto/container/bean/mvc/BeanValidationProducer.java b/pluto-container/src/main/java/org/apache/pluto/container/bean/mvc/BeanValidationProducer.java
index 82726b8..698a6ef 100644
--- a/pluto-container/src/main/java/org/apache/pluto/container/bean/mvc/BeanValidationProducer.java
+++ b/pluto-container/src/main/java/org/apache/pluto/container/bean/mvc/BeanValidationProducer.java
@@ -25,7 +25,6 @@ import javax.enterprise.inject.Instance;
 import javax.enterprise.inject.Produces;
 import javax.inject.Inject;
 import javax.validation.MessageInterpolator;
-import javax.validation.NoProviderFoundException;
 import javax.validation.Validation;
 import javax.validation.Validator;
 import javax.validation.ValidatorFactory;
@@ -82,8 +81,8 @@ public class BeanValidationProducer {
 			try {
 				validatorFactory = Validation.buildDefaultValidatorFactory();
 			}
-			catch (NoProviderFoundException npfe) {
-				LOG.error(npfe.getMessage(), npfe);
+			catch (Exception e) {
+				LOG.error(e.getMessage(), e);
 			}
 		}
 
diff --git a/pom.xml b/pom.xml
index 98ce46e..b1b3452 100644
--- a/pom.xml
+++ b/pom.xml
@@ -260,11 +260,11 @@ generate mailto links. -->
 		<annotation-detector.version>3.0.5</annotation-detector.version>
 		<!-- MVC ================================================== -->
 		<classmate.version>1.3.4</classmate.version>
-		<hibernate-validator.version>6.0.20.Final</hibernate-validator.version>
+		<hibernate-validator.version>5.4.3.Final</hibernate-validator.version>
 		<jaxrs-api.version>2.1.1</jaxrs-api.version>
 		<mvc-api.version>1.0-pfd</mvc-api.version>
 		<jboss-logging.version>3.3.2.Final</jboss-logging.version>
-		<validation-api.version>2.0.1.Final</validation-api.version>
+		<validation-api.version>1.1.0.Final</validation-api.version>
 		<!-- scope of certain dependencies is "compile" for deployment on tomcat,
          but "provided" for deployment on tomee. See tomee profile. -->
 		<dependency.scope>compile</dependency.scope>
@@ -408,7 +408,7 @@ generate mailto links. -->
 				<version>${classmate.version}</version>
 			</dependency>
 			<dependency>
-				<groupId>org.hibernate.validator</groupId>
+				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-validator</artifactId>
 				<version>${hibernate-validator.version}</version>
 				<exclusions>
@@ -419,7 +419,7 @@ generate mailto links. -->
 				</exclusions>
 			</dependency>
 			<dependency>
-				<groupId>org.hibernate.validator</groupId>
+				<groupId>org.hibernate</groupId>
 				<artifactId>hibernate-validator-cdi</artifactId>
 				<version>${hibernate-validator.version}</version>
 			</dependency>
diff --git a/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/pom.xml b/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/pom.xml
index 719f541..8b36a1b 100644
--- a/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/pom.xml
+++ b/portlet-tck_3.0/V3AnnotationPortletAppConfigOverrideTests/pom.xml
@@ -162,7 +162,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/portlet-tck_3.0/V3AnnotationPortletApplicationConfigTests/pom.xml b/portlet-tck_3.0/V3AnnotationPortletApplicationConfigTests/pom.xml
index 6e79c8d..c36e001 100644
--- a/portlet-tck_3.0/V3AnnotationPortletApplicationConfigTests/pom.xml
+++ b/portlet-tck_3.0/V3AnnotationPortletApplicationConfigTests/pom.xml
@@ -162,7 +162,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/pom.xml b/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/pom.xml
index 2e276f6..84f4ff8 100644
--- a/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/pom.xml
+++ b/portlet-tck_3.0/V3AnnotationPortletArtifactValidityTests/pom.xml
@@ -163,7 +163,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/portlet-tck_3.0/V3AnnotationPortletConfigTests/pom.xml b/portlet-tck_3.0/V3AnnotationPortletConfigTests/pom.xml
index 8f14452..925d8d3 100644
--- a/portlet-tck_3.0/V3AnnotationPortletConfigTests/pom.xml
+++ b/portlet-tck_3.0/V3AnnotationPortletConfigTests/pom.xml
@@ -162,7 +162,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/portlet-tck_3.0/V3HeaderPortletTests/pom.xml b/portlet-tck_3.0/V3HeaderPortletTests/pom.xml
index ed9cde3..4c34939 100644
--- a/portlet-tck_3.0/V3HeaderPortletTests/pom.xml
+++ b/portlet-tck_3.0/V3HeaderPortletTests/pom.xml
@@ -161,7 +161,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/portlet-tck_3.0/V3PortletConfigTests/pom.xml b/portlet-tck_3.0/V3PortletConfigTests/pom.xml
index 9f0d260..84a1861 100644
--- a/portlet-tck_3.0/V3PortletConfigTests/pom.xml
+++ b/portlet-tck_3.0/V3PortletConfigTests/pom.xml
@@ -147,7 +147,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/portlet-tck_3.0/V3PortletContextTests/pom.xml b/portlet-tck_3.0/V3PortletContextTests/pom.xml
index 1e5bfad..d9f224e 100644
--- a/portlet-tck_3.0/V3PortletContextTests/pom.xml
+++ b/portlet-tck_3.0/V3PortletContextTests/pom.xml
@@ -147,7 +147,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/portlet-tck_3.0/V3PortletHubTests/pom.xml b/portlet-tck_3.0/V3PortletHubTests/pom.xml
index 24972d3..edbf3ce 100644
--- a/portlet-tck_3.0/V3PortletHubTests/pom.xml
+++ b/portlet-tck_3.0/V3PortletHubTests/pom.xml
@@ -147,7 +147,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/portlet-tck_3.0/V3PortletParametersTests/pom.xml b/portlet-tck_3.0/V3PortletParametersTests/pom.xml
index 63c298f..c5dee4a 100755
--- a/portlet-tck_3.0/V3PortletParametersTests/pom.xml
+++ b/portlet-tck_3.0/V3PortletParametersTests/pom.xml
@@ -147,7 +147,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/portlet-tck_3.0/V3RenderStateTests/pom.xml b/portlet-tck_3.0/V3RenderStateTests/pom.xml
index f2bf915..e4df2b6 100644
--- a/portlet-tck_3.0/V3RenderStateTests/pom.xml
+++ b/portlet-tck_3.0/V3RenderStateTests/pom.xml
@@ -147,7 +147,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/portlet-tck_3.0/V3ResourceAsyncTests/pom.xml b/portlet-tck_3.0/V3ResourceAsyncTests/pom.xml
index d0fd4a0..2208123 100644
--- a/portlet-tck_3.0/V3ResourceAsyncTests/pom.xml
+++ b/portlet-tck_3.0/V3ResourceAsyncTests/pom.xml
@@ -147,7 +147,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>
diff --git a/portlet-tck_3.0/V3URLTests/pom.xml b/portlet-tck_3.0/V3URLTests/pom.xml
index 251c87f..659d7bd 100644
--- a/portlet-tck_3.0/V3URLTests/pom.xml
+++ b/portlet-tck_3.0/V3URLTests/pom.xml
@@ -147,7 +147,7 @@
 					<version>${liferay.spring.artifact.version}</version>
 				</dependency>
 				<dependency>
-					<groupId>org.hibernate.validator</groupId>
+					<groupId>org.hibernate</groupId>
 					<artifactId>hibernate-validator</artifactId>
 				</dependency>
 				<dependency>