diff --git a/assembly/features/org.eclipse.jsf.assembly.feature/feature.xml b/assembly/features/org.eclipse.jsf.assembly.feature/feature.xml
index 36b968e..e3d921c 100644
--- a/assembly/features/org.eclipse.jsf.assembly.feature/feature.xml
+++ b/assembly/features/org.eclipse.jsf.assembly.feature/feature.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jsf.assembly.feature"
-      label="%name"
-      version="3.2.2.qualifier"
-      provider-name="%provider"
-      plugin="org.eclipse.jsf.branding"
-      license-feature="org.eclipse.license"
-      license-feature-version="1.0.0.qualifier">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <includes
-         id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.webpageeditor.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jsf.feature"
-         version="0.0.0"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.jsf.assembly.feature"
+      label="%name"
+      version="3.3.0.qualifier"
+      provider-name="%provider"
+      plugin="org.eclipse.jsf.branding"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="license.html">
+      %license
+   </license>
+
+   <includes
+         id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.jst.webpageeditor.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.jsf.feature"
+         version="0.0.0"/>
+
+</feature>
diff --git a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.properties b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.properties
index 9a083a4..b152b99 100644
--- a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.properties
+++ b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     Oracle. - initial API and implementation
 ###############################################################################
-name=JavaServer Faces Tools (JSF) Project SDK
-provider=Eclipse Web Tools Platform
+featureName=JavaServer Faces Tools (JSF) Project SDK
+providerName=Eclipse Web Tools Platform
 description=WTP JavaServer Faces Tools (JSF) Project  SDK
 
 
diff --git a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.xml b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.xml
index f760d9c..cd006b8 100644
--- a/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.xml
+++ b/assembly/features/org.eclipse.jsf_sdk.assembly.feature/feature.xml
@@ -1,35 +1,35 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.jsf_sdk.assembly.feature"
-      label="%featureName"
-      version="3.2.2.qualifier"
-      provider-name="%providerName"
-      image="eclipse_update_120.jpg"
-      license-feature="org.eclipse.license"
-      license-feature-version="1.0.0.qualifier">
-
-   <description>
-      %description
-   </description>
-
-   <copyright>
-      %copyright
-   </copyright>
-
-   <license url="license.html">
-      %license
-   </license>
-
-   <includes
-         id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jst.webpageeditor_sdk.feature"
-         version="0.0.0"/>
-
-   <includes
-         id="org.eclipse.jsf_sdk.feature"
-         version="0.0.0"/>
-
-</feature>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="org.eclipse.jsf_sdk.assembly.feature"
+      label="%featureName"
+      version="3.3.0.qualifier"
+      provider-name="%providerName"
+      image="eclipse_update_120.jpg"
+      license-feature="org.eclipse.license"
+      license-feature-version="1.0.0.qualifier">
+
+   <description>
+      %description
+   </description>
+
+   <copyright>
+      %copyright
+   </copyright>
+
+   <license url="license.html">
+      %license
+   </license>
+
+   <includes
+         id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.jst.webpageeditor_sdk.feature"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.jsf_sdk.feature"
+         version="0.0.0"/>
+
+</feature>
diff --git a/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF b/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF
index 8fd7b69..d158d79 100644
--- a/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF
+++ b/assembly/plugins/org.eclipse.jsf.branding/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.Name
 Bundle-SymbolicName: org.eclipse.jsf.branding
-Bundle-Version: 3.2.1.qualifier
+Bundle-Version: 3.3.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %plugin.Provider
diff --git a/jsf/features/org.eclipse.jsf.feature/feature.xml b/jsf/features/org.eclipse.jsf.feature/feature.xml
index f2a76ee..45726bb 100644
--- a/jsf/features/org.eclipse.jsf.feature/feature.xml
+++ b/jsf/features/org.eclipse.jsf.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jsf.feature"
       label="%name"
-      version="3.4.1.qualifier"
+      version="3.5.0.qualifier"
       provider-name="%provider"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
diff --git a/jsf/features/org.eclipse.jsf_sdk.feature/feature.xml b/jsf/features/org.eclipse.jsf_sdk.feature/feature.xml
index 66f8a74..24b8851 100644
--- a/jsf/features/org.eclipse.jsf_sdk.feature/feature.xml
+++ b/jsf/features/org.eclipse.jsf_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jsf_sdk.feature"
       label="%name"
-      version="3.4.1.qualifier"
+      version="3.5.0.qualifier"
       provider-name="%provider"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.xml b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.xml
index 449df6b..1798612 100644
--- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.xml
+++ b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.jsf.apache.trinidad.tagsupport.feature"
       label="%featureName"
-      version="2.2.201.qualifier"
+      version="2.3.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.0.qualifier">
diff --git a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/feature.xml b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/feature.xml
index 2d3d467..0b9bb15 100644
--- a/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/feature.xml
+++ b/jsf/features/org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.jsf.apache.trinidad.tagsupport_sdk.feature"
       label="%featureName"
-      version="2.2.201.qualifier"
+      version="2.3.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.0.qualifier">
diff --git a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml b/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
index 6a1a922..96dfa81 100644
--- a/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
+++ b/jsf/features/org.eclipse.jst.webpageeditor.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.webpageeditor.feature"
       label="%featureName"
-      version="2.3.8.qualifier"
+      version="2.4.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.license"
diff --git a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml
index 5c6b1da..f625eaf 100644
--- a/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml
+++ b/jsf/features/org.eclipse.jst.webpageeditor_sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.jst.webpageeditor_sdk.feature"
       label="%featureName"
-      version="2.3.8.qualifier"
+      version="2.4.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="1.0.0.qualifier">
diff --git a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/META-INF/MANIFEST.MF
index e10eef4..4be2f7e 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.apache.trinidad.tagsupport/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.jsf.apache.trinidad.tagsupport;singleton:=true
-Bundle-Version: 1.1.201.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.jst.jsf.apache.trinidad.tagsupport.TrinidadTagSupportActivator
 Bundle-Vendor: %pluginProvider
@@ -16,7 +16,7 @@
  org.eclipse.jst.jsf.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jst.jsf.common.ui;bundle-version="[1.1.0,1.3.0)"
+ org.eclipse.jst.jsf.common.ui;bundle-version="[1.1.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.jst.jsf.apache.trinidad.tagsupport;x-internal:=true,
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 b19802a..cb0ee39 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.1.1.qualifier
+Bundle-Version: 1.2.0.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.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common.ui/META-INF/MANIFEST.MF
index 961e95f..2bea286 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.2.101.qualifier
+Bundle-Version: 1.3.0.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)",
diff --git a/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF
index 1f274f0..9aa266d 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.jst.jsf.common;singleton:=true
-Bundle-Version: 1.2.4.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.common.JSFCommonPlugin$Implementation
 Bundle-Localization: plugin
 Export-Package: org.eclipse.jst.jsf.common;x-internal:=true,
diff --git a/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF
index 35c4ceb..bd17433 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.core/META-INF/MANIFEST.MF
@@ -1,121 +1,121 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %plugin.name
-Bundle-SymbolicName: org.eclipse.jst.jsf.core; singleton:=true
-Bundle-Version: 1.4.1.qualifier
-Bundle-Activator: org.eclipse.jst.jsf.core.internal.JSFCorePlugin
-Bundle-Vendor: %plugin.provider
-Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,2.0.0)",
- org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.jsf.facesconfig;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
- org.eclipse.jst.jsf.common;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.html.core;bundle-version="[1.1.0,1.2.0)",
- org.eclipse.wst.validation;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.jst.jsf.common.runtime;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jst.common.frameworks;bundle-version="[1.1.102,1.2.0)",
- org.eclipse.wst.css.core;bundle-version="[1.1.200,1.2.0)",
- org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.ui;bundle-version="3.6.0"
-Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.jst.jsf.core.internal.contenttype"
-Export-Package: org.eclipse.jst.jsf.core,
- org.eclipse.jst.jsf.core.internal;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.core.internal.contentassist.el;x-friends:="org.eclipse.jst.jsf.contentassist.tests",
- org.eclipse.jst.jsf.core.internal.contenttype;x-internal:=true,
- org.eclipse.jst.jsf.core.internal.jem;x-internal:=true,
- org.eclipse.jst.jsf.core.internal.jsflibraryconfig;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui.tests,org.eclipse.jst.pagedesigner.tests",
- org.eclipse.jst.jsf.core.internal.jsflibraryregistry;
-  x-friends:="org.eclipse.jst.jsf.core.tests,
-   org.eclipse.jst.jsf.ui,
-   org.eclipse.jst.jsf.ui.tests,
-   org.eclipse.jst.pagedesigner.tests",
- org.eclipse.jst.jsf.core.internal.jsflibraryregistry.adapter;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.core.internal.launch;x-internal:=true,
- org.eclipse.jst.jsf.core.internal.project.facet;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
- org.eclipse.jst.jsf.core.internal.region;x-internal:=true,
- org.eclipse.jst.jsf.core.internal.tld;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.jsf.core.tests",
- org.eclipse.jst.jsf.core.jsfappconfig,
- org.eclipse.jst.jsf.core.jsfappconfig.internal;x-internal:=true,
- org.eclipse.jst.jsf.core.jsflibraryconfiguration,
- org.eclipse.jst.jsf.core.jsflibraryconfiguration.internal;x-friends:="org.eclipse.jst.jsf.core.tests",
- org.eclipse.jst.jsf.core.jsflibraryregistry,
- org.eclipse.jst.jsf.core.jsflibraryregistry.internal;x-friends:="org.eclipse.jst.jsf.core.tests",
- org.eclipse.jst.jsf.core.metadata.internal;x-internal:=true,
- org.eclipse.jst.jsf.core.set.constraint,
- org.eclipse.jst.jsf.core.set.mapping,
- org.eclipse.jst.jsf.core.tagmatcher,
- org.eclipse.jst.jsf.designtime,
- org.eclipse.jst.jsf.designtime.context,
- org.eclipse.jst.jsf.designtime.el,
- org.eclipse.jst.jsf.designtime.internal;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.jsp;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.resolver;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.resources;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.symbols;x-friends:="org.eclipse.jst.jsf.designtime.tests",
- org.eclipse.jst.jsf.designtime.internal.view;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.view.mapping;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.view.mapping.mappers;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.impl;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.util;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.view.model;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.view.model.jsp;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.view.model.jsp.analyzer;x-friends:="org.eclipse.jst.jsf.designtime.tests",
- org.eclipse.jst.jsf.designtime.internal.view.model.jsp.persistence;x-internal:=true,
- org.eclipse.jst.jsf.designtime.internal.view.model.jsp.registry;x-friends:="org.eclipse.jst.jsf.designtime.tests",
- org.eclipse.jst.jsf.designtime.resolver,
- org.eclipse.jst.jsf.designtime.symbols,
- org.eclipse.jst.jsf.metadataprocessors,
- org.eclipse.jst.jsf.metadataprocessors.features,
- org.eclipse.jst.jsf.metadataprocessors.internal;x-friends:="org.eclipse.jst.jsf.metadata.tests",
- org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos;
-  x-friends:="org.eclipse.jst.pagedesigner,
-   org.eclipse.jst.pagedesigner.tests,
-   org.eclipse.jst.jsf.metadata.tests,
-   org.eclipse.jst.jsf.facelet.core,
-   org.eclipse.jst.jsf.facelet.ui",
- org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.impl;
-  x-friends:="org.eclipse.jst.pagedesigner,
-   org.eclipse.jst.pagedesigner.tests,
-   org.eclipse.jst.jsf.metadata.tests,
-   org.eclipse.jst.jsf.facelet.core,
-   org.eclipse.jst.jsf.facelet.ui",
- org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.util;
-  x-friends:="org.eclipse.jst.pagedesigner,
-   org.eclipse.jst.pagedesigner.tests,
-   org.eclipse.jst.jsf.metadata.tests,
-   org.eclipse.jst.jsf.facelet.core,
-   org.eclipse.jst.jsf.facelet.ui",
- org.eclipse.jst.jsf.taglibprocessing.attributevalues,
- org.eclipse.jst.jsf.validation.internal;x-friends:="org.eclipse.jst.jsf.ui",
- org.eclipse.jst.jsf.validation.internal.appconfig;x-friends:="org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.core.tests",
- org.eclipse.jst.jsf.validation.internal.constraints;x-internal:=true,
- org.eclipse.jst.jsf.validation.internal.constraints.impl;x-internal:=true,
- org.eclipse.jst.jsf.validation.internal.constraints.util;x-internal:=true,
- org.eclipse.jst.jsf.validation.internal.el;x-friends:="org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.validation.el.tests",
- org.eclipse.jst.jsf.validation.internal.el.diagnostics;x-friends:="org.eclipse.jst.jsf.validation.el.tests",
- org.eclipse.jst.jsf.validation.internal.el.operators;x-internal:=true,
- org.eclipse.jst.jsf.validation.internal.facelet,
- org.eclipse.jst.jsf.validation.internal.strategy;x-internal:=true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %plugin.name
+Bundle-SymbolicName: org.eclipse.jst.jsf.core; singleton:=true
+Bundle-Version: 1.5.0.qualifier
+Bundle-Activator: org.eclipse.jst.jsf.core.internal.JSFCorePlugin
+Bundle-Vendor: %plugin.provider
+Bundle-Localization: plugin
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.common.project.facet.core;bundle-version="[1.2.0,2.0.0)",
+ org.eclipse.jst.j2ee.web;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.jsf.facesconfig;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.jst.j2ee;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.jst.j2ee.core;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.wst.xml.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.jst.jsp.core;bundle-version="[1.1.0,1.3.0)",
+ org.eclipse.jst.jsf.common;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jface.text;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.wst.sse.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.html.core;bundle-version="[1.1.0,1.2.0)",
+ org.eclipse.wst.validation;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.wst.common.emf;bundle-version="[1.1.103,2.0.0)",
+ org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.emf.common;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.core.commands;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.emf.edit;bundle-version="[2.2.0,3.0.0)",
+ org.eclipse.jst.common.project.facet.core;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.jst.jsf.common.runtime;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.jst.common.frameworks;bundle-version="[1.1.102,1.2.0)",
+ org.eclipse.wst.css.core;bundle-version="[1.1.200,1.2.0)",
+ org.eclipse.debug.core;bundle-version="[3.5.0,4.0.0)",
+ org.eclipse.ui;bundle-version="3.6.0"
+Bundle-ActivationPolicy: lazy;exclude:="org.eclipse.jst.jsf.core.internal.contenttype"
+Export-Package: org.eclipse.jst.jsf.core,
+ org.eclipse.jst.jsf.core.internal;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
+ org.eclipse.jst.jsf.core.internal.contentassist.el;x-friends:="org.eclipse.jst.jsf.contentassist.tests",
+ org.eclipse.jst.jsf.core.internal.contenttype;x-internal:=true,
+ org.eclipse.jst.jsf.core.internal.jem;x-internal:=true,
+ org.eclipse.jst.jsf.core.internal.jsflibraryconfig;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui.tests,org.eclipse.jst.pagedesigner.tests",
+ org.eclipse.jst.jsf.core.internal.jsflibraryregistry;
+  x-friends:="org.eclipse.jst.jsf.core.tests,
+   org.eclipse.jst.jsf.ui,
+   org.eclipse.jst.jsf.ui.tests,
+   org.eclipse.jst.pagedesigner.tests",
+ org.eclipse.jst.jsf.core.internal.jsflibraryregistry.adapter;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
+ org.eclipse.jst.jsf.core.internal.jsflibraryregistry.impl;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
+ org.eclipse.jst.jsf.core.internal.jsflibraryregistry.util;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
+ org.eclipse.jst.jsf.core.internal.launch;x-internal:=true,
+ org.eclipse.jst.jsf.core.internal.project.facet;x-friends:="org.eclipse.jst.jsf.core.tests,org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.ui.tests",
+ org.eclipse.jst.jsf.core.internal.region;x-internal:=true,
+ org.eclipse.jst.jsf.core.internal.tld;x-friends:="org.eclipse.jst.pagedesigner,org.eclipse.jst.jsf.core.tests",
+ org.eclipse.jst.jsf.core.jsfappconfig,
+ org.eclipse.jst.jsf.core.jsfappconfig.internal;x-internal:=true,
+ org.eclipse.jst.jsf.core.jsflibraryconfiguration,
+ org.eclipse.jst.jsf.core.jsflibraryconfiguration.internal;x-friends:="org.eclipse.jst.jsf.core.tests",
+ org.eclipse.jst.jsf.core.jsflibraryregistry,
+ org.eclipse.jst.jsf.core.jsflibraryregistry.internal;x-friends:="org.eclipse.jst.jsf.core.tests",
+ org.eclipse.jst.jsf.core.metadata.internal;x-internal:=true,
+ org.eclipse.jst.jsf.core.set.constraint,
+ org.eclipse.jst.jsf.core.set.mapping,
+ org.eclipse.jst.jsf.core.tagmatcher,
+ org.eclipse.jst.jsf.designtime,
+ org.eclipse.jst.jsf.designtime.context,
+ org.eclipse.jst.jsf.designtime.el,
+ org.eclipse.jst.jsf.designtime.internal;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.jsp;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.resolver;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.resources;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.symbols;x-friends:="org.eclipse.jst.jsf.designtime.tests",
+ org.eclipse.jst.jsf.designtime.internal.view;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.view.mapping;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.view.mapping.mappers;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.impl;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.view.mapping.viewmapping.util;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.view.model;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.view.model.jsp;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.view.model.jsp.analyzer;x-friends:="org.eclipse.jst.jsf.designtime.tests",
+ org.eclipse.jst.jsf.designtime.internal.view.model.jsp.persistence;x-internal:=true,
+ org.eclipse.jst.jsf.designtime.internal.view.model.jsp.registry;x-friends:="org.eclipse.jst.jsf.designtime.tests",
+ org.eclipse.jst.jsf.designtime.resolver,
+ org.eclipse.jst.jsf.designtime.symbols,
+ org.eclipse.jst.jsf.metadataprocessors,
+ org.eclipse.jst.jsf.metadataprocessors.features,
+ org.eclipse.jst.jsf.metadataprocessors.internal;x-friends:="org.eclipse.jst.jsf.metadata.tests",
+ org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos;
+  x-friends:="org.eclipse.jst.pagedesigner,
+   org.eclipse.jst.pagedesigner.tests,
+   org.eclipse.jst.jsf.metadata.tests,
+   org.eclipse.jst.jsf.facelet.core,
+   org.eclipse.jst.jsf.facelet.ui",
+ org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.impl;
+  x-friends:="org.eclipse.jst.pagedesigner,
+   org.eclipse.jst.pagedesigner.tests,
+   org.eclipse.jst.jsf.metadata.tests,
+   org.eclipse.jst.jsf.facelet.core,
+   org.eclipse.jst.jsf.facelet.ui",
+ org.eclipse.jst.jsf.tagdisplay.internal.paletteinfos.util;
+  x-friends:="org.eclipse.jst.pagedesigner,
+   org.eclipse.jst.pagedesigner.tests,
+   org.eclipse.jst.jsf.metadata.tests,
+   org.eclipse.jst.jsf.facelet.core,
+   org.eclipse.jst.jsf.facelet.ui",
+ org.eclipse.jst.jsf.taglibprocessing.attributevalues,
+ org.eclipse.jst.jsf.validation.internal;x-friends:="org.eclipse.jst.jsf.ui",
+ org.eclipse.jst.jsf.validation.internal.appconfig;x-friends:="org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.core.tests",
+ org.eclipse.jst.jsf.validation.internal.constraints;x-internal:=true,
+ org.eclipse.jst.jsf.validation.internal.constraints.impl;x-internal:=true,
+ org.eclipse.jst.jsf.validation.internal.constraints.util;x-internal:=true,
+ org.eclipse.jst.jsf.validation.internal.el;x-friends:="org.eclipse.jst.jsf.ui,org.eclipse.jst.jsf.validation.el.tests",
+ org.eclipse.jst.jsf.validation.internal.el.diagnostics;x-friends:="org.eclipse.jst.jsf.validation.el.tests",
+ org.eclipse.jst.jsf.validation.internal.el.operators;x-internal:=true,
+ org.eclipse.jst.jsf.validation.internal.facelet,
+ org.eclipse.jst.jsf.validation.internal.strategy;x-internal:=true
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/META-INF/MANIFEST.MF
index f976d77..76773ae 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.core/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsf.facelet.core;singleton:=true
-Bundle-Version: 1.0.201.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.facelet.core.internal.FaceletCorePlugin$Implementation
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime,
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/META-INF/MANIFEST.MF
index 4676aaa..baa923b 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.facelet.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.jst.jsf.facelet.ui;singleton:=true
-Bundle-Version: 1.0.2.qualifier
+Bundle-Version: 1.1.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.facelet.ui.internal.FaceletUiPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui,
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF
index 358a53b..ced0685 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.jst.jsf.facesconfig.ui;singleton:=true
-Bundle-Version: 1.2.101.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.facesconfig.ui.EditorPlugin
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
diff --git a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/META-INF/MANIFEST.MF
index 6f4dad3..aa85659 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.facesconfig/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.facesconfig/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.jst.jsf.facesconfig; singleton:=true
-Bundle-Version: 1.2.101.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.facesconfig.FacesConfigPlugin$Implementation
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
diff --git a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/META-INF/MANIFEST.MF
index 6c5925e..e71c9c9 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.standard.tagsupport/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.jsf.standard.tagsupport;singleton:=true
-Bundle-Version: 1.2.101.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.jst.jsf.standard.tagsupport.StandardTagSupportPlugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
diff --git a/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF
index fcc94b3..d3e42b9 100644
--- a/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.jsf.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.jst.jsf.ui; singleton:=true
-Bundle-Version: 1.3.201.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: org.eclipse.jst.jsf.ui.internal.JSFUiPlugin
 Bundle-Vendor: %plugin.provider
 Bundle-Localization: plugin
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF
index 1940a1a..67f3485 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsf.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.pagedesigner.jsf.ui;singleton:=true
-Bundle-Version: 1.2.101.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-Activator: org.eclipse.jst.pagedesigner.jsf.ui.JSFUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
index 97e04d1..45eed5d 100644
--- a/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
+++ b/jsf/plugins/org.eclipse.jst.pagedesigner.jsp.core/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.jst.pagedesigner.jsp.core;singleton:=true
-Bundle-Version: 1.2.101.qualifier
+Bundle-Version: 1.3.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.jst.pagedesigner.jsp.core.JSPCorePlugin
 Bundle-Vendor: %providerName
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 a562229..d94d1a5 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.3.201.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: org.eclipse.jst.pagedesigner.PDPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin