diff --git a/features/org.eclipse.xsd.edit-feature/feature.xml b/features/org.eclipse.xsd.edit-feature/feature.xml
index 2ca171d..7e8f39a 100644
--- a/features/org.eclipse.xsd.edit-feature/feature.xml
+++ b/features/org.eclipse.xsd.edit-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd.edit"
       label="%featureName"
-      version="2.12.0.qualifier"
+      version="2.13.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.xsd.edit-feature/pom.xml b/features/org.eclipse.xsd.edit-feature/pom.xml
index 4893363..f265053 100644
--- a/features/org.eclipse.xsd.edit-feature/pom.xml
+++ b/features/org.eclipse.xsd.edit-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd.edit</artifactId>
-  <version>2.12.0-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.xsd.mapping-feature/feature.xml b/features/org.eclipse.xsd.mapping-feature/feature.xml
index 21d01a0..35d0595 100644
--- a/features/org.eclipse.xsd.mapping-feature/feature.xml
+++ b/features/org.eclipse.xsd.mapping-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.xsd.mapping"
       label="%featureName"
-      version="2.12.0.qualifier"
+      version="2.13.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.xsd.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.xsd.mapping-feature/pom.xml b/features/org.eclipse.xsd.mapping-feature/pom.xml
index f1e05cc..0239543 100644
--- a/features/org.eclipse.xsd.mapping-feature/pom.xml
+++ b/features/org.eclipse.xsd.mapping-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.xsd.mapping</artifactId>
-  <version>2.12.0-SNAPSHOT</version>
+  <version>2.13.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.mapping.xsd2ecore/META-INF/MANIFEST.MF
index 59655f3..e37f2fd 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.mapping.xsd2ecore; singleton:=true
-Bundle-Version: 2.8.0.qualifier
+Bundle-Version: 2.9.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.mapping.xsd2ecore.XSD2EcorePlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,12 +12,12 @@
  org.eclipse.emf.mapping.xsd2ecore.impl,
  org.eclipse.emf.mapping.xsd2ecore.provider,
  org.eclipse.emf.mapping.xsd2ecore.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.14.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.mapping;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.xsd;bundle-version="[2.15.0,3.0.0)";visibility:=reexport,
- org.eclipse.xsd.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.16.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore.edit;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.mapping;bundle-version="[2.12.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xsd;bundle-version="[2.18.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xsd.edit;bundle-version="[2.11.0,3.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.mapping.xsd2ecore
diff --git a/plugins/org.eclipse.emf.mapping.xsd2ecore/pom.xml b/plugins/org.eclipse.emf.mapping.xsd2ecore/pom.xml
index f4f2747..4244d42 100644
--- a/plugins/org.eclipse.emf.mapping.xsd2ecore/pom.xml
+++ b/plugins/org.eclipse.emf.mapping.xsd2ecore/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.mapping.xsd2ecore</artifactId>
-  <version>2.8.0-SNAPSHOT</version>
+  <version>2.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.xsd.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd.edit/META-INF/MANIFEST.MF
index f6c44ec..2160009 100644
--- a/plugins/org.eclipse.xsd.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd.edit/META-INF/MANIFEST.MF
@@ -2,16 +2,16 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.xsd.edit; singleton:=true
-Bundle-Version: 2.10.0.qualifier
+Bundle-Version: 2.11.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.xsd.provider.XSDEditPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.xsd.provider
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.emf.edit;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
- org.eclipse.xsd;bundle-version="[2.15.0,3.0.0)";visibility:=reexport
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)";resolution:=optional;x-installation:=greedy,
+ org.eclipse.emf.edit;bundle-version="[2.16.0,3.0.0)";visibility:=reexport,
+ org.eclipse.xsd;bundle-version="[2.18.0,3.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.xsd.edit
diff --git a/plugins/org.eclipse.xsd.edit/pom.xml b/plugins/org.eclipse.xsd.edit/pom.xml
index 1fa087b..be7f6bd 100644
--- a/plugins/org.eclipse.xsd.edit/pom.xml
+++ b/plugins/org.eclipse.xsd.edit/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.xsd.edit</artifactId>
-  <version>2.10.0-SNAPSHOT</version>
+  <version>2.11.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
index fc84c49..53b5216 100644
--- a/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.xsd/META-INF/MANIFEST.MF
@@ -13,7 +13,7 @@
  org.eclipse.xsd.impl,
  org.eclipse.xsd.impl.type,
  org.eclipse.xsd.util
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)";resolution:=optional;x-installation:=greedy,
  org.eclipse.emf.ecore;bundle-version="[2.23.0,3.0.0)";visibility:=reexport
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy