diff --git a/web/bundles/org.eclipse.jst.jsp.core/.classpath b/web/bundles/org.eclipse.jst.jsp.core/.classpath
index c4b8557..4f40494 100644
--- a/web/bundles/org.eclipse.jst.jsp.core/.classpath
+++ b/web/bundles/org.eclipse.jst.jsp.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/eclipse/wst/sse/**"/>
 		</accessrules>
diff --git a/web/bundles/org.eclipse.jst.jsp.core/.settings/org.eclipse.jdt.core.prefs b/web/bundles/org.eclipse.jst.jsp.core/.settings/org.eclipse.jdt.core.prefs
index bd406d9..6dc7897 100644
--- a/web/bundles/org.eclipse.jst.jsp.core/.settings/org.eclipse.jdt.core.prefs
+++ b/web/bundles/org.eclipse.jst.jsp.core/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
@@ -52,6 +53,7 @@
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -73,6 +75,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/web/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF
index c41c331..21d3961 100644
--- a/web/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.jst.jsp.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.jsp.core;singleton:=true
-Bundle-Version: 1.3.100.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsp.core.internal.JSPCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -44,7 +44,9 @@
  org.eclipse.jst.jsp.css.core.internal.parserz;x-internal:=true
 Import-Package: com.ibm.icu.text;version="3.8",
  com.ibm.icu.util;version="3.8",
- javax.servlet.jsp.tagext;version="[2.0.0,3.0.0)"
+ javax.servlet.jsp.tagext;version="[2.0.0,3.0.0)",
+ org.w3c.dom.css,
+ org.w3c.dom.stylesheets
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.jobs;bundle-version="[3.10.0,4.0.0)",
@@ -53,12 +55,13 @@
  org.eclipse.wst.common.uriresolver;bundle-version="[1.2.300,2.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.css.core;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.html.core;bundle-version="[1.3.0,1.4.0)",
+ org.eclipse.wst.css.core;bundle-version="[1.3.0,1.4.0)",
+ org.eclipse.wst.html.core;bundle-version="[1.4.0,1.5.0)",
  org.eclipse.wst.validation;bundle-version="[1.2.700,1.3.0)",
  org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.osgi.services;bundle-version="[3.7.0,4.0.0]",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.300,2.0.0)";resolution:=optional,
  org.eclipse.wst.common.modulecore;bundle-version="[1.3.0,2.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy; exclude:="org.eclipse.jst.jsp.core.internal.contenttype,org.eclipse.jst.jsp.css.core.internal.contenttype,org.eclipse.jst.jsp.core.internal.provisional.contenttype"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.jst.jsp.core
diff --git a/web/bundles/org.eclipse.jst.jsp.core/pom.xml b/web/bundles/org.eclipse.jst.jsp.core/pom.xml
index 7c11f9b..2046350 100644
--- a/web/bundles/org.eclipse.jst.jsp.core/pom.xml
+++ b/web/bundles/org.eclipse.jst.jsp.core/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.jst.jsp.core</artifactId>
-  <version>1.3.100-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
index 1b7005d..da94649 100755
--- a/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.jst.jsp.ui/META-INF/MANIFEST.MF
@@ -44,11 +44,11 @@
  org.eclipse.ui.forms;bundle-version="[3.7.0,4.0.0]",
  org.eclipse.wst.sse.ui;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.wst.html.ui;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.css.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.css.ui;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.xml.ui;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.jst.jsp.core;bundle-version="[1.3.100,1.4.0)",
- org.eclipse.wst.html.core;bundle-version="[1.3.0,1.4.0)",
- org.eclipse.wst.css.core;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.jst.jsp.core;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.html.core;bundle-version="[1.4.0,1.5.0)",
+ org.eclipse.wst.css.core;bundle-version="[1.3.0,1.4.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.jdt.ui;bundle-version="[3.14.0,4.0.0)",
@@ -66,3 +66,4 @@
  org.eclipse.core.filesystem;bundle-version="[1.7.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.jst.jsp.ui
diff --git a/web/bundles/org.eclipse.wst.css.core/.classpath b/web/bundles/org.eclipse.wst.css.core/.classpath
index 624b9a3..861e7df 100644
--- a/web/bundles/org.eclipse.wst.css.core/.classpath
+++ b/web/bundles/org.eclipse.wst.css.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/w3c/dom/css/**/*"/>
diff --git a/web/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.jdt.core.prefs b/web/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.jdt.core.prefs
index 433f4b6..d9db7ec 100644
--- a/web/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.jdt.core.prefs
+++ b/web/bundles/org.eclipse.wst.css.core/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
@@ -54,6 +55,7 @@
 org.eclipse.jdt.core.compiler.problem.nullReference=ignore
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -75,6 +77,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/web/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF
index fbf8e5c..ee2201a 100644
--- a/web/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.css.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.css.core; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.wst.css.core.internal.CSSCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -35,11 +35,14 @@
  org.eclipse.wst.css.core.internal.util;x-friends:="org.eclipse.wst.css.ui",
  org.eclipse.wst.css.core.internal.util.declaration;x-internal:=true,
  org.eclipse.wst.css.core.text
-Import-Package: com.ibm.icu.util; version="3.8"
+Import-Package: com.ibm.icu.util; version="3.8",
+ org.w3c.dom.css,
+ org.w3c.dom.stylesheets
 Require-Bundle: org.apache.xerces;bundle-version="[2.9.0,3.0.0)";visibility:=reexport,
  org.eclipse.wst.xml.core;bundle-version="[1.2,1.3.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2,1.3.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)"
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.wst.css.core.internal.contenttype"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.wst.css.core
diff --git a/web/bundles/org.eclipse.wst.css.core/pom.xml b/web/bundles/org.eclipse.wst.css.core/pom.xml
index f1b6ee7..fc84dab 100644
--- a/web/bundles/org.eclipse.wst.css.core/pom.xml
+++ b/web/bundles/org.eclipse.wst.css.core/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.css.core</artifactId>
-  <version>1.2.0-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build> 
diff --git a/web/bundles/org.eclipse.wst.css.ui/.classpath b/web/bundles/org.eclipse.wst.css.ui/.classpath
index ebaf192..f12f32b 100644
--- a/web/bundles/org.eclipse.wst.css.ui/.classpath
+++ b/web/bundles/org.eclipse.wst.css.ui/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/w3c/dom/css/**/*"/>
diff --git a/web/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.jdt.core.prefs b/web/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.jdt.core.prefs
index de5735c..385e5d5 100644
--- a/web/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/web/bundles/org.eclipse.wst.css.ui/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
@@ -52,6 +53,7 @@
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -73,6 +75,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/web/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
index ad0a8c7..0bf261b 100755
--- a/web/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.css.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.css.ui; singleton:=true
-Bundle-Version: 1.1.500.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Activator: org.eclipse.wst.css.ui.internal.CSSUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -31,7 +31,9 @@
  org.eclipse.wst.css.ui.views.contentoutline,
  org.eclipse.wst.css.ui.views.properties
 Import-Package: com.ibm.icu.util; version="3.8",
- com.ibm.icu.text; version="3.8"
+ com.ibm.icu.text; version="3.8",
+ org.w3c.dom.css,
+ org.w3c.dom.stylesheets
 Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.ui.views;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.jface.text;bundle-version="[3.13.0,4.0.0)",
@@ -39,9 +41,9 @@
  org.eclipse.ui;bundle-version="[3.109.0,4.0.0)",
  org.eclipse.wst.xml.ui;bundle-version="[1.2.300,2.0.0)",
  org.eclipse.wst.sse.ui;bundle-version="[1.7.0,2.0.0)",
- org.eclipse.wst.css.core;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.wst.css.core;bundle-version="[1.3.0,1.4.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.html.core;bundle-version="[1.3.0,1.4.0)",
+ org.eclipse.wst.html.core;bundle-version="[1.4.0,1.5.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
@@ -50,5 +52,5 @@
  org.eclipse.wst.common.modulecore;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
  org.eclipse.wst.common.uriresolver;bundle-version="[1.2.0,2.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.wst.css.ui
diff --git a/web/bundles/org.eclipse.wst.css.ui/pom.xml b/web/bundles/org.eclipse.wst.css.ui/pom.xml
index 8b16146..b45153e 100644
--- a/web/bundles/org.eclipse.wst.css.ui/pom.xml
+++ b/web/bundles/org.eclipse.wst.css.ui/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.css.ui</artifactId>
-  <version>1.1.500-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/web/bundles/org.eclipse.wst.html.core/.classpath b/web/bundles/org.eclipse.wst.html.core/.classpath
index 76f08be..2c3dfc4 100644
--- a/web/bundles/org.eclipse.wst.html.core/.classpath
+++ b/web/bundles/org.eclipse.wst.html.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/w3c/dom/css/**/*"/>
diff --git a/web/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.jdt.core.prefs b/web/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.jdt.core.prefs
index de5735c..385e5d5 100644
--- a/web/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.jdt.core.prefs
+++ b/web/bundles/org.eclipse.wst.html.core/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
@@ -52,6 +53,7 @@
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -73,6 +75,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/web/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
index 37c0123..bd2292e 100644
--- a/web/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.html.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.html.core; singleton:=true
-Bundle-Version: 1.3.200.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: org.eclipse.wst.html.core.internal.HTMLCorePlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -29,15 +29,18 @@
  org.eclipse.wst.html.core.internal.validation;x-internal:=true,
  org.eclipse.wst.html.core.text,
  org.eclipse.wst.html.core.validate.extension
-Import-Package: com.ibm.icu.util; version="3.8"
+Import-Package: com.ibm.icu.util; version="3.8",
+ org.w3c.dom.css,
+ org.w3c.dom.stylesheets
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.wst.common.uriresolver;bundle-version="[1.2.300,2.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.css.core;bundle-version="[1.2.0,1.3.0)",
+ org.eclipse.wst.css.core;bundle-version="[1.3.0,1.4.0)",
  org.eclipse.core.filebuffers;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.wst.common.modulecore;bundle-version="[1.3.0,2.0.0)";resolution:=optional,
  org.eclipse.wst.validation;bundle-version="[1.2.700,1.3.0)"
 Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.wst.html.core.internal.contenttype,org.eclipse.wst.html.core.internal.provisional.contenttype"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.wst.html.core
diff --git a/web/bundles/org.eclipse.wst.html.core/pom.xml b/web/bundles/org.eclipse.wst.html.core/pom.xml
index 79472e9..bd4e07f 100644
--- a/web/bundles/org.eclipse.wst.html.core/pom.xml
+++ b/web/bundles/org.eclipse.wst.html.core/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.html.core</artifactId>
-  <version>1.3.200-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
index 160ef03..c1ddb78 100755
--- a/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.html.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.html.ui; singleton:=true
-Bundle-Version: 1.1.500.qualifier
+Bundle-Version: 1.1.501.qualifier
 Bundle-Activator: org.eclipse.wst.html.ui.internal.HTMLUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -39,10 +39,10 @@
  org.eclipse.ui;bundle-version="[3.107.0,4.0.0)",
  org.eclipse.wst.sse.ui;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.wst.xml.ui;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.css.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.css.ui;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.css.core;bundle-version="[1.2.0,1.3.0)",
- org.eclipse.wst.html.core;bundle-version="[1.3.0,1.4.0)",
+ org.eclipse.wst.css.core;bundle-version="[1.3.0,1.4.0)",
+ org.eclipse.wst.html.core;bundle-version="[1.4.0,1.5.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.core.resources;bundle-version="[3.13.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
@@ -51,3 +51,4 @@
  org.eclipse.wst.common.modulecore;bundle-version="[1.3.0,2.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.wst.html.ui
diff --git a/web/bundles/org.eclipse.wst.html.ui/pom.xml b/web/bundles/org.eclipse.wst.html.ui/pom.xml
index 98030b1..0f92a89 100644
--- a/web/bundles/org.eclipse.wst.html.ui/pom.xml
+++ b/web/bundles/org.eclipse.wst.html.ui/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.html.ui</artifactId>
-  <version>1.1.500-SNAPSHOT</version>
+  <version>1.1.501-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/web/bundles/org.eclipse.wst.jsdt.web.support.jsp/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.jsdt.web.support.jsp/META-INF/MANIFEST.MF
index 1847d61..c65819b 100644
--- a/web/bundles/org.eclipse.wst.jsdt.web.support.jsp/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.jsdt.web.support.jsp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.jsdt.web.support.jsp;singleton:=true
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.1.101.qualifier
 Bundle-Activator: org.eclipse.wst.jsdt.web.support.jsp.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.14.0,4.0.0)",
  org.eclipse.wst.jsdt.web.ui;bundle-version="[1.2.0,2.0.0)",
@@ -13,7 +13,7 @@
  org.eclipse.wst.html.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.wst.html.core;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.jst.jsp.core;bundle-version="[1.3.0,2.0.0)",
- org.eclipse.wst.css.core;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.wst.css.core;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.wst.jsdt.web.core;bundle-version="[1.1.0,2.0.0)"
diff --git a/web/bundles/org.eclipse.wst.jsdt.web.support.jsp/pom.xml b/web/bundles/org.eclipse.wst.jsdt.web.support.jsp/pom.xml
index c629d7e..c58ac35 100644
--- a/web/bundles/org.eclipse.wst.jsdt.web.support.jsp/pom.xml
+++ b/web/bundles/org.eclipse.wst.jsdt.web.support.jsp/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.jsdt.web.support.jsp</artifactId>
-  <version>1.1.100-SNAPSHOT</version>
+  <version>1.1.101-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/web/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF
index 6788dab..36a5816 100644
--- a/web/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.jsdt.web.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.jsdt.web.ui; singleton:=true
-Bundle-Version: 1.2.200.qualifier
+Bundle-Version: 1.2.201.qualifier
 Bundle-Activator: org.eclipse.wst.jsdt.web.ui.internal.JsUIPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
@@ -38,7 +38,7 @@
  org.eclipse.wst.sse.ui;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.wst.xml.ui;bundle-version="[1.2.300,2.0.0)",
  org.eclipse.wst.jsdt.web.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.css.core;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.wst.css.core;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.2.500,2.0.0)",
  org.eclipse.debug.core;bundle-version="[3.11.0,4.0.0)",
diff --git a/web/bundles/org.eclipse.wst.jsdt.web.ui/pom.xml b/web/bundles/org.eclipse.wst.jsdt.web.ui/pom.xml
index 0170a2c..9063fd7 100644
--- a/web/bundles/org.eclipse.wst.jsdt.web.ui/pom.xml
+++ b/web/bundles/org.eclipse.wst.jsdt.web.ui/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.jsdt.web.ui</artifactId>
-  <version>1.2.200-SNAPSHOT</version>
+  <version>1.2.201-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
    <!--  added this "constraint" for bug 458962 -->
diff --git a/web/bundles/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF b/web/bundles/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
index d28d9d6..9f1f9c9 100644
--- a/web/bundles/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
+++ b/web/bundles/org.eclipse.wst.web.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.web.ui; singleton:=true
-Bundle-Version: 1.2.102.qualifier
+Bundle-Version: 1.2.103.qualifier
 Bundle-Activator: org.eclipse.wst.web.ui.internal.WSTWebUIPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor.0
@@ -24,7 +24,7 @@
  org.eclipse.emf.ecore;bundle-version="[2.14.0,3.0.0)",
  org.eclipse.search;bundle-version="[3.11.0,4.0.0)",
  org.eclipse.ui.console;bundle-version="[3.7.0,4.0.0)",
- org.eclipse.wst.css.ui;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.css.ui;bundle-version="[1.2.0,1.3.0)",
  org.eclipse.wst.html.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.ui.navigator;bundle-version="[3.7.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/web/bundles/org.eclipse.wst.web.ui/pom.xml b/web/bundles/org.eclipse.wst.web.ui/pom.xml
index 8fb3d4e..e2ebbbd 100644
--- a/web/bundles/org.eclipse.wst.web.ui/pom.xml
+++ b/web/bundles/org.eclipse.wst.web.ui/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.javaee</groupId>
   <artifactId>org.eclipse.wst.web.ui</artifactId>
-  <version>1.2.102-SNAPSHOT</version>
+  <version>1.2.103-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/web/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF b/web/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
index 6cf7ab0..648686e 100644
--- a/web/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
+++ b/web/tests/org.eclipse.jst.jsp.core.tests/META-INF/MANIFEST.MF
@@ -22,6 +22,8 @@
  org.eclipse.jst.jsp.css.core.tests.source,
  org.eclipse.jst.jsp.css.core.tests.testfiles,
  org.eclipse.jst.jsp.css.core.tests.testfiles.results
+Import-Package: org.w3c.dom.css,
+ org.w3c.dom.stylesheets
 Require-Bundle: javax.servlet,
  javax.servlet.jsp,
  org.junit;bundle-version="[3.8.2,5.0.0)",
@@ -45,3 +47,4 @@
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Automatic-Module-Name: org.eclipse.jst.jsp.core.tests
diff --git a/web/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF b/web/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
index 383aa7b..80ff2a5 100644
--- a/web/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
+++ b/web/tests/org.eclipse.jst.jsp.ui.tests/META-INF/MANIFEST.MF
@@ -52,3 +52,4 @@
  org.eclipse.core.expressions
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Automatic-Module-Name: org.eclipse.jst.jsp.ui.tests
diff --git a/web/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF b/web/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
index ddc97c2..81ebded 100644
--- a/web/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
+++ b/web/tests/org.eclipse.wst.css.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.css.core.tests;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.1.100.qualifier
 Bundle-Activator: org.eclipse.wst.css.core.tests.CSSCoreTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
@@ -14,10 +14,13 @@
  org.eclipse.wst.css.core.tests.testfiles,
  org.eclipse.wst.css.core.tests.testfiles.results,
  org.eclipse.wst.css.core.tests.util
+Import-Package: org.w3c.dom.css,
+ org.w3c.dom.stylesheets
 Require-Bundle: org.eclipse.wst.css.core,
  org.eclipse.wst.sse.core,
  org.eclipse.core.runtime,
  org.eclipse.core.resources,
  org.junit;bundle-version=3.8.2
 Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
+Automatic-Module-Name: org.eclipse.wst.css.core.tests
diff --git a/web/tests/org.eclipse.wst.css.core.tests/pom.xml b/web/tests/org.eclipse.wst.css.core.tests/pom.xml
index 4ad48d5..f816d22 100644
--- a/web/tests/org.eclipse.wst.css.core.tests/pom.xml
+++ b/web/tests/org.eclipse.wst.css.core.tests/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.css.core.tests</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.1.100-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>
diff --git a/web/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF b/web/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF
index 2f2adb9..966b0ee 100644
--- a/web/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF
+++ b/web/tests/org.eclipse.wst.html.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.wst.html.core.tests;singleton:=true
-Bundle-Version: 1.1.100.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Activator: org.eclipse.wst.html.core.tests.HTMLCoreTestsPlugin
 Bundle-Vendor: %Bundle-Vendor.0
 Bundle-Localization: plugin
@@ -24,6 +24,9 @@
  org.eclipse.wst.css.core,
  com.ibm.icu,
  org.eclipse.core.resources
+Import-Package: org.w3c.dom.css,
+ org.w3c.dom.stylesheets
 Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: JavaSE-1.8
+Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.wst.html.core.tests
diff --git a/web/tests/org.eclipse.wst.html.core.tests/pom.xml b/web/tests/org.eclipse.wst.html.core.tests/pom.xml
index 61dbac7..732b7dc 100644
--- a/web/tests/org.eclipse.wst.html.core.tests/pom.xml
+++ b/web/tests/org.eclipse.wst.html.core.tests/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.sourceediting</groupId>
   <artifactId>org.eclipse.wst.html.core.tests</artifactId>
-  <version>1.1.100-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <properties>
diff --git a/web/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF b/web/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
index b5714b4..ecb5b29 100644
--- a/web/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
+++ b/web/tests/org.eclipse.wst.html.ui.tests/META-INF/MANIFEST.MF
@@ -28,3 +28,4 @@
 Eclipse-LazyStart: true
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.wst.html.ui.tests
diff --git a/xml/bundles/org.eclipse.wst.xml.core/.classpath b/xml/bundles/org.eclipse.wst.xml.core/.classpath
index fc4404c..20a5682 100644
--- a/xml/bundles/org.eclipse.wst.xml.core/.classpath
+++ b/xml/bundles/org.eclipse.wst.xml.core/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
 		<accessrules>
 			<accessrule kind="accessible" pattern="org/apache/xerces/dom/TreeWalkerImpl"/>
 			<accessrule kind="accessible" pattern="org/w3c/dom/ranges/DocumentRange"/>
diff --git a/xml/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.jdt.core.prefs b/xml/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.jdt.core.prefs
index ad79d02..2cf1333 100644
--- a/xml/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.jdt.core.prefs
+++ b/xml/bundles/org.eclipse.wst.xml.core/.settings/org.eclipse.jdt.core.prefs
@@ -7,9 +7,9 @@
 org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
 org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.compliance=11
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -23,6 +23,7 @@
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
@@ -52,6 +53,7 @@
 org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
 org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
 org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=error
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
 org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=enabled
 org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=error
 org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
@@ -73,6 +75,7 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.release=enabled
+org.eclipse.jdt.core.compiler.source=11
 org.eclipse.jdt.core.incompatibleJDKLevel=ignore
 org.eclipse.jdt.core.incompleteClasspath=error
diff --git a/xml/features/org.eclipse.wst.xml_core.feature/feature.xml b/xml/features/org.eclipse.wst.xml_core.feature/feature.xml
index 4b54940..8ed3338 100644
--- a/xml/features/org.eclipse.wst.xml_core.feature/feature.xml
+++ b/xml/features/org.eclipse.wst.xml_core.feature/feature.xml
@@ -56,7 +56,7 @@
          id="org.apache.xerces"
          download-size="1200"
          install-size="1200"
-         version="2.9.0.qualifier"
+         version="2.12.1.qualifier"
          unpack="false"/>
 
    <plugin