Index: appserver/packager/glassfish-jcdi/pom.xml
===================================================================
--- appserver/packager/glassfish-jcdi/pom.xml	(revision 64384)
+++ appserver/packager/glassfish-jcdi/pom.xml	(working copy)
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -141,10 +141,15 @@
             <version>${project.version}</version>
         </dependency>
         <dependency>
+   	    <groupId>org.glassfish.hk2.external</groupId>
+    	    <artifactId>bean-validator-cdi</artifactId>
+	    <version>${bean.validator.cdi.version}</version>
+    	</dependency>
+        <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator-cdi</artifactId>
         </dependency>
-        <dependency>
+	<dependency>
             <groupId>javax.enterprise</groupId>
             <artifactId>cdi-api</artifactId>
         </dependency>
Index: appserver/pom.xml
===================================================================
--- appserver/pom.xml	(revision 64384)
+++ appserver/pom.xml	(working copy)
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -132,6 +132,7 @@
         <javax.xml.soap-api.version>1.3.7</javax.xml.soap-api.version>
         <javax.management.j2ee-api.version>1.1.1</javax.management.j2ee-api.version>
         <guava.version>13.0.1</guava.version>
+	<bean.validator.cdi.version>2.5.0-b06</bean.validator.cdi.version>
     </properties>
 
     <modules>                   
Index: nucleus/packager/nucleus-hk2/pom.xml
===================================================================
--- nucleus/packager/nucleus-hk2/pom.xml	(revision 64384)
+++ nucleus/packager/nucleus-hk2/pom.xml	(working copy)
@@ -3,7 +3,7 @@
 
     DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-    Copyright (c) 1997-2016 Oracle and/or its affiliates. All rights reserved.
+    Copyright (c) 1997-2017 Oracle and/or its affiliates. All rights reserved.
 
     The contents of this file are subject to the terms of either the GNU
     General Public License Version 2 only ("GPL") or the Common Development
@@ -99,6 +99,11 @@
             <artifactId>validation-api</artifactId>
         </dependency>
         <dependency>
+   	    <groupId>org.glassfish.hk2.external</groupId>
+            <artifactId>bean-validator</artifactId>
+	    <version>${bean.validator.version}</version>
+        </dependency>
+        <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-validator</artifactId>
         </dependency>
Index: nucleus/pom.xml
===================================================================
--- nucleus/pom.xml	(revision 64391)
+++ nucleus/pom.xml	(working copy)
@@ -189,6 +189,7 @@
         <nucleus.install.dir.name>nucleus</nucleus.install.dir.name>
         <javadoc.skip>false</javadoc.skip>
         <deploy.skip>false</deploy.skip>
+	<bean.validator.version>2.5.0-b06</bean.validator.version>
     </properties>
 
     <modules>