diff --git a/jsf/features/org.eclipse.jsf.feature/feature.xml b/jsf/features/org.eclipse.jsf.feature/feature.xml
index d8da31b..4120ece 100644
--- a/jsf/features/org.eclipse.jsf.feature/feature.xml
+++ b/jsf/features/org.eclipse.jsf.feature/feature.xml
@@ -10,12 +10,11 @@
 
     Contributors:
         IBM Corporation - initial API and implementation
- -->
-
+ -->
 <feature
       id="org.eclipse.jsf.feature"
       label="%name"
-      version="3.10.0.qualifier"
+      version="3.10.1.qualifier"
       provider-name="%provider"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
diff --git a/jsf/features/org.eclipse.jsf.feature/pom.xml b/jsf/features/org.eclipse.jsf.feature/pom.xml
index 977c2d1..ae592bf 100644
--- a/jsf/features/org.eclipse.jsf.feature/pom.xml
+++ b/jsf/features/org.eclipse.jsf.feature/pom.xml
@@ -22,7 +22,7 @@
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jsf.feature</artifactId>
-  <version>3.10.0-SNAPSHOT</version>
+  <version>3.10.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
   <build>
diff --git a/jsf/features/org.eclipse.jsf_sdk.feature/feature.xml b/jsf/features/org.eclipse.jsf_sdk.feature/feature.xml
index 87f8868..e4bb145 100644
--- a/jsf/features/org.eclipse.jsf_sdk.feature/feature.xml
+++ b/jsf/features/org.eclipse.jsf_sdk.feature/feature.xml
@@ -15,7 +15,7 @@
 <feature
       id="org.eclipse.jsf_sdk.feature"
       label="%name"
-      version="3.10.0.qualifier"
+      version="3.10.1.qualifier"
       provider-name="%provider"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
diff --git a/jsf/features/org.eclipse.jsf_sdk.feature/pom.xml b/jsf/features/org.eclipse.jsf_sdk.feature/pom.xml
index 43192ae..033d6c9 100644
--- a/jsf/features/org.eclipse.jsf_sdk.feature/pom.xml
+++ b/jsf/features/org.eclipse.jsf_sdk.feature/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jsf_sdk.feature</artifactId>
-  <version>3.10.0-SNAPSHOT</version>
+  <version>3.10.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/META-INF/MANIFEST.MF
index 2c4e9d3..18eb72f 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsf.common.runtime
-Bundle-Version: 1.4.1.qualifier
+Bundle-Version: 1.4.2.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.common.runtime.internal.JSFCommonRuntimePlugin
 Require-Bundle: org.eclipse.core.runtime
 Bundle-ActivationPolicy: lazy
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/pom.xml b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/pom.xml
index b843631..62e0833 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/pom.xml
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.common.runtime</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java
index 60e0245..68c0f79 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.runtime/src/org/eclipse/jst/jsf/common/runtime/internal/model/component/ComponentFactory.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2001, 2008 Oracle Corporation and others.
+ * Copyright (c) 2001, 2020 Oracle Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License 2.0
  * which accompanies this distribution, and is available at
@@ -348,8 +348,8 @@
     }
 
 
-    private static final Integer ZERO = new Integer(0);
-    private static final Integer MINUS_ONE = new Integer(-1);
+    private static final Integer ZERO = Integer.valueOf(0);
+    private static final Integer MINUS_ONE = Integer.valueOf(-1);
 
     private static void maybeDefaultFirst(Map attributes)
     {
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF
index 31b6784..600ffec 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.jsf.common.ui;singleton:=true
-Bundle-Version: 1.5.101.qualifier
+Bundle-Version: 1.5.102.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.common.ui.JSFUICommonPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
@@ -19,7 +19,6 @@
  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.3.0)",
  org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.emf;bundle-version="[2.2.0,3.0.0)",
  org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
  org.eclipse.jst.jsf.common;bundle-version="[1.0.1,2.0.0)"
 Export-Package: org.eclipse.jst.jsf.common.ui;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.pagedesigner.jsf.ui",
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common.ui/pom.xml b/jsf/plugins/org.eclipse.jst.jsf.common.ui/pom.xml
index fe0471b..bbde617 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common.ui/pom.xml
+++ b/jsf/plugins/org.eclipse.jst.jsf.common.ui/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.jsf.common.ui</artifactId>
-  <version>1.5.101-SNAPSHOT</version>
+  <version>1.5.102-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/AnnotationJSFAppConfigLocator.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/AnnotationJSFAppConfigLocator.java
index d0c20f1..c5da6ec 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/AnnotationJSFAppConfigLocator.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/AnnotationJSFAppConfigLocator.java
@@ -27,8 +27,6 @@
 import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.JavaCore;
 import org.eclipse.jst.jsf.common.internal.componentcore.AbstractVirtualComponentQuery.DefaultVirtualComponentQuery;
-import org.eclipse.jst.jsf.core.jsfappconfig.AbstractJSFAppConfigLocater;
-import org.eclipse.jst.jsf.core.jsfappconfig.JSFAppConfigUtils;
 import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
 
 /**
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/AnnotationJSFAppConfigProvider.java b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/AnnotationJSFAppConfigProvider.java
index ac724e6..a090640 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/AnnotationJSFAppConfigProvider.java
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/src/org/eclipse/jst/jsf/core/jsfappconfig/AnnotationJSFAppConfigProvider.java
@@ -30,7 +30,6 @@
 import org.eclipse.jdt.core.search.SearchPattern;
 import org.eclipse.jdt.core.search.SearchRequestor;
 import org.eclipse.jst.jsf.core.internal.JSFCorePlugin;
-import org.eclipse.jst.jsf.core.jsfappconfig.AbstractJSFAppConfigProvider;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigFactory;
 import org.eclipse.jst.jsf.facesconfig.emf.FacesConfigType;
 
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
index 790f883..aedc7aa 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-SymbolicName: org.eclipse.jst.pagedesigner;singleton:=true
 Bundle-Name: %pluginName
-Bundle-Version: 1.8.3.qualifier
+Bundle-Version: 1.8.4.qualifier
 Bundle-Activator: org.eclipse.jst.pagedesigner.PDPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -11,7 +11,6 @@
  org.eclipse.gef;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.ui.workbench.texteditor;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.wst.common.uriresolver;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.wst.sse.ui;bundle-version="[1.7.0,2.0.0)",
  org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.3.0)",
@@ -123,6 +122,7 @@
  org.eclipse.jst.pagedesigner.viewer;x-internal:=true
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Import-Package: javax.servlet.jsp.el;version="2.0.0"
+Automatic-Module-Name: org.eclipse.jst.pagedesigner
 
 
 
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner/pom.xml b/jsf/plugins/org.eclipse.jst.pagedesigner/pom.xml
index e0cf294..b0de287 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner/pom.xml
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner/pom.xml
@@ -22,6 +22,6 @@
 
   <groupId>org.eclipse.webtools.jsf</groupId>
   <artifactId>org.eclipse.jst.pagedesigner</artifactId>
-  <version>1.8.3-SNAPSHOT</version>
+  <version>1.8.4-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 </project>
diff --git a/jsf/tests/org.eclipse.jst.pagedesigner.tests/META-INF/MANIFEST.MF b/jsf/tests/org.eclipse.jst.pagedesigner.tests/META-INF/MANIFEST.MF
index 9d12eb9..6a83876 100644
--- a/jsf/tests/org.eclipse.jst.pagedesigner.tests/META-INF/MANIFEST.MF
+++ b/jsf/tests/org.eclipse.jst.pagedesigner.tests/META-INF/MANIFEST.MF
@@ -26,7 +26,6 @@
  org.eclipse.jst.jsf.common.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.jst.pagedesigner.jsf.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.ui;bundle-version="[1.1.0,1.2.0)",
  org.eclipse.emf.ecore;bundle-version="[2.7.0,3.0.0)",
  org.eclipse.wst.common.project.facet.core;bundle-version="[1.4.0,1.5.0)"
 Export-Package: org.eclipse.jst.pagedesigner.tests;x-internal:=true