diff --git a/antbuild.properties b/antbuild.properties
index f34e901..78eb0b3 100644
--- a/antbuild.properties
+++ b/antbuild.properties
@@ -183,7 +183,7 @@
 jaxb-xjc.jar=jaxb-xjc_2.2.11.v201407311112.jar
 jaxb-core.jar=jaxb-core_2.2.11.v201407311112.jar
 json.jar=org.glassfish.javax.json_1.0.4.v201311181159.jar
-javax.validation.jar=javax.validation_1.1.0.v201304101302.jar
+javax.validation.jar=javax.validation.api_2.0.1.Final.jar
 mail.jar=javax.mail_1.4.0.v201005080615.jar
 commonj.sdo.jar=commonj.sdo_2.1.1.v201112051852.jar
 commonj.sdo.src.zip=commonj.sdo.source_2.1.1.v201112051852.jar
diff --git a/antbuild.xml b/antbuild.xml
index 232ac3e..2f05049 100644
--- a/antbuild.xml
+++ b/antbuild.xml
@@ -1,5 +1,5 @@
 <!--/*******************************************************************************
-* Copyright (c) 1998, 2017 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
 * which accompanies this distribution.
@@ -1064,7 +1064,7 @@
                 <include name="${eclipselink.sdo.test}/**"/>
                 <include name="${eclipselink.sdo.base}/eclipselink.sdo.test.server/**"/>
                 <include name="plugins/eclipselink-jpa-modelgen_*.jar"/>
-                <include name="plugins/javax.validation_*.jar"/>
+                <include name="plugins/javax.validation.api_*.jar"/>
                 <include name="jpa/plugins/javax.persistence_2.*.jar"/>
                 <include name="sdo/plugins/commonj.sdo_*.jar"/>
                 <exclude name="**/.settings/**"/>
diff --git a/buildsystem/compdeps/antbuild.xml b/buildsystem/compdeps/antbuild.xml
index 96a2237..9522a89 100644
--- a/buildsystem/compdeps/antbuild.xml
+++ b/buildsystem/compdeps/antbuild.xml
@@ -151,7 +151,7 @@
         <property name="resource.criteria" value="[0.0.1,5.0.0)"/>
         <property name="transaction.prefix" value="javax.transaction"/>
         <property name="transaction.criteria" value="[0.0.1,5.0.0)"/>
-        <property name="validation.prefix" value="javax.validation"/>
+        <property name="validation.prefix" value="javax.validation.api"/>
         <property name="validation.criteria" value="[0.0.1,5.0.0)"/>
         <property name="servlet.prefix" value="javax.servlet"/>
         <property name="servlet.criteria" value="[0.0.1,5.0.0)"/>
diff --git a/buildsystem/compdeps/org.eclipse.persistence.compdeps/feature.xml b/buildsystem/compdeps/org.eclipse.persistence.compdeps/feature.xml
index d3d8578..689a395 100644
--- a/buildsystem/compdeps/org.eclipse.persistence.compdeps/feature.xml
+++ b/buildsystem/compdeps/org.eclipse.persistence.compdeps/feature.xml
@@ -88,7 +88,7 @@
          unpack="false"/>
 
    <plugin
-         id="javax.validation"
+         id="javax.validation.api"
          download-size="0"
          install-size="0"
          version="@VALIDATION_VERSION@"
diff --git a/jpa/eclipselink.jpa.test.jse/.classpath b/jpa/eclipselink.jpa.test.jse/.classpath
index 89a6a21..3bf9731 100644
--- a/jpa/eclipselink.jpa.test.jse/.classpath
+++ b/jpa/eclipselink.jpa.test.jse/.classpath
@@ -7,7 +7,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.jpa"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/javax.persistence_2.2.0.v201708071007.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/javax.persistence.source_2.2.0.v201708071007.jar"/>
-	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation_1.1.0.v201304101302.jar"/>
+	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation.api_2.0.1.Final.jar"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.transaction_1.1.0.v201002051055.jar" sourcepath="/ECLIPSELINK_HOME/plugins/javax.transaction/src"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr_3.5.2.v201711011707.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr.source_3.5.2.v201711011707.jar"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.asm_6.0.0.v201710052159.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.asm.source_6.0.0.v201710052159.jar"/>
diff --git a/jpa/eclipselink.jpa.test.jse/antbuild.xml b/jpa/eclipselink.jpa.test.jse/antbuild.xml
index a7829e5..71deab1 100644
--- a/jpa/eclipselink.jpa.test.jse/antbuild.xml
+++ b/jpa/eclipselink.jpa.test.jse/antbuild.xml
@@ -24,7 +24,7 @@
     <!-- Not sure if there is a better way to refer to dependencies? -->
     <property name="jse.eclipselink.jar" value="${jse.el.root}/eclipselink.jar"/>
     <property name="javax.transaction" value="${jse.el.plugins.dir}/javax.transaction_1.1.0.v201002051055.jar"/>
-    <property name="javax.validation" value="${jse.el.plugins.dir}/javax.validation_1.1.0.v201304101302.jar"/>
+    <property name="javax.validation" value="${jse.el.plugins.dir}/javax.validation.api_2.0.1.Final.jar"/>
     <property name="javax.persistence" value="${jse.jpa.plugins.dir}/javax.persistence_2.2.0.v201708071007.jar"/>
    
     <property file="${user.home}/build.properties"/>
diff --git a/jpa/eclipselink.jpa.test/.classpath b/jpa/eclipselink.jpa.test/.classpath
index c575342..468493f 100644
--- a/jpa/eclipselink.jpa.test/.classpath
+++ b/jpa/eclipselink.jpa.test/.classpath
@@ -7,7 +7,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.jpa"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/jpa/plugins/javax.persistence_2.2.0.v201708071007.jar" sourcepath="/ECLIPSELINK_HOME/jpa/plugins/javax.persistence.source_2.2.0.v201708071007.jar"/>
-	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation_1.1.0.v201304101302.jar"/>
+	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation.api_2.0.1.Final.jar"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.ejb_3.1.0.v201205171433.jar" sourcepath="/ECLIPSELINK_HOME/plugins/javax.ejb/src"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.transaction_1.1.0.v201002051055.jar" sourcepath="/ECLIPSELINK_HOME/plugins/javax.transaction/src"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr_3.5.2.v201711011707.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.antlr.source_3.5.2.v201711011707.jar"/>
diff --git a/jpa/eclipselink.jpa.test/antbuild.properties b/jpa/eclipselink.jpa.test/antbuild.properties
index 9036545..fb97bfb 100644
--- a/jpa/eclipselink.jpa.test/antbuild.properties
+++ b/jpa/eclipselink.jpa.test/antbuild.properties
@@ -157,10 +157,9 @@
 
 # BeanValidationJUnitTest Dependency Definitions
 ----------------------------------------------
-javax.validation.jar=javax.validation_1.1.0.v201304101302.jar
-validation-impl.jar=hibernate-validator-5.1.0.Final.jar
+javax.validation.jar=javax.validation.api_2.0.1.Final.jar
+validation-impl.jar=hibernate-validator-6.0.7.Final.jar
 # Hibernate-validator dependencies.
-jboss-logging.jar=jboss-logging-3.1.4.GA.jar
-javax.el-api.jar=javax.el-api-2.2.jar
-javax.el.jar=javax.el-2.2.2.jar
-classmate.jar=classmate-1.0.0.jar
+jboss-logging.jar=jboss-logging-3.3.0.Final.jar
+javax.el.jar=javax.el-3.0.1-b08.jar
+classmate.jar=classmate-1.3.1.jar
diff --git a/jpa/eclipselink.jpa.test/antbuild.xml b/jpa/eclipselink.jpa.test/antbuild.xml
index 545ef23..11ca764 100644
--- a/jpa/eclipselink.jpa.test/antbuild.xml
+++ b/jpa/eclipselink.jpa.test/antbuild.xml
@@ -1,5 +1,5 @@
 <!--/*******************************************************************************
-* Copyright (c) 1998, 2016 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1998, 2018 Oracle and/or its affiliates. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
 * which accompanies this distribution.
@@ -256,7 +256,6 @@
         <and>
             <available file="${extensions.depend.dir}/${validation-impl.jar}" />
             <available file="${extensions.depend.dir}/${jboss-logging.jar}" />
-            <available file="${extensions.depend.dir}/${javax.el-api.jar}" />
             <available file="${extensions.depend.dir}/${javax.el.jar}" />
             <available file="${extensions.depend.dir}/${classmate.jar}" />
         </and>
@@ -1693,7 +1692,6 @@
             <path refid="run.classpath"/>
             <pathelement path="${extensions.depend.dir}/${validation-impl.jar}"/>
             <pathelement path="${extensions.depend.dir}/${jboss-logging.jar}"/>
-            <pathelement path="${extensions.depend.dir}/${javax.el-api.jar}"/>
             <pathelement path="${extensions.depend.dir}/${javax.el.jar}"/>
             <pathelement path="${extensions.depend.dir}/${classmate.jar}"/>
             <pathelement path="${extensions.depend.dir}/${javax.validation.jar}"/>
diff --git a/jpa/eclipselink.jpa.test/jpa.test.iml b/jpa/eclipselink.jpa.test/jpa.test.iml
index c19d65e..cc569d5 100644
--- a/jpa/eclipselink.jpa.test/jpa.test.iml
+++ b/jpa/eclipselink.jpa.test/jpa.test.iml
@@ -4,7 +4,7 @@
     <varelement var="jar://$MODULE_DIR$/../plugins/javax.persistence_2.2.0.v201708071007.jar!/" value="MODULE_DIR/../plugins/javax.persistence_2.2.0.v201708071007.jar" />
     <varelement var="jar://$MODULE_DIR$/../plugins/javax.persistence.source_2.2.0.v201708071007.jar!/" value="src:/MODULE_DIR/../plugins/javax.persistence.source_2.2.0.v201708071007.jar" />
     <varelement var="jar://$MODULE_DIR$/../../plugins/javax.ws.rs_2.0.1.v201504171603.jar!/" value="MODULE_DIR/../../plugins/javax.ws.rs_2.0.1.v201504171603.jar" />
-    <varelement var="jar://$MODULE_DIR$/../../plugins/javax.validation_1.1.0.v201304101302.jar!/" value="MODULE_DIR/../../plugins/javax.validation_1.1.0.v201304101302.jar" />
+    <varelement var="jar://$MODULE_DIR$/../../plugins/javax.validation.api_2.0.1.Final.jar!/" value="MODULE_DIR/../../plugins/javax.validation.api_2.0.1.Final.jar" />
     <varelement var="jar://$MODULE_DIR$/../../plugins/javax.ejb_3.1.0.v201205171433.jar!/" value="MODULE_DIR/../../plugins/javax.ejb_3.1.0.v201205171433.jar" />
     <varelement var="file://$MODULE_DIR$/../../plugins/javax.ejb/src" value="src:/MODULE_DIR/../../plugins/javax.ejb/src" />
     <varelement var="jar://$MODULE_DIR$/../../plugins/javax.transaction_1.1.0.v201002051055.jar!/" value="MODULE_DIR/../../plugins/javax.transaction_1.1.0.v201002051055.jar" />
@@ -52,7 +52,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../plugins/javax.validation_1.1.0.v201304101302.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../plugins/javax.validation.api_2.0.1.Final.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/jpa/eclipselink.jpars.test/antbuild.xml b/jpa/eclipselink.jpars.test/antbuild.xml
index 99682ac..ee85c74 100644
--- a/jpa/eclipselink.jpars.test/antbuild.xml
+++ b/jpa/eclipselink.jpars.test/antbuild.xml
@@ -171,8 +171,8 @@
                       criterion="[3.0.0,4.0.0)" property="javax.ejb.lib" includepath="true"/>
         <selectbundle basename="javax.servlet" directory="${jparstest.build.location}/${jparstest.2.common.plugins.dir}" separator="_"
                       criterion="[2.0.0,3.0.0)" property="javax.servlet.lib" includepath="true"/>
-        <selectbundle basename="javax.validation" directory="${jparstest.build.location}/${jparstest.2.common.plugins.dir}" separator="_"
-                      criterion="[1.0.0,2.0.0)" property="validation.lib" includepath="true"/>
+        <selectbundle basename="javax.validation.api" directory="${jparstest.build.location}/${jparstest.2.common.plugins.dir}" separator="_"
+                      criterion="[1.0.0,5.0.0)" property="validation.lib" includepath="true"/>
 
         <available file="${jaxb-api.lib}"           property="jaxb-api.lib.exist"/>
         <available file="${persistence20.lib}"      property="persistence20.lib.exist"/>
diff --git a/jpa/org.eclipse.persistence.jpa/.classpath b/jpa/org.eclipse.persistence.jpa/.classpath
index 2949916..31b5cb3 100644
--- a/jpa/org.eclipse.persistence.jpa/.classpath
+++ b/jpa/org.eclipse.persistence.jpa/.classpath
@@ -4,7 +4,7 @@
 	<classpathentry kind="src" path="resource"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.transaction_1.1.0.v201002051055.jar"/>
-	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation_1.1.0.v201304101302.jar"/>
+	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation.api_2.0.1.Final.jar"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.asm_6.0.0.v201710052159.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.asm.source_6.0.0.v201710052159.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/jpa/org.eclipse.persistence.jpa/antbuild.properties b/jpa/org.eclipse.persistence.jpa/antbuild.properties
index b168cfc..c98ecf7 100644
--- a/jpa/org.eclipse.persistence.jpa/antbuild.properties
+++ b/jpa/org.eclipse.persistence.jpa/antbuild.properties
@@ -19,7 +19,7 @@
 antlr=org.eclipse.persistence.antlr
 persistence20.jar=javax.persistence_2.0.6.v201308211412.jar
 
-validation.jar=javax.validation_1.1.0.v201304101302.jar
+validation.jar=javax.validation.api_2.0.1.Final.jar
 mail.jar=javax.mail_1.4.0.v201005080615.jar
 resource.jar=javax.resource_1.6.0.v201204270900.jar
 ejb.jar=javax.ejb_3.1.0.v201205171433.jar
diff --git a/jpa/org.eclipse.persistence.jpa/jpa.iml b/jpa/org.eclipse.persistence.jpa/jpa.iml
index ec176fb..548fc21 100644
--- a/jpa/org.eclipse.persistence.jpa/jpa.iml
+++ b/jpa/org.eclipse.persistence.jpa/jpa.iml
@@ -2,7 +2,7 @@
 <module type="JAVA_MODULE" version="4">
   <component name="EclipseModuleManager">
     <varelement var="jar://$MODULE_DIR$/../../plugins/javax.transaction_1.1.0.v201002051055.jar!/" value="MODULE_DIR/../../plugins/javax.transaction_1.1.0.v201002051055.jar" />
-    <varelement var="jar://$MODULE_DIR$/../../plugins/javax.validation_1.1.0.v201304101302.jar!/" value="MODULE_DIR/../../plugins/javax.validation_1.1.0.v201304101302.jar" />
+    <varelement var="jar://$MODULE_DIR$/../../plugins/javax.validation.api_2.0.1.Final.jar!/" value="MODULE_DIR/../../plugins/javax.validation.api_2.0.1.Final.jar" />
     <varelement var="jar://$MODULE_DIR$/../../plugins/org.eclipse.persistence.asm_6.0.0.v201710052159.jar!/" value="MODULE_DIR/../../plugins/org.eclipse.persistence.asm_6.0.0.v201710052159.jar" />
     <varelement var="jar://$MODULE_DIR$/../../plugins/org.eclipse.persistence.asm.source_6.0.0.v201710052159.jar!/" value="src:/MODULE_DIR/../../plugins/org.eclipse.persistence.asm.source_6.0.0.v201710052159.jar" />
     <src_description expected_position="0">
@@ -46,7 +46,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../plugins/javax.validation_1.1.0.v201304101302.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../plugins/javax.validation.api_2.0.1.Final.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/moxy/bin/jaxb-compiler.cmd b/moxy/bin/jaxb-compiler.cmd
index 9e6d58f..cc59959 100755
--- a/moxy/bin/jaxb-compiler.cmd
+++ b/moxy/bin/jaxb-compiler.cmd
@@ -16,7 +16,7 @@
 set CLASSPATH=%THIS%..\jlib\moxy\org.glassfish.javax.json_1.0.4.v201311181159.jar
 set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\moxy\jaxb-core_2.2.11.v201407311112.jar
 set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\moxy\jaxb-xjc_2.2.11.v201407311112.jar
-set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\moxy\javax.validation_1.1.0.v201304101302.jar
+set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\moxy\javax.validation.api_2.0.1.Final.jar
 set CLASSPATH=%CLASSPATH%;%THIS%..\jlib\eclipselink.jar
 set JAVA_ARGS=%*
 
diff --git a/moxy/bin/jaxb-compiler.sh b/moxy/bin/jaxb-compiler.sh
index ef45096..fafcff4 100755
--- a/moxy/bin/jaxb-compiler.sh
+++ b/moxy/bin/jaxb-compiler.sh
@@ -11,7 +11,7 @@
 CLASSPATH=`dirname $0`/../jlib/moxy/jaxb-core_2.2.11.v201407311112.jar:\
 `dirname $0`/../jlib/moxy/jaxb-xjc_2.2.11.v201407311112.jar:\
 `dirname $0`/../jlib/moxy/org.glassfish.javax.json_1.0.4.v201311181159.jar:\
-`dirname $0`/../jlib/moxy/javax.validation_1.1.0.v201304101302.jar:\
+`dirname $0`/../jlib/moxy/javax.validation.api_2.0.1.Final.jar:\
 `dirname $0`/../jlib/eclipselink.jar
 JAVA_ARGS="$@"
 
diff --git a/moxy/eclipselink.moxy.test/.classpath b/moxy/eclipselink.moxy.test/.classpath
index 80d66a4..40c0b6e 100644
--- a/moxy/eclipselink.moxy.test/.classpath
+++ b/moxy/eclipselink.moxy.test/.classpath
@@ -20,7 +20,7 @@
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.glassfish.javax.json_1.0.4.v201311181159.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.glassfish.javax.json.source_1.0.4.v201311181159.jar"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.asm_6.0.0.v201710052159.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.asm.source_6.0.0.v201710052159.jar"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jaxb-core_2.2.11.v201407311112.jar" sourcepath="/ECLIPSELINK_HOME/plugins/jaxb-core.source_2.2.11.v201407311112.jar"/>
-	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation_1.1.0.v201304101302.jar"/>
+	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation.api_2.0.1.Final.jar"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jaxb-xjc_2.2.11.v201407311112.jar" sourcepath="/ECLIPSELINK_HOME/plugins/jaxb-xjc.source_2.2.11.v201407311112.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.moxy.dynamicxjc"/>
 	<classpathentry kind="var" path="EXTENSION_LIB_EXTERNAL/hibernate-validator-5.1.0.Final.jar"/>
diff --git a/moxy/eclipselink.moxy.test/antbuild.properties b/moxy/eclipselink.moxy.test/antbuild.properties
index 25c9d1b..3c5287e 100644
--- a/moxy/eclipselink.moxy.test/antbuild.properties
+++ b/moxy/eclipselink.moxy.test/antbuild.properties
@@ -53,15 +53,14 @@
 xml.parser.jar.dir=.
 xml.parser.jar=dummy_xml_parser.jar
 
-# JSR-303/349 Dependency Definitions
+# JSR-303/349/380 Dependency Definitions
 ----------------------------------------------
-javax.validation.jar=javax.validation_1.1.0.v201304101302.jar
-validation-impl.jar=hibernate-validator-5.1.0.Final.jar
+javax.validation.jar=javax.validation.api_2.0.1.Final.jar
+validation-impl.jar=hibernate-validator-6.0.7.Final.jar
 # Hibernate-validator dependencies.
-jboss-logging.jar=jboss-logging-3.1.4.GA.jar
-javax.el-api.jar=javax.el-api-2.2.jar
-javax.el.jar=javax.el-2.2.2.jar
-classmate.jar=classmate-1.0.0.jar
+jboss-logging.jar=jboss-logging-3.3.0.Final.jar
+javax.el.jar=javax.el-3.0.1-b08.jar
+classmate.jar=classmate-1.3.1.jar
 
 #JMockit
 jmockit.jar=jmockit-1.35.jar
diff --git a/moxy/eclipselink.moxy.test/antbuild.xml b/moxy/eclipselink.moxy.test/antbuild.xml
index 12c0c76..46b9130 100644
--- a/moxy/eclipselink.moxy.test/antbuild.xml
+++ b/moxy/eclipselink.moxy.test/antbuild.xml
@@ -90,7 +90,6 @@
     <property name="javax.validation.lib" value="${moxytest.2.common.plugins.dir}/${javax.validation.jar}"/>
     <property name="validation-impl.lib" value="${extensions.depend.dir}/${validation-impl.jar}"/>
     <property name="jboss-logging.lib" value="${extensions.depend.dir}/${jboss-logging.jar}"/>
-    <property name="javax.el-api.lib" value="${extensions.depend.dir}/${javax.el-api.jar}"/>
     <property name="javax.el.lib" value="${extensions.depend.dir}/${javax.el.jar}"/>
     <property name="classmate.lib" value="${extensions.depend.dir}/${classmate.jar}"/>
     <property name="jmockit.lib" value="${extensions.depend.dir}/${jmockit.jar}"/>
@@ -100,7 +99,6 @@
         <and>
             <available file="${extensions.depend.dir}/${validation-impl.jar}"/>
             <available file="${extensions.depend.dir}/${jboss-logging.jar}"/>
-            <available file="${extensions.depend.dir}/${javax.el-api.jar}"/>
             <available file="${extensions.depend.dir}/${javax.el.jar}"/>
             <available file="${extensions.depend.dir}/${classmate.jar}"/>
         </and>
@@ -158,7 +156,6 @@
         <pathelement path="${junit.lib}"/>
         <pathelement path="${validation-impl.lib}"/>
         <pathelement path="${jboss-logging.lib}"/>
-        <pathelement path="${javax.el-api.lib}"/>
         <pathelement path="${javax.el.lib}"/>
         <pathelement path="${classmate.lib}"/>
         <pathelement path="${javax.validation.lib}"/>
@@ -230,7 +227,6 @@
         <pathelement path="${javax.validation.lib}"/>
         <pathelement path="${validation-impl.lib}"/>
         <pathelement path="${jboss-logging.lib}"/>
-        <pathelement path="${javax.el-api.lib}"/>
         <pathelement path="${javax.el.lib}"/>
         <pathelement path="${classmate.lib}"/>
     </path>
diff --git a/moxy/eclipselink.moxy.test/moxy.test.iml b/moxy/eclipselink.moxy.test/moxy.test.iml
index 3747786..acee96b 100644
--- a/moxy/eclipselink.moxy.test/moxy.test.iml
+++ b/moxy/eclipselink.moxy.test/moxy.test.iml
@@ -11,7 +11,7 @@
     <varelement var="jar://$MODULE_DIR$/../../plugins/org.eclipse.persistence.asm.source_6.0.0.v201710052159.jar!/" value="src:/MODULE_DIR/../../plugins/org.eclipse.persistence.asm.source_6.0.0.v201710052159.jar" />
     <varelement var="jar://$MODULE_DIR$/../../plugins/jaxb-core_2.2.11.v201407311112.jar!/" value="MODULE_DIR/../../plugins/jaxb-core_2.2.11.v201407311112.jar" />
     <varelement var="jar://$MODULE_DIR$/../../plugins/jaxb-core.source_2.2.11.v201407311112.jar!/" value="src:/MODULE_DIR/../../plugins/jaxb-core.source_2.2.11.v201407311112.jar" />
-    <varelement var="jar://$MODULE_DIR$/../../plugins/javax.validation_1.1.0.v201304101302.jar!/" value="MODULE_DIR/../../plugins/javax.validation_1.1.0.v201304101302.jar" />
+    <varelement var="jar://$MODULE_DIR$/../../plugins/javax.validation.api_2.0.1.Final.jar!/" value="MODULE_DIR/../../plugins/javax.validation.api_2.0.1.Final.jar" />
     <varelement var="jar://$MODULE_DIR$/../../plugins/jaxb-xjc_2.2.11.v201407311112.jar!/" value="MODULE_DIR/../../plugins/jaxb-xjc_2.2.11.v201407311112.jar" />
     <varelement var="jar://$MODULE_DIR$/../../plugins/jaxb-xjc.source_2.2.11.v201407311112.jar!/" value="src:/MODULE_DIR/../../plugins/jaxb-xjc.source_2.2.11.v201407311112.jar" />
     <src_description expected_position="0">
@@ -115,7 +115,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../plugins/javax.validation_1.1.0.v201304101302.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../plugins/javax.validation.api_2.0.1.Final.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/moxy/eclipselink.moxy.test/pom.xml b/moxy/eclipselink.moxy.test/pom.xml
index e0a52c6..edcf7fe 100644
--- a/moxy/eclipselink.moxy.test/pom.xml
+++ b/moxy/eclipselink.moxy.test/pom.xml
@@ -30,21 +30,16 @@
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation</artifactId>
-            <version>1.1</version>
+            <version>2.0.1</version>
             <scope>system</scope>
             <systemPath>${javax.validation.lib}</systemPath>
         </dependency>
 
         <!-- Hibernate validator and it's dependencies -->
         <dependency>
-            <groupId>org.hibernate</groupId>
+            <groupId>org.hibernate.validator</groupId>
             <artifactId>hibernate-validator</artifactId>
-            <version>5.2.0.CR1</version>
-        </dependency>
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>javax.el-api</artifactId>
-            <version>3.0.0</version>
+            <version>6.0.7.Final</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
diff --git a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/beanvalidation/BeanValidationSpecialtiesTestCase.java b/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/beanvalidation/BeanValidationSpecialtiesTestCase.java
index 25ba97f..06c0411 100644
--- a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/beanvalidation/BeanValidationSpecialtiesTestCase.java
+++ b/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/jaxb/beanvalidation/BeanValidationSpecialtiesTestCase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2015, 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2015, 2018 Oracle and/or its affiliates. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
  * which accompanies this distribution.
@@ -26,6 +26,7 @@
 import org.eclipse.persistence.testing.jaxb.beanvalidation.special.MethodAnnotatedEmployee;
 import org.eclipse.persistence.testing.jaxb.beanvalidation.special.NonConstrainedClass;
 
+import javax.validation.ClockProvider;
 import javax.validation.ConstraintValidatorFactory;
 import javax.validation.ConstraintViolation;
 import javax.validation.MessageInterpolator;
@@ -44,6 +45,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
+import java.time.Clock;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -373,5 +375,13 @@ public <T> T unwrap(Class<T> tClass) {
         public void close() {
 
         }
+
+        public ClockProvider getClockProvider() {
+            return new ClockProvider() {
+                public Clock getClock() {
+                    return Clock.systemUTC();
+                }
+            };
+        }
     }
 }
diff --git a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/osgi/OSGITestHelper.java b/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/osgi/OSGITestHelper.java
index be69a52..326f4d4 100644
--- a/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/osgi/OSGITestHelper.java
+++ b/moxy/eclipselink.moxy.test/src/org/eclipse/persistence/testing/osgi/OSGITestHelper.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2018 Oracle and/or its affiliates. All rights reserved.
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
  * which accompanies this distribution.
@@ -34,7 +34,7 @@ public class OSGITestHelper {
     private static final String JAXB_API_JAR = System.getProperty("jaxb-api.jar", "javax.xml.bind_2.2.12.v201410011542.jar");
     private static final String JAXRS_JAR = System.getProperty("jaxrs.jar", "javax.ws.rs_1.1.1.v20101004-1200.jar");
     private static final String ASM_JAR = System.getProperty("asm.jar", "org.eclipse.persistence.asm_6.0.0.v201710052159.jar");
-    private static final String BEAN_VALIDATION_LIB = System.getProperty("javax.validation.lib", "javax.validation_1.1.0.v201304101302.jar");
+    private static final String BEAN_VALIDATION_LIB = System.getProperty("javax.validation.lib", "javax.validation.api_2.0.1.Final.jar");
 
     public static Option[] getDefaultOptions() {
         return options(
@@ -55,10 +55,10 @@ public class OSGITestHelper {
 
     public static Option[] getOptionsWithBeanValidation() {
         return options(
-                mavenBundle().groupId("org.hibernate").artifactId("hibernate-validator").version("5.2.0.CR1"),
-                mavenBundle().groupId("com.fasterxml").artifactId("classmate").version("1.1.0"),
-                mavenBundle().groupId("javax.el").artifactId("javax.el-api").version("3.0.0"),
-                mavenBundle().groupId("org.jboss.logging").artifactId("jboss-logging").version("3.2.1.Final"),
+                mavenBundle().groupId("org.hibernate.validator").artifactId("hibernate-validator").version("6.0.7.Final"),
+                mavenBundle().groupId("com.fasterxml").artifactId("classmate").version("1.3.1"),
+                mavenBundle().groupId("org.glassfish").artifactId("javax.el").version("3.0.1-b08"),
+                mavenBundle().groupId("org.jboss.logging").artifactId("jboss-logging").version("3.3.0.Final"),
                 mavenBundle().groupId("org.apache.logging.log4j").artifactId("log4j-api").version("2.3"),
                 mavenBundle().groupId("org.apache.logging.log4j").artifactId("log4j-core").version("2.3"),
 
diff --git a/moxy/org.eclipse.persistence.moxy/.classpath b/moxy/org.eclipse.persistence.moxy/.classpath
index 04d7b4d..e49f7e8 100644
--- a/moxy/org.eclipse.persistence.moxy/.classpath
+++ b/moxy/org.eclipse.persistence.moxy/.classpath
@@ -6,7 +6,7 @@
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.ws.rs_2.0.1.v201504171603.jar"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.eclipse.persistence.asm_6.0.0.v201710052159.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.eclipse.persistence.asm.source_6.0.0.v201710052159.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation_1.1.0.v201304101302.jar"/>
+	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation.api_2.0.1.Final.jar"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jaxb-core_2.2.11.v201407311112.jar" sourcepath="/ECLIPSELINK_HOME/plugins/jaxb-core.source_2.2.11.v201407311112.jar"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/jaxb-xjc_2.2.11.v201407311112.jar" sourcepath="/ECLIPSELINK_HOME/plugins/jaxb-xjc.source_2.2.11.v201407311112.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
diff --git a/moxy/org.eclipse.persistence.moxy/META-INF/MANIFEST.MF b/moxy/org.eclipse.persistence.moxy/META-INF/MANIFEST.MF
index 92ce9be..57f33d7 100644
--- a/moxy/org.eclipse.persistence.moxy/META-INF/MANIFEST.MF
+++ b/moxy/org.eclipse.persistence.moxy/META-INF/MANIFEST.MF
@@ -35,10 +35,10 @@
  javax.json;resolution:=optional,
  javax.json.stream;resolution:=optional,
  javax.naming;resolution:=optional,
- javax.validation;resolution:=optional;version="1.1.0",
- javax.validation.constraints;resolution:=optional;version="1.1.0",
- javax.validation.groups;resolution:=optional;version="1.1.0",
- javax.validation.metadata;resolution:=optional;version="1.1.0",
+ javax.validation;resolution:=optional;version="[1.1.0,3)",
+ javax.validation.constraints;resolution:=optional;version="[1.1.0,3)",
+ javax.validation.groups;resolution:=optional;version="[1.1.0,3)",
+ javax.validation.metadata;resolution:=optional;version="[1.1.0,3)",
  javax.ws.rs;resolution:=optional;version="2.0.1",
  javax.ws.rs.core;resolution:=optional;version="2.0.1",
  javax.ws.rs.ext;resolution:=optional;version="2.0.1",
diff --git a/moxy/org.eclipse.persistence.moxy/antbuild.properties b/moxy/org.eclipse.persistence.moxy/antbuild.properties
index d3d1e95..65a2b63 100644
--- a/moxy/org.eclipse.persistence.moxy/antbuild.properties
+++ b/moxy/org.eclipse.persistence.moxy/antbuild.properties
@@ -29,8 +29,7 @@
 jaxb-xjc.jar=jaxb-xjc_2.2.11.v201407311112.jar
 jaxb-core.jar=jaxb-core_2.2.11.v201407311112.jar
 mail.jar=javax.mail_1.4.0.v201005080615.jar
-javax.validation.jar=javax.validation_1.1.0.v201304101302.jar
-javax.validation.src.jar=javax.validation_1.1.0.Final-sources.jar
+javax.validation.jar=javax.validation.api_2.0.1.Final.jar
 commonj.sdo.jar=commonj.sdo_2.1.1.v201112051852.jar
 commonj.sdo.src.zip=commonj.sdo.source_2.1.1.v201112051852.jar
 wsdl.jar=javax.wsdl_1.6.2.v201012040545.jar
diff --git a/moxy/org.eclipse.persistence.moxy/moxy.iml b/moxy/org.eclipse.persistence.moxy/moxy.iml
index c85ec15..96b53ae 100644
--- a/moxy/org.eclipse.persistence.moxy/moxy.iml
+++ b/moxy/org.eclipse.persistence.moxy/moxy.iml
@@ -52,7 +52,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../plugins/javax.validation_1.1.0.v201304101302.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../plugins/javax.validation.api_2.0.1.Final.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/performance/eclipselink.perf.test/.classpath b/performance/eclipselink.perf.test/.classpath
index d038356..18eff39 100644
--- a/performance/eclipselink.perf.test/.classpath
+++ b/performance/eclipselink.perf.test/.classpath
@@ -13,6 +13,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.core"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.persistence.moxy"/>
 	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/org.glassfish.javax.json_1.0.4.v201311181159.jar" sourcepath="/ECLIPSELINK_HOME/plugins/org.glassfish.javax.json.source_1.0.4.v201311181159.jar"/>
-	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation_1.1.0.v201304101302.jar"/>
+	<classpathentry kind="var" path="ECLIPSELINK_HOME/plugins/javax.validation.api_2.0.1.Final.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>
diff --git a/performance/eclipselink.perf.test/antbuild.properties b/performance/eclipselink.perf.test/antbuild.properties
index bd0b0cc..c1fcc98 100644
--- a/performance/eclipselink.perf.test/antbuild.properties
+++ b/performance/eclipselink.perf.test/antbuild.properties
@@ -21,14 +21,14 @@
 jmh-generator-annprocess.jar=jmh-generator-annprocess-0.9.3.jar
 commons-math.jar=commons-math3-3.3.jar
 
-# JSR-303/349 Dependency Definitions
+# JSR-303/349/380 Dependency Definitions
 ----------------------------------------------
-javax.validation.jar=javax.validation_1.1.0.v201304101302.jar
-validation-impl.jar=hibernate-validator-5.1.0.Final.jar
-jboss-logging.jar=jboss-logging-3.1.4.GA.jar
-javax.el-api.jar=javax.el-api-2.2.jar
-javax.el.jar=javax.el-2.2.2.jar
-classmate.jar=classmate-1.0.0.jar
+javax.validation.jar=javax.validation.api_2.0.1.Final.jar
+validation-impl.jar=hibernate-validator-6.0.7.Final.jar
+# Hibernate-validator dependencies.
+jboss-logging.jar=jboss-logging-3.3.0.Final.jar
+javax.el.jar=javax.el-3.0.1-b08.jar
+classmate.jar=classmate-1.3.1.jar
 
 warmup.iterations=20
 run.iterations=20
diff --git a/performance/eclipselink.perf.test/antbuild.xml b/performance/eclipselink.perf.test/antbuild.xml
index b158838..01e2e33 100644
--- a/performance/eclipselink.perf.test/antbuild.xml
+++ b/performance/eclipselink.perf.test/antbuild.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--/*******************************************************************************
-* Copyright (c) 2014, 2015 Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2014, 2018 Oracle and/or its affiliates. All rights reserved.
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
 * which accompanies this distribution.
@@ -99,7 +99,6 @@
     <property name="validation-impl.lib"   value="${extensions.depend.dir}/${validation-impl.jar}"/>
     <property name="jboss-logging.lib"   value="${extensions.depend.dir}/${jboss-logging.jar}"/>
     <property name="javax.el-api.lib"   value="${extensions.depend.dir}/${javax.el-api.jar}"/>
-    <property name="javax.el.lib"   value="${extensions.depend.dir}/${javax.el.jar}"/>
     <property name="classmate.lib"   value="${extensions.depend.dir}/${classmate.jar}"/>
 
     <property name="jmh-core.lib" value="${extensions.depend.dir}/${jmh-core.jar}"/>
@@ -132,7 +131,6 @@
         <pathelement path="${validation-impl.lib}"/>
         <pathelement path="${jboss-logging.lib}"/>
         <pathelement path="${javax.el-api.lib}"/>
-        <pathelement path="${javax.el.lib}"/>
         <pathelement path="${classmate.lib}"/>
         <pathelement path="${asm.lib}"/>
         <pathelement path="${json.lib}"/>
@@ -161,7 +159,6 @@
         <pathelement path="${validation-impl.lib}"/>
         <pathelement path="${jboss-logging.lib}"/>
         <pathelement path="${javax.el-api.lib}"/>
-        <pathelement path="${javax.el.lib}"/>
         <pathelement path="${classmate.lib}"/>
         <pathelement path="${asm.lib}"/>
         <pathelement path="${eclipselink.lib}"/>
diff --git a/performance/eclipselink.perf.test/perf.test.iml b/performance/eclipselink.perf.test/perf.test.iml
index 8068258..e95dd86 100644
--- a/performance/eclipselink.perf.test/perf.test.iml
+++ b/performance/eclipselink.perf.test/perf.test.iml
@@ -14,7 +14,7 @@
     <orderEntry type="module-library">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../plugins/javax.validation_1.1.0.v201304101302.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../plugins/javax.validation.api_2.0.1.Final.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/utils/eclipselink.dbws.builder.test.oracle/antbuild.properties b/utils/eclipselink.dbws.builder.test.oracle/antbuild.properties
index c300599..2f1d61b 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/antbuild.properties
+++ b/utils/eclipselink.dbws.builder.test.oracle/antbuild.properties
@@ -42,7 +42,7 @@
 ddlparser.prefix=org.eclipse.persistence.oracleddlparser
 wsdl.prefix=javax.wsdl
 # Runtime
-validation.prefix=javax.validation
+validation.prefix=javax.validation.api
 mail.prefix=javax.mail
 soap.prefix=javax.xml.soap
 xdb.jar=xdb.jar
diff --git a/utils/eclipselink.dbws.builder.test.oracle/dbws.builder.test.oracle.iml b/utils/eclipselink.dbws.builder.test.oracle/dbws.builder.test.oracle.iml
index 644d385..11e6f84 100644
--- a/utils/eclipselink.dbws.builder.test.oracle/dbws.builder.test.oracle.iml
+++ b/utils/eclipselink.dbws.builder.test.oracle/dbws.builder.test.oracle.iml
@@ -59,7 +59,7 @@
     <orderEntry type="module-library" scope="RUNTIME">
       <library>
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../../plugins/javax.validation_1.1.0.v201304101302.jar!/" />
+          <root url="jar://$MODULE_DIR$/../../plugins/javax.validation.api_2.0.1.Final.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/utils/eclipselink.dbws.builder.test/antbuild.properties b/utils/eclipselink.dbws.builder.test/antbuild.properties
index d6ab62e..b4852f2 100644
--- a/utils/eclipselink.dbws.builder.test/antbuild.properties
+++ b/utils/eclipselink.dbws.builder.test/antbuild.properties
@@ -46,7 +46,7 @@
 # Runtime
 mail.prefix=javax.mail
 soap.prefix=javax.xml.soap
-javax.validation.jar=javax.validation_1.1.0.v201304101302.jar
+javax.validation.jar=javax.validation.api_2.0.1.Final.jar
 
 # Upper limit 5.0.0 simply to allow room, could be 10.0
 # Will find latest checked in version (as long as lower than upper limit).