diff --git a/features/org.eclipse.wst.common_core.feature/feature.xml b/features/org.eclipse.wst.common_core.feature/feature.xml
index 27c8c7d..6d48c27 100644
--- a/features/org.eclipse.wst.common_core.feature/feature.xml
+++ b/features/org.eclipse.wst.common_core.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.wst.common_core.feature"
       label="%featureName"
-      version="3.10.101.qualifier"
+      version="3.19.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="1.0.1.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/features/org.eclipse.wst.common_core.feature/pom.xml b/features/org.eclipse.wst.common_core.feature/pom.xml
index abeff09..f7797c5 100644
--- a/features/org.eclipse.wst.common_core.feature/pom.xml
+++ b/features/org.eclipse.wst.common_core.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common_core.feature</artifactId>
-  <version>3.10.101-SNAPSHOT</version>
+  <version>3.19.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/features/org.eclipse.wst.common_sdk.feature/feature.xml b/features/org.eclipse.wst.common_sdk.feature/feature.xml
index ef73431..2ad10cf 100644
--- a/features/org.eclipse.wst.common_sdk.feature/feature.xml
+++ b/features/org.eclipse.wst.common_sdk.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.wst.common_sdk.feature"
       label="%featureName"
-      version="3.9.101.qualifier"
+      version="3.19.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="1.0.1.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/features/org.eclipse.wst.common_sdk.feature/pom.xml b/features/org.eclipse.wst.common_sdk.feature/pom.xml
index 7ac3bd4..ebf8a8a 100644
--- a/features/org.eclipse.wst.common_sdk.feature/pom.xml
+++ b/features/org.eclipse.wst.common_sdk.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common_sdk.feature</artifactId>
-  <version>3.9.101-SNAPSHOT</version>
+  <version>3.19.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.wst.common_tests.feature/feature.xml b/features/org.eclipse.wst.common_tests.feature/feature.xml
index d79d4a7..b67d933 100644
--- a/features/org.eclipse.wst.common_tests.feature/feature.xml
+++ b/features/org.eclipse.wst.common_tests.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.wst.common_tests.feature"
       label="%featureName"
-      version="3.7.1.qualifier"
+      version="3.19.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="1.0.1.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/features/org.eclipse.wst.common_tests.feature/pom.xml b/features/org.eclipse.wst.common_tests.feature/pom.xml
index 9e4cf1d..4f92bed 100644
--- a/features/org.eclipse.wst.common_tests.feature/pom.xml
+++ b/features/org.eclipse.wst.common_tests.feature/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common_tests.feature</artifactId>
-  <version>3.7.1-SNAPSHOT</version>
+  <version>3.19.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.wst.common_ui.feature/feature.xml b/features/org.eclipse.wst.common_ui.feature/feature.xml
index 725cb37..d76a6d7 100644
--- a/features/org.eclipse.wst.common_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.common_ui.feature/feature.xml
@@ -2,10 +2,10 @@
 <feature
       id="org.eclipse.wst.common_ui.feature"
       label="%featureName"
-      version="3.11.1.qualifier"
+      version="3.19.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
-      license-feature-version="1.0.1.qualifier">
+      license-feature-version="0.0.0">
 
    <description>
       %description
diff --git a/features/org.eclipse.wst.common_ui.feature/pom.xml b/features/org.eclipse.wst.common_ui.feature/pom.xml
index c9af504..5dfdfe7 100644
--- a/features/org.eclipse.wst.common_ui.feature/pom.xml
+++ b/features/org.eclipse.wst.common_ui.feature/pom.xml
@@ -21,7 +21,7 @@
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common_ui.feature</artifactId>
-  <version>3.11.1-SNAPSHOT</version>
+  <version>3.19.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF
index 3f4b4d9..e22febe 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.jst.common.project.facet.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Vendor: %providerName
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.common.project.facet.core; singleton:=true
-Bundle-Version: 1.9.1.qualifier
+Bundle-Version: 1.9.100.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jst.common.project.facet.core,
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/pom.xml b/plugins/org.eclipse.jst.common.project.facet.core/pom.xml
index 65bb86e..f8c2956 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/pom.xml
+++ b/plugins/org.eclipse.jst.common.project.facet.core/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.jst.common.project.facet.core</artifactId>
-  <version>1.9.1-SNAPSHOT</version>
+  <version>1.9.100-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/libprov/NoOpLibraryProviderOperation.java b/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/libprov/NoOpLibraryProviderOperation.java
index 388f97d..44cda17 100644
--- a/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/libprov/NoOpLibraryProviderOperation.java
+++ b/plugins/org.eclipse.jst.common.project.facet.core/src/org/eclipse/jst/common/project/facet/core/libprov/NoOpLibraryProviderOperation.java
@@ -1,5 +1,5 @@
 /******************************************************************************
- * Copyright (c) 2010 Oracle
+ * Copyright (c) 2010, 2020 Oracle and others
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
@@ -13,8 +13,6 @@
 
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperation;
-import org.eclipse.jst.common.project.facet.core.libprov.LibraryProviderOperationConfig;
 
 /**
  * This operation implementation can be used in situations when an install or an uninstall 
diff --git a/plugins/org.eclipse.wst.common.core/.classpath b/plugins/org.eclipse.wst.common.core/.classpath
index 184d4e5..c307b89 100644
--- a/plugins/org.eclipse.wst.common.core/.classpath
+++ b/plugins/org.eclipse.wst.common.core/.classpath
@@ -1,8 +1,8 @@
 <?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.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src-search"/>
 	<classpathentry kind="src" path="src-properties"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.wst.common.core/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.core/.settings/org.eclipse.jdt.core.prefs
index 7406de6..a80f757 100644
--- a/plugins/org.eclipse.wst.common.core/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.wst.common.core/.settings/org.eclipse.jdt.core.prefs
@@ -1,21 +1,20 @@
-#Mon Jan 30 23:40:52 EST 2006
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
@@ -56,4 +55,5 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.eclipse.wst.common.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.core/META-INF/MANIFEST.MF
index c144ca0..520c9a7 100644
--- a/plugins/org.eclipse.wst.common.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.core; singleton:=true
 Automatic-Module-Name: org.eclipse.wst.common.core
-Bundle-Version: 1.3.1.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: org.eclipse.wst.common.core.search.SearchPlugin
 Bundle-Localization: plugin
 Export-Package: org.eclipse.wst.common.core.search,
@@ -19,4 +19,4 @@
  org.eclipse.core.expressions;bundle-version="[3.6.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %pluginProvider
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.wst.common.core/pom.xml b/plugins/org.eclipse.wst.common.core/pom.xml
index 0995ff6..6486025 100644
--- a/plugins/org.eclipse.wst.common.core/pom.xml
+++ b/plugins/org.eclipse.wst.common.core/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.core</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
index 6eac61c..0923928 100644
--- a/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.emf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.emf; singleton:=true
-Bundle-Version: 1.2.601.qualifier
+Bundle-Version: 1.2.700.qualifier
 Bundle-Activator: org.eclipse.wst.common.internal.emf.plugin.EcoreUtilitiesPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.common.emf/pom.xml b/plugins/org.eclipse.wst.common.emf/pom.xml
index 09b6b0b..bf53a07 100644
--- a/plugins/org.eclipse.wst.common.emf/pom.xml
+++ b/plugins/org.eclipse.wst.common.emf/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.emf</artifactId>
-  <version>1.2.601-SNAPSHOT</version>
+  <version>1.2.700-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java
index 43c4a40..a867ac4 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/AbstractRendererImpl.java
@@ -28,6 +28,7 @@
 	/**
 	 * @see com.ibm.etools.emf2xml.Renderer#setResource(TranslatorResource)
 	 */
+	@Override
 	public void setResource(TranslatorResource aResource) {
 		resource = aResource;
 	}
@@ -35,6 +36,7 @@
 	/**
 	 * @see com.ibm.etools.emf2xml.Renderer#getResource()
 	 */
+	@Override
 	public TranslatorResource getResource() {
 		return resource;
 	}
@@ -66,6 +68,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#accessForRead()
 	 */
+	@Override
 	public void accessForRead() {
 	}
 
@@ -74,6 +77,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#accessForWrite()
 	 */
+	@Override
 	public void accessForWrite() {
 	}
 
@@ -82,6 +86,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#isModified()
 	 */
+	@Override
 	public boolean isModified() {
 		return false;
 	}
@@ -91,6 +96,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#isShared()
 	 */
+	@Override
 	public boolean isShared() {
 		return false;
 	}
@@ -100,6 +106,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#isSharedForWrite()
 	 */
+	@Override
 	public boolean isSharedForWrite() {
 		return false;
 	}
@@ -109,6 +116,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#preDelete()
 	 */
+	@Override
 	public void preDelete() {
 	}
 
@@ -117,6 +125,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#preUnload()
 	 */
+	@Override
 	public void preUnload() {
 	}
 
@@ -125,6 +134,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#releaseFromRead()
 	 */
+	@Override
 	public void releaseFromRead() {
 	}
 
@@ -133,6 +143,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#releaseFromWrite()
 	 */
+	@Override
 	public void releaseFromWrite() {
 	}
 
@@ -141,13 +152,16 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#setBatchMode(boolean)
 	 */
+	@Override
 	public void setBatchMode(boolean isBatch) {
 	}
 
+	@Override
 	public boolean useStreamsForIO() {
 		return true;
 	}
 
+	@Override
 	public boolean isBatchMode() {
 		return false;
 	}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
index 2664bf6..e5239ed 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/CompatibilityXMIResourceImpl.java
@@ -83,14 +83,17 @@
 		return CompatibilityPackageMappingRegistry.INSTANCE.getPackageURIsToPrefixes();
 	}
 
+	@Override
 	public void addOriginalPackageURI(String packageUri, String originalUri) {
 		originalPackageURIs.put(packageUri, originalUri);
 	}
 
+	@Override
 	public int getFormat() {
 		return format;
 	}
 
+	@Override
 	public void setFormat(int format) {
 		if (!isPlatformPluginResourceURI())
 			this.format = format;
@@ -112,6 +115,7 @@
 		return IDUtil.getOrAssignID(eObject, this);
 	}
 
+	@Override
 	public boolean usesDefaultFormat() {
 		return format == CompatibilityXMIResource.FORMAT_EMF1;
 	}
@@ -210,6 +214,7 @@
 	 * 
 	 * @see org.eclipse.wst.common.internal.emf.resource.CompatibilityXMIResource#removePreservingIds(org.eclipse.emf.ecore.EObject)
 	 */
+	@Override
 	public void removePreservingIds(EObject rootObject) {
 		setPreserveIDs(true);
 		getContents().remove(rootObject);
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DefaultTranslatorFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DefaultTranslatorFactory.java
index a42518a..d2e4069 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DefaultTranslatorFactory.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/DefaultTranslatorFactory.java
@@ -41,6 +41,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#accepts(java.lang.String)
 	 */
+	@Override
 	public boolean accepts(String domName) {
 		return domName != null && domName.startsWith(XMLNS);
 	}
@@ -50,6 +51,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#accepts(org.eclipse.emf.common.notify.Notification)
 	 */
+	@Override
 	public boolean accepts(Notification notif) {
 		return notif.getFeature() == NamespaceAdapter.NOTIFICATION_FEATURE;
 	}
@@ -60,6 +62,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#create(java.lang.String)
 	 */
+	@Override
 	public Translator create(String domName) {
 		return new NamespaceTranslator(domName);
 	}
@@ -69,6 +72,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#create(org.eclipse.emf.ecore.EObject)
 	 */
+	@Override
 	public List create(Notifier target) {
 		if (!(target instanceof EObject))
 			return null;
@@ -87,6 +91,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.impl.VariableTranslatorFactory#create(org.eclipse.emf.common.notify.Notification)
 	 */
+	@Override
 	public Translator create(Notification notif) {
 		Namespace ns = (Namespace) notif.getNewValue();
 		return create(ns);
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java
index cd56f9e..872204e 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMAdapterImpl.java
@@ -194,6 +194,7 @@
 	 * Set to false and notification of changes from both the DOM node and the MOF object will be
 	 * ignored.
 	 */
+	@Override
 	public boolean isNotificationEnabled() {
 		return fNotificationEnabled;
 	}
@@ -202,6 +203,7 @@
 	 * Set to false and notification of changes from both the DOM node and the MOF object will be
 	 * ignored.
 	 */
+	@Override
 	public void setNotificationEnabled(boolean isEnabled) {
 		fNotificationEnabled = isEnabled;
 	}
@@ -759,6 +761,7 @@
 	/**
 	 * Remove the DOM adapters from the node AND all its child nodes, recursively.
 	 */
+	@Override
 	public void removeAdapters(Node node) {
 		EMF2DOMAdapter adapter = primGetExistingAdapter(node);
 		if (adapter != null) {
@@ -937,12 +940,14 @@
 	/*
 	 * Return true if MOF object is a proxy.
 	 */
+	@Override
 	public boolean isMOFProxy() {
 		if (isRoot || target == null)
 			return false;
 		return ((InternalEObject) target).eIsProxy();
 	}
 
+	@Override
 	public EObject getEObject() {
 		if (isRoot)
 			return null;
@@ -953,20 +958,24 @@
 	 * Return the DOM node that the target of this adapter maps to. If the target MOF object maps to
 	 * more than one DOM node, this node is the top-most node.
 	 */
+	@Override
 	public Node getNode() {
 		return fNode;
 	}
 
+	@Override
 	public void setNode(Node aNode) {
 		fNode = aNode;
 	}
 
+	@Override
 	public void updateDOM() {
 		if (!isNotificationEnabled())
 			return;
 		primUpdateDOM();
 	}
 
+	@Override
 	public void updateMOF() {
 		if (!isNotificationEnabled())
 			return;
@@ -1608,6 +1617,7 @@
 	 * @param map
 	 *            com.ibm.etools.mof2dom.AttributeTranslator
 	 */
+	@Override
 	final public void updateDOMFeature(Translator map, Node node, EObject mofObject) {
 		if (!isNotificationEnabled())
 			return;
@@ -1826,6 +1836,7 @@
 	 * @param map
 	 *            com.ibm.etools.mof2dom.AttributeTranslator
 	 */
+	@Override
 	public void updateMOFFeature(Translator map, Node node, EObject mofObject) {
 		if (!isNotificationEnabled())
 			return;
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java
index 28ba22e..e7481b1 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRenderer.java
@@ -57,6 +57,7 @@
 	/**
 	 * @see com.ibm.etools.emf2xml.Renderer#doLoad(InputStream, Map)
 	 */
+	@Override
 	public void doLoad(InputStream in, Map options) throws IOException {
 		if ((in != null) || !useStreamsForIO()) {
 			loadDocument(in, options);
@@ -86,6 +87,7 @@
 	/**
 	 * @see com.ibm.etools.emf2xml.Renderer#doSave(OutputStream, Map)
 	 */
+	@Override
 	public void doSave(OutputStream outputStream, Map options) throws IOException {
 		createDOMTreeIfNecessary();
 		serializeDocument(outputStream);
@@ -119,6 +121,7 @@
 	/**
 	 * @see com.ibm.etools.emf2xml.Renderer#prepareToAddContents()
 	 */
+	@Override
 	public void prepareToAddContents() {
 		// createDOMTreeIfNecessary();
 	}
@@ -260,6 +263,7 @@
 		}
 	}
 
+	@Override
 	public int getVersionID() {
 		return getResource().getVersionID();
 	}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactoryDefaultHandler.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactoryDefaultHandler.java
index 9ff0f09..2c3d48f 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactoryDefaultHandler.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2DOMRendererFactoryDefaultHandler.java
@@ -39,6 +39,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.RendererFactoryDefaultHandler#getDefaultRendererFactory()
 	 */
+	@Override
 	public RendererFactory getDefaultRendererFactory() {
 		return EMF2DOMRendererFactory.INSTANCE;
 	}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java
index beb32db..e1969a0 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/EMF2SAXRenderer.java
@@ -51,6 +51,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#doLoad(java.io.InputStream, java.util.Map)
 	 */
+	@Override
 	public void doLoad(InputStream in, Map options) throws IOException {
 		try {
 			SAXParserFactory factory = SAXParserFactory.newInstance();
@@ -108,6 +109,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#doSave(java.io.OutputStream, java.util.Map)
 	 */
+	@Override
 	public void doSave(OutputStream outputStream, Map options) throws IOException {
 
 		/*
@@ -166,6 +168,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#prepareToAddContents()
 	 */
+	@Override
 	public void prepareToAddContents() {
 	}
 
@@ -174,6 +177,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.Renderer#getVersionID()
 	 */
+	@Override
 	public int getVersionID() {
 		return getResource().getVersionID();
 	}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
index 4dcfa72..9905e29 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/ReferencedXMIResourceImpl.java
@@ -131,6 +131,7 @@
 	 * 
 	 * @see org.eclipse.wst.common.internal.emf.resource.ReferencedResource#getReadCount()
 	 */
+	@Override
 	public int getReadCount() {
 		return readReferenceCount;
 	}
@@ -140,6 +141,7 @@
 	 * 
 	 * @see org.eclipse.wst.common.internal.emf.resource.ReferencedResource#getWriteCount()
 	 */
+	@Override
 	public int getWriteCount() {
 		return editReferenceCount;
 	}
@@ -149,6 +151,7 @@
 	/*
 	 * @see ReferencedResource#accessForRead
 	 */
+	@Override
 	public void accessForRead() {
 		checkDeleted();
 		if (!isNew())
@@ -159,6 +162,7 @@
 	/*
 	 * @see ReferencedResource#accessForWrite
 	 */
+	@Override
 	public void accessForWrite() {
 		checkDeleted();
 		editReferenceCount++;
@@ -211,6 +215,7 @@
 	/**
 	 * If the resource is no longer being accessed, then remove it from the resource set.
 	 */
+	@Override
 	public void unloadIfNecessary() {
 		if ((getTotalReferenceCount() <= 0) || (editReferenceCount <= 0 && isModified()))
 			unload();
@@ -228,6 +233,7 @@
 	/*
 	 * @see ReferencedResource#isNew
 	 */
+	@Override
 	public boolean isNew() {
 		return isNew;
 	}
@@ -235,6 +241,7 @@
 	/*
 	 * @see ReferencedResource#isReadOnly
 	 */
+	@Override
 	public boolean isReadOnly() {
 		return editReferenceCount <= 0;
 	}
@@ -242,6 +249,7 @@
 	/*
 	 * @see ReferencedResource#isShared
 	 */
+	@Override
 	public boolean isShared() {
 		return getTotalReferenceCount() > 1;
 	}
@@ -249,6 +257,7 @@
 	/*
 	 * @see ReferencedResource#isSharedForWrite
 	 */
+	@Override
 	public boolean isSharedForWrite() {
 		return editReferenceCount > 1;
 	}
@@ -262,6 +271,7 @@
 	/*
 	 * @see ReferencedResource#releaseFromRead
 	 */
+	@Override
 	public void releaseFromRead() {
 		readReferenceCount--;
 		if (readReferenceCount < 0)
@@ -272,6 +282,7 @@
 	/*
 	 * @see ReferencedResource#releaseFromWrite
 	 */
+	@Override
 	public void releaseFromWrite() {
 		editReferenceCount--;
 		if (editReferenceCount < 0)
@@ -282,6 +293,7 @@
 	/*
 	 * @see ReferencedResource#saveIfNecessary
 	 */
+	@Override
 	public void saveIfNecessary() throws Exception {
 		if (!isSharedForWrite()) // caller is the only referencer
 			save(Collections.EMPTY_MAP);
@@ -295,6 +307,7 @@
 	/*
 	 * @see ReferencedResource#needsToSave()
 	 */
+	@Override
 	public boolean needsToSave() {
 		return isModified() && !isSharedForWrite();
 	}
@@ -303,6 +316,7 @@
 	/**
 	 * @see ReferencedResource#setForceRefresh(boolean)
 	 */
+	@Override
 	public void setForceRefresh(boolean b) {
 		forceRefresh = b;
 	}
@@ -310,6 +324,7 @@
 	/**
 	 * @see ReferencedResource#shouldForceRefresh()
 	 */
+	@Override
 	public boolean shouldForceRefresh() {
 		return forceRefresh;
 	}
@@ -419,6 +434,7 @@
 	/**
 	 * @see com.ibm.etools.emf.workbench.ReferencedResource#wasReverted()
 	 */
+	@Override
 	public boolean wasReverted() {
 		return false;
 	}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java
index 599bbae..b8fd4c5 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResource.java
@@ -31,6 +31,7 @@
 	/**
 	 * The public id of the XML document, if specified.
 	 */
+	@Override
 	String getPublicId();
 
 	/**
@@ -41,6 +42,7 @@
 	/**
 	 * The system id of the XML document, if specified.
 	 */
+	@Override
 	String getSystemId();
 
 	/**
@@ -61,6 +63,7 @@
 	/**
 	 * Returns the XML version of this document
 	 */
+	@Override
 	String getXMLVersion();
 
 	Translator getRootTranslator();
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
index 860db43..b946bdd 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceFactory.java
@@ -60,6 +60,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.RendererFactory.Listener#updateRendererFactory(com.ibm.etools.emf2xml.RendererFactory)
 	 */
+	@Override
 	public void updateRendererFactory(RendererFactory newRendererFactory) {
 		//System.out.println("Updating renderer factory");
 		rendererFactory = newRendererFactory;
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java
index ff53720..626195d 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/resource/TranslatorResourceImpl.java
@@ -91,6 +91,7 @@
 	/**
 	 * Return the first element in the EList.
 	 */
+	@Override
 	public EObject getRootObject() {
 		if (contents == null || contents.isEmpty())
 			return null;
@@ -102,6 +103,7 @@
 		return systemId;
 	}
 
+	@Override
 	public void setDoctypeValues(String aPublicId, String aSystemId) {
 		boolean changed = !(StringUtil.stringsEqual(publicId, aPublicId) && StringUtil.stringsEqual(systemId, aSystemId));
 		publicId = aPublicId;
@@ -221,6 +223,7 @@
 	 * 
 	 * @return Renderer
 	 */
+	@Override
 	public Renderer getRenderer() {
 		return renderer;
 	}
@@ -277,6 +280,7 @@
 		};
 	}
 
+	@Override
 	public void setDefaults() {
 		if (systemId != null && publicId != null)
 			return;
@@ -299,6 +303,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.TranslatorResource#createEntityResolver()
 	 */
+	@Override
 	public EntityResolver getEntityResolver() {
 		return null;
 	}
@@ -312,6 +317,7 @@
 	/**
 	 * @return
 	 */
+	@Override
 	public int getVersionID() {
 		return versionID;
 	}
@@ -319,6 +325,7 @@
 	/**
 	 * @param i
 	 */
+	@Override
 	public void setVersionID(int i) {
 		versionID = i;
 	}
@@ -328,6 +335,7 @@
 	 * 
 	 * @see com.ibm.etools.emf2xml.TranslatorResource#usesDTD()
 	 */
+	@Override
 	public boolean usesDTD() {
 		return getPublicId() != null && getSystemId() != null;
 	}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CommandContext.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CommandContext.java
index 1eb3c5d..b89dd19 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CommandContext.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/CommandContext.java
@@ -55,6 +55,7 @@
 	 * 
 	 * @see com.ibm.ws.rd.command.framework.ICommandContext#getProgressMonitor()
 	 */
+	@Override
 	public IProgressMonitor getProgressMonitor() {
 		if (monitor == null)
 			monitor = new NullProgressMonitor();
@@ -66,6 +67,7 @@
 	 * 
 	 * @see com.ibm.ws.rd.command.framework.ICommandContext#getConfigurationProperties()
 	 */
+	@Override
 	public Map getConfigurationProperties() {
 		if (properties == null)
 			properties = new HashMap();
@@ -77,6 +79,7 @@
 	 * 
 	 * @see com.ibm.ws.rd.command.framework.ICommandContext#getResourceSet()
 	 */
+	@Override
 	public ResourceSet getResourceSet() {
 		if (resourceSet == null)
 			resourceSet = new ResourceSetImpl();
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
index 1d27820..f047b79 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DOMUtilities.java
@@ -64,10 +64,12 @@
 			int curIndex = 0;
 			String pathString = aPath;
 
+			@Override
 			public boolean hasNext() {
 				return pathString != null && prevIndex != -1;
 			}
 
+			@Override
 			public Object next() {
 				curIndex = pathString.indexOf('/', prevIndex);
 				String nodeString = null;
@@ -79,6 +81,7 @@
 				return nodeString;
 			}
 
+			@Override
 			public void remove() {
 				throw new UnsupportedOperationException();
 			}
@@ -515,6 +518,7 @@
 			 * 
 			 * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
 			 */
+			@Override
 			public void error(SAXParseException arg0) throws SAXException {
 				throw arg0;
 			}
@@ -524,10 +528,12 @@
 			 * 
 			 * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
 			 */
+			@Override
 			public void fatalError(SAXParseException arg0) throws SAXException {
 				throw arg0;
 			}
 
+			@Override
 			public void warning(SAXParseException arg0) throws SAXException {
 				EcoreUtilitiesPlugin.logWarning(arg0);
 			}
@@ -663,6 +669,7 @@
 				 * 
 				 * @see org.xml.sax.ErrorHandler#error(org.xml.sax.SAXParseException)
 				 */
+				@Override
 				public void error(SAXParseException exception) throws SAXException {
 
 				}
@@ -672,6 +679,7 @@
 				 * 
 				 * @see org.xml.sax.ErrorHandler#fatalError(org.xml.sax.SAXParseException)
 				 */
+				@Override
 				public void fatalError(SAXParseException exception) throws SAXException {
 
 				}
@@ -681,6 +689,7 @@
 				 * 
 				 * @see org.xml.sax.ErrorHandler#warning(org.xml.sax.SAXParseException)
 				 */
+				@Override
 				public void warning(SAXParseException exception) throws SAXException {
 
 				}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java
index dc6557e..94ca49b 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/DefaultFeatureValueConverter.java
@@ -301,6 +301,7 @@
 	 * @aValue to the type of
 	 * @aFeature.
 	 */
+	@Override
 	public Object convertValue(Object aValue, org.eclipse.emf.ecore.EStructuralFeature aFeature) {
 		if (aValue == null || aFeature == null || !(aFeature instanceof EAttribute))
 			return aValue; //nothing to convert
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderAdapter.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderAdapter.java
index 2ba9b11..abe7126 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderAdapter.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/EncoderDecoderAdapter.java
@@ -26,10 +26,12 @@
 	/**
 	 * Returns a decoded version of the value.
 	 */
+	@Override
 	public abstract String decode(String value);
 
 	/**
 	 * Returns an encoded version of the value.
 	 */
+	@Override
 	public abstract String encode(String value);
 }
\ No newline at end of file
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java
index 3af3dee..9274962 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/ExtendedEcoreUtil.java
@@ -157,6 +157,7 @@
 	public static FileNotFoundDetector getFileNotFoundDetector() {
 		if (FILE_NOT_FOUND_DETECTOR == null) {
 			FILE_NOT_FOUND_DETECTOR = new FileNotFoundDetector() {
+				@Override
 				public boolean isFileNotFound(WrappedException wrappedEx) {
 					if (getInnerFileNotFoundException(wrappedEx) != null)
 						return true;
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
index 6de2837..925157d 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordCipherException.java
@@ -1,5 +1,5 @@
 /***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2003, 2020 IBM Corporation and others. All rights reserved. This program and the
  * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
@@ -9,10 +9,7 @@
  **************************************************************************************************/
 package org.eclipse.wst.common.internal.emf.utilities;
 
-
-import org.omg.CORBA.UserException;
-
-public class InvalidPasswordCipherException extends UserException {
+public class InvalidPasswordCipherException extends PasswordException {
 
 	/**
 	 * 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
index 1be4282..6e94bb0 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordDecodingException.java
@@ -1,5 +1,5 @@
 /***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2003, 2020 IBM Corporation and others. All rights reserved. This program and the
  * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
@@ -9,10 +9,7 @@
  **************************************************************************************************/
 package org.eclipse.wst.common.internal.emf.utilities;
 
-
-import org.omg.CORBA.UserException;
-
-public class InvalidPasswordDecodingException extends UserException {
+public class InvalidPasswordDecodingException extends PasswordException {
 
 	/**
 	 * 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
index 3479fc9..6a3fa55 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/InvalidPasswordEncodingException.java
@@ -1,5 +1,5 @@
 /***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2003, 2020 IBM Corporation and others. All rights reserved. This program and the
  * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
@@ -9,10 +9,7 @@
  **************************************************************************************************/
 package org.eclipse.wst.common.internal.emf.utilities;
 
-
-import org.omg.CORBA.UserException;
-
-public class InvalidPasswordEncodingException extends UserException {
+public class InvalidPasswordEncodingException extends PasswordException {
 
 	/**
 	 * 
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java
index 64ddb55..7236a29 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/IsLoadingDetector.java
@@ -26,16 +26,20 @@
 	private IsLoadingDetector() {
 	}
 
+	@Override
 	public void notifyChanged(Notification notification) {
 	}
 
+	@Override
 	public Notifier getTarget() {
 		return null;
 	}
 
+	@Override
 	public void setTarget(Notifier newTarget) {
 	}
 
+	@Override
 	public boolean isAdapterForType(Object type) {
 		return type == this;
 	}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordException.java
new file mode 100644
index 0000000..16fb744
--- /dev/null
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/PasswordException.java
@@ -0,0 +1,32 @@
+/***************************************************************************************************
+ * Copyright (c) 2020 IBM Corporation. All rights reserved. This program and the
+ * accompanying materials are made available under the terms of the Eclipse Public
+ * License v2.0 which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ * 
+ * Contributors: IBM Corporation - initial API and implementation
+ **************************************************************************************************/
+package org.eclipse.wst.common.internal.emf.utilities;
+
+class PasswordException extends Exception {
+	private static final long serialVersionUID = 2613406662303316598L;
+
+	public PasswordException() {
+	}
+
+	public PasswordException(String message) {
+		super(message);
+	}
+
+	public PasswordException(Throwable cause) {
+		super(cause);
+	}
+
+	public PasswordException(String message, Throwable cause) {
+		super(message, cause);
+	}
+
+	public PasswordException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+		super(message, cause, enableSuppression, writableStackTrace);
+	}
+}
diff --git a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
index 57e666a..a31291c 100644
--- a/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
+++ b/plugins/org.eclipse.wst.common.emf/wtpemf/org/eclipse/wst/common/internal/emf/utilities/UnsupportedCryptoAlgorithmException.java
@@ -1,5 +1,5 @@
 /***************************************************************************************************
- * Copyright (c) 2003, 2004 IBM Corporation and others. All rights reserved. This program and the
+ * Copyright (c) 2003, 2020 IBM Corporation and others. All rights reserved. This program and the
  * accompanying materials are made available under the terms of the Eclipse Public License v2.0
  * which accompanies this distribution, and is available at
  * https://www.eclipse.org/legal/epl-2.0/
@@ -9,10 +9,7 @@
  **************************************************************************************************/
 package org.eclipse.wst.common.internal.emf.utilities;
 
-
-import org.omg.CORBA.UserException;
-
-public class UnsupportedCryptoAlgorithmException extends UserException {
+public class UnsupportedCryptoAlgorithmException extends PasswordException {
 
 	/**
 	 * 
diff --git a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModel.java b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModel.java
index 00e9656..07b9d52 100644
--- a/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModel.java
+++ b/plugins/org.eclipse.wst.common.emfworkbench.integration/src/org/eclipse/wst/common/internal/emfworkbench/integration/EditModel.java
@@ -72,7 +72,6 @@
 import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidator;
 import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorImpl;
 import org.eclipse.wst.common.internal.emfworkbench.validateedit.ResourceStateValidatorPresenter;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EMFWorkbenchEditPlugin;
 
 
 public class EditModel implements CommandStackListener, ResourceStateInputProvider, ResourceStateValidator, IEnablementIdentifierListener {
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ArtifactEditModel.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ArtifactEditModel.java
index da0fbe6..0453087 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ArtifactEditModel.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ArtifactEditModel.java
@@ -35,7 +35,6 @@
 import org.eclipse.wst.common.project.facet.core.IFacetedProject;
 import org.eclipse.wst.common.project.facet.core.IFacetedProjectListener;
 import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.componentcore.internal.ModulecorePlugin;
 
 /**
  * 
diff --git a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
index 737cc80..4862278 100644
--- a/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
+++ b/plugins/org.eclipse.wst.common.modulecore/modulecore-src/org/eclipse/wst/common/componentcore/internal/ComponentcorePackage.java
@@ -12,7 +12,6 @@
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EReference;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
 
 /**
  * <!-- begin-user-doc -->
diff --git a/plugins/org.eclipse.wst.common.ui/.classpath b/plugins/org.eclipse.wst.common.ui/.classpath
index c483836..211fe71 100644
--- a/plugins/org.eclipse.wst.common.ui/.classpath
+++ b/plugins/org.eclipse.wst.common.ui/.classpath
@@ -1,8 +1,8 @@
 <?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.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="src-search"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.wst.common.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.wst.common.ui/.settings/org.eclipse.jdt.core.prefs
index 6830385..a80f757 100644
--- a/plugins/org.eclipse.wst.common.ui/.settings/org.eclipse.jdt.core.prefs
+++ b/plugins/org.eclipse.wst.common.ui/.settings/org.eclipse.jdt.core.prefs
@@ -1,21 +1,20 @@
-#Mon Jan 30 23:41:58 EST 2006
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.4
+org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.debug.lineNumber=generate
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
 org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
 org.eclipse.jdt.core.compiler.problem.deprecation=warning
 org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
 org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
 org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
 org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
 org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
 org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
 org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
@@ -56,4 +55,5 @@
 org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
 org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
 org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.8
diff --git a/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
index 22fcb83..287cc2c 100644
--- a/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.ui; singleton:=true
-Bundle-Version: 1.1.701.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Activator: org.eclipse.wst.common.ui.internal.UIPlugin
 Bundle-Vendor: %pluginProvider
 Bundle-Localization: plugin
@@ -16,11 +16,11 @@
 Import-Package: com.ibm.icu.text; version="3.8"
 Require-Bundle: org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.runtime;bundle-version="[3.17.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.search;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.wst.common.core;bundle-version="[1.1.101,2.0.0)",
+ org.eclipse.wst.common.core;bundle-version="[1.4.0,2.0.0)",
  org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/plugins/org.eclipse.wst.common.ui/pom.xml b/plugins/org.eclipse.wst.common.ui/pom.xml
index 5c41765..30d37f4 100644
--- a/plugins/org.eclipse.wst.common.ui/pom.xml
+++ b/plugins/org.eclipse.wst.common.ui/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.ui</artifactId>
-  <version>1.1.701-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/plugins/org.eclipse.wst.common.uriresolver/.classpath b/plugins/org.eclipse.wst.common.uriresolver/.classpath
index ce73933..eca7bdb 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/.classpath
+++ b/plugins/org.eclipse.wst.common.uriresolver/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
+	<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.pde.core.requiredPlugins"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF
index 3c7017e..6492f7a 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.common.uriresolver/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.wst.common.uriresolver; singleton:=true
-Bundle-Version: 1.2.301.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.wst.common.uriresolver.internal.provisional.URIResolverPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,5 +13,6 @@
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)"
 Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
+Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
+Automatic-Module-Name: org.eclipse.wst.common.uriresolver
diff --git a/plugins/org.eclipse.wst.common.uriresolver/pom.xml b/plugins/org.eclipse.wst.common.uriresolver/pom.xml
index 1022edb..089fa4a 100644
--- a/plugins/org.eclipse.wst.common.uriresolver/pom.xml
+++ b/plugins/org.eclipse.wst.common.uriresolver/pom.xml
@@ -21,6 +21,6 @@
 
   <groupId>org.eclipse.webtools.common</groupId>
   <artifactId>org.eclipse.wst.common.uriresolver</artifactId>
-  <version>1.2.301-SNAPSHOT</version>
+  <version>1.3.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>