[Releng] Consolidate plugin dependencies and resource locators

161 files changed, 346 insertions, 397 deletions

diff --git a/features/org.eclipse.oomph.preferences-feature/feature.xml b/features/org.eclipse.oomph.preferences-feature/feature.xml
index b3ac965d8..e79b92ac7 100644
--- a/features/org.eclipse.oomph.preferences-feature/feature.xml
+++ b/features/org.eclipse.oomph.preferences-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.preferences"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.preferences-feature/pom.xml b/features/org.eclipse.oomph.preferences-feature/pom.xml
index d1c8f4c91..ffdab1450 100644
--- a/features/org.eclipse.oomph.preferences-feature/pom.xml
+++ b/features/org.eclipse.oomph.preferences-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.preferences</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.projectconfig-feature/feature.xml b/features/org.eclipse.oomph.projectconfig-feature/feature.xml
index 0a0aed2a9..1a6f7aa5e 100644
--- a/features/org.eclipse.oomph.projectconfig-feature/feature.xml
+++ b/features/org.eclipse.oomph.projectconfig-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.projectconfig"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.projectconfig-feature/pom.xml b/features/org.eclipse.oomph.projectconfig-feature/pom.xml
index 392183409..2e95c4158 100644
--- a/features/org.eclipse.oomph.projectconfig-feature/pom.xml
+++ b/features/org.eclipse.oomph.projectconfig-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.projectconfig</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.projectcopy-feature/feature.xml b/features/org.eclipse.oomph.projectcopy-feature/feature.xml
index 464804814..b73d9c8cc 100644
--- a/features/org.eclipse.oomph.projectcopy-feature/feature.xml
+++ b/features/org.eclipse.oomph.projectcopy-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.projectcopy"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.projectcopy-feature/pom.xml b/features/org.eclipse.oomph.projectcopy-feature/pom.xml
index 18c17c67a..131aecab4 100644
--- a/features/org.eclipse.oomph.projectcopy-feature/pom.xml
+++ b/features/org.eclipse.oomph.projectcopy-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.projectcopy</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.setup.jdt-feature/feature.xml b/features/org.eclipse.oomph.setup.jdt-feature/feature.xml
index f1c1f16c4..96c868c9f 100644
--- a/features/org.eclipse.oomph.setup.jdt-feature/feature.xml
+++ b/features/org.eclipse.oomph.setup.jdt-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.setup.jdt"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.setup.jdt-feature/pom.xml b/features/org.eclipse.oomph.setup.jdt-feature/pom.xml
index bc9a81f75..e6ae75140 100644
--- a/features/org.eclipse.oomph.setup.jdt-feature/pom.xml
+++ b/features/org.eclipse.oomph.setup.jdt-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.setup.jdt</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.setup.launching-feature/feature.xml b/features/org.eclipse.oomph.setup.launching-feature/feature.xml
index b59bc1527..bdf6dc29a 100644
--- a/features/org.eclipse.oomph.setup.launching-feature/feature.xml
+++ b/features/org.eclipse.oomph.setup.launching-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.setup.launching"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.setup.launching-feature/pom.xml b/features/org.eclipse.oomph.setup.launching-feature/pom.xml
index 3a154fd40..54c91f851 100644
--- a/features/org.eclipse.oomph.setup.launching-feature/pom.xml
+++ b/features/org.eclipse.oomph.setup.launching-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.setup.launching</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.setup.maven-feature/feature.xml b/features/org.eclipse.oomph.setup.maven-feature/feature.xml
index a2d18fc53..7be7e533d 100644
--- a/features/org.eclipse.oomph.setup.maven-feature/feature.xml
+++ b/features/org.eclipse.oomph.setup.maven-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.setup.maven"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.setup.maven-feature/pom.xml b/features/org.eclipse.oomph.setup.maven-feature/pom.xml
index a817d01ba..678255b77 100644
--- a/features/org.eclipse.oomph.setup.maven-feature/pom.xml
+++ b/features/org.eclipse.oomph.setup.maven-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.setup.maven</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.setup.mylyn-feature/feature.xml b/features/org.eclipse.oomph.setup.mylyn-feature/feature.xml
index 86f789560..ef8b388b9 100644
--- a/features/org.eclipse.oomph.setup.mylyn-feature/feature.xml
+++ b/features/org.eclipse.oomph.setup.mylyn-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.setup.mylyn"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.setup.mylyn-feature/pom.xml b/features/org.eclipse.oomph.setup.mylyn-feature/pom.xml
index 1cd211f52..b081e038d 100644
--- a/features/org.eclipse.oomph.setup.mylyn-feature/pom.xml
+++ b/features/org.eclipse.oomph.setup.mylyn-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.setup.mylyn</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.setup.pde-feature/feature.xml b/features/org.eclipse.oomph.setup.pde-feature/feature.xml
index 0993196fd..8e8023c89 100644
--- a/features/org.eclipse.oomph.setup.pde-feature/feature.xml
+++ b/features/org.eclipse.oomph.setup.pde-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.setup.pde"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.setup.pde-feature/pom.xml b/features/org.eclipse.oomph.setup.pde-feature/pom.xml
index 48bc0916b..99488954d 100644
--- a/features/org.eclipse.oomph.setup.pde-feature/pom.xml
+++ b/features/org.eclipse.oomph.setup.pde-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.setup.pde</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.setup.projects-feature/feature.xml b/features/org.eclipse.oomph.setup.projects-feature/feature.xml
index 217160d7d..f6165a304 100644
--- a/features/org.eclipse.oomph.setup.projects-feature/feature.xml
+++ b/features/org.eclipse.oomph.setup.projects-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.setup.projects"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.setup.projects-feature/pom.xml b/features/org.eclipse.oomph.setup.projects-feature/pom.xml
index 540aa3c45..5404c0d47 100644
--- a/features/org.eclipse.oomph.setup.projects-feature/pom.xml
+++ b/features/org.eclipse.oomph.setup.projects-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.setup.projects</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.setup.projectset-feature/feature.xml b/features/org.eclipse.oomph.setup.projectset-feature/feature.xml
index 8151a5baa..c20eeca91 100644
--- a/features/org.eclipse.oomph.setup.projectset-feature/feature.xml
+++ b/features/org.eclipse.oomph.setup.projectset-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.setup.projectset"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.setup.projectset-feature/pom.xml b/features/org.eclipse.oomph.setup.projectset-feature/pom.xml
index 4680c805e..9e02511ae 100644
--- a/features/org.eclipse.oomph.setup.projectset-feature/pom.xml
+++ b/features/org.eclipse.oomph.setup.projectset-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.setup.projectset</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.setup.targlets-feature/feature.xml b/features/org.eclipse.oomph.setup.targlets-feature/feature.xml
index a68301e62..541028f65 100644
--- a/features/org.eclipse.oomph.setup.targlets-feature/feature.xml
+++ b/features/org.eclipse.oomph.setup.targlets-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.setup.targlets"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.setup.targlets-feature/pom.xml b/features/org.eclipse.oomph.setup.targlets-feature/pom.xml
index 072e11ab7..7a5e75cc2 100644
--- a/features/org.eclipse.oomph.setup.targlets-feature/pom.xml
+++ b/features/org.eclipse.oomph.setup.targlets-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.setup.targlets</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.setup.workbench-feature/feature.xml b/features/org.eclipse.oomph.setup.workbench-feature/feature.xml
index f7b396001..21539768a 100644
--- a/features/org.eclipse.oomph.setup.workbench-feature/feature.xml
+++ b/features/org.eclipse.oomph.setup.workbench-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.setup.workbench"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.setup.workbench-feature/pom.xml b/features/org.eclipse.oomph.setup.workbench-feature/pom.xml
index 180a18593..b1772cea7 100644
--- a/features/org.eclipse.oomph.setup.workbench-feature/pom.xml
+++ b/features/org.eclipse.oomph.setup.workbench-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.setup.workbench</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/features/org.eclipse.oomph.setup.workingsets-feature/feature.xml b/features/org.eclipse.oomph.setup.workingsets-feature/feature.xml
index ddcf37e06..309a742b4 100644
--- a/features/org.eclipse.oomph.setup.workingsets-feature/feature.xml
+++ b/features/org.eclipse.oomph.setup.workingsets-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.oomph.setup.workingsets"
       label="%featureName"
-      version="1.1.0.qualifier"
+      version="1.2.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.oomph.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.oomph.setup.workingsets-feature/pom.xml b/features/org.eclipse.oomph.setup.workingsets-feature/pom.xml
index 82d04cdf9..f3839eef9 100644
--- a/features/org.eclipse.oomph.setup.workingsets-feature/pom.xml
+++ b/features/org.eclipse.oomph.setup.workingsets-feature/pom.xml
@@ -20,6 +20,6 @@
   </parent>
   <groupId>org.eclipse.oomph.features</groupId>
   <artifactId>org.eclipse.oomph.setup.workingsets</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 </project>
diff --git a/plugins/org.eclipse.oomph.base.edit/.project b/plugins/org.eclipse.oomph.base.edit/.project
index 52c3ee1c4..34127da32 100644
--- a/plugins/org.eclipse.oomph.base.edit/.project
+++ b/plugins/org.eclipse.oomph.base.edit/.project
@@ -26,7 +26,7 @@
 					<key>release.path</key>
 					<value>/org.eclipse.oomph.util/release.xml</value>
 				</dictionary>
-      </arguments>
+			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
diff --git a/plugins/org.eclipse.oomph.base.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.base.edit/META-INF/MANIFEST.MF
index 9f138d169..643001bd1 100644
--- a/plugins/org.eclipse.oomph.base.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.base.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.base.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.base.provider.BaseEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,6 +12,5 @@ Export-Package: org.eclipse.oomph.base.provider;version="1.1.0";x-internal:=true
  org.eclipse.oomph.edit;version="1.1.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.base.edit/pom.xml b/plugins/org.eclipse.oomph.base.edit/pom.xml
index 8616e5ccd..47a704da2 100644
--- a/plugins/org.eclipse.oomph.base.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.base.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.base.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.base.edit/src/org/eclipse/oomph/base/provider/BaseEditPlugin.java b/plugins/org.eclipse.oomph.base.edit/src/org/eclipse/oomph/base/provider/BaseEditPlugin.java
index d4a0514fd..523231be3 100644
--- a/plugins/org.eclipse.oomph.base.edit/src/org/eclipse/oomph/base/provider/BaseEditPlugin.java
+++ b/plugins/org.eclipse.oomph.base.edit/src/org/eclipse/oomph/base/provider/BaseEditPlugin.java
@@ -10,6 +10,8 @@
  */
 package org.eclipse.oomph.base.provider;
 
+import org.eclipse.oomph.internal.base.BasePlugin;
+
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.ResourceLocator;
 
@@ -41,11 +43,11 @@ public final class BaseEditPlugin extends EMFPlugin
    * Create the instance.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
+   * @generated NOT
    */
   public BaseEditPlugin()
   {
-    super(new ResourceLocator[] {});
+    super(new ResourceLocator[] { BasePlugin.INSTANCE });
   }
 
   /**
diff --git a/plugins/org.eclipse.oomph.base/.project b/plugins/org.eclipse.oomph.base/.project
index a07d9c06f..429dc4acf 100644
--- a/plugins/org.eclipse.oomph.base/.project
+++ b/plugins/org.eclipse.oomph.base/.project
@@ -26,7 +26,7 @@
 					<key>release.path</key>
 					<value>/org.eclipse.oomph.util/release.xml</value>
 				</dictionary>
-      </arguments>
+			</arguments>
 		</buildCommand>
 	</buildSpec>
 	<natures>
diff --git a/plugins/org.eclipse.oomph.base/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.base/META-INF/MANIFEST.MF
index b3473e69d..8d96fada3 100644
--- a/plugins/org.eclipse.oomph.base/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.base/META-INF/MANIFEST.MF
@@ -2,18 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.base;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.internal.base.BasePlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.base;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.base.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.base.util;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.internal.base;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.base;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.base.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.base.util;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.internal.base;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.base/model/Base.genmodel b/plugins/org.eclipse.oomph.base/model/Base.genmodel
index beac731a9..d9abbcacf 100644
--- a/plugins/org.eclipse.oomph.base/model/Base.genmodel
+++ b/plugins/org.eclipse.oomph.base/model/Base.genmodel
@@ -2,9 +2,10 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.base/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.base" modelName="Base" modelPluginClass="org.eclipse.oomph.internal.base.BasePlugin"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" operationReflection="true" cleanup="true">
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" operationReflection="true"
+    cleanup="true">
   <foreignModel>Base.ecore</foreignModel>
   <genPackages prefix="Base" basePackage="org.eclipse.oomph" disposableProviderFactory="true"
       dataTypeConverters="true" extensibleProviderFactory="true" childCreationExtenders="true"
diff --git a/plugins/org.eclipse.oomph.base/pom.xml b/plugins/org.eclipse.oomph.base/pom.xml
index 4e30a1b3a..2a40b554e 100644
--- a/plugins/org.eclipse.oomph.base/pom.xml
+++ b/plugins/org.eclipse.oomph.base/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.base</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.base/src/org/eclipse/oomph/internal/base/BasePlugin.java b/plugins/org.eclipse.oomph.base/src/org/eclipse/oomph/internal/base/BasePlugin.java
index 188dd5650..642a87cd3 100644
--- a/plugins/org.eclipse.oomph.base/src/org/eclipse/oomph/internal/base/BasePlugin.java
+++ b/plugins/org.eclipse.oomph.base/src/org/eclipse/oomph/internal/base/BasePlugin.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.oomph.internal.base;
 
+import org.eclipse.oomph.internal.util.UtilPlugin;
 import org.eclipse.oomph.util.OomphPlugin;
 
 import org.eclipse.emf.common.util.ResourceLocator;
@@ -42,11 +43,11 @@ public final class BasePlugin extends OomphPlugin
    * Create the instance.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
+   * @generated NOT
    */
   public BasePlugin()
   {
-    super(new ResourceLocator[] {});
+    super(new ResourceLocator[] { UtilPlugin.INSTANCE });
   }
 
   /**
diff --git a/plugins/org.eclipse.oomph.jreinfo/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.jreinfo/META-INF/MANIFEST.MF
index 1423f50b3..0bd88ce06 100644
--- a/plugins/org.eclipse.oomph.jreinfo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.jreinfo/META-INF/MANIFEST.MF
@@ -10,7 +10,7 @@ Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.internal.jreinfo.JREInfoPlugin$Implementation
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
+ org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.extractor.lib;bundle-version="[1.1.0,2.0.0)"
 Export-Package: org.eclipse.oomph.internal.jreinfo;version="1.2.0";x-internal:=true,
  org.eclipse.oomph.jreinfo;version="1.2.0";x-internal:=true
diff --git a/plugins/org.eclipse.oomph.jreinfo/src/org/eclipse/oomph/internal/jreinfo/JREInfoPlugin.java b/plugins/org.eclipse.oomph.jreinfo/src/org/eclipse/oomph/internal/jreinfo/JREInfoPlugin.java
index 2c0d532b5..c0ef9f29d 100644
--- a/plugins/org.eclipse.oomph.jreinfo/src/org/eclipse/oomph/internal/jreinfo/JREInfoPlugin.java
+++ b/plugins/org.eclipse.oomph.jreinfo/src/org/eclipse/oomph/internal/jreinfo/JREInfoPlugin.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.oomph.internal.jreinfo;
 
+import org.eclipse.oomph.internal.util.UtilPlugin;
 import org.eclipse.oomph.util.OomphPlugin;
 
 import org.eclipse.emf.common.util.ResourceLocator;
@@ -25,7 +26,7 @@ public final class JREInfoPlugin extends OomphPlugin
 
   public JREInfoPlugin()
   {
-    super(new ResourceLocator[] {});
+    super(new ResourceLocator[] { UtilPlugin.INSTANCE });
   }
 
   @Override
diff --git a/plugins/org.eclipse.oomph.p2.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.p2.core/META-INF/MANIFEST.MF
index 5811b0e77..eca0746a2 100644
--- a/plugins/org.eclipse.oomph.p2.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.p2.core/META-INF/MANIFEST.MF
@@ -22,7 +22,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.equinox.p2.director;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.equinox.p2.operations;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.equinox.p2.touchpoint.natives;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.p2;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Service-Component: META-INF/lazyProfileRegistry.xml, META-INF/lazyProfileRegistry_bug390470.xml
diff --git a/plugins/org.eclipse.oomph.p2.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.p2.edit/META-INF/MANIFEST.MF
index c5d5d4a6b..a5a749121 100644
--- a/plugins/org.eclipse.oomph.p2.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.p2.edit/META-INF/MANIFEST.MF
@@ -11,7 +11,6 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.oomph.p2.provider;version="1.1.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.p2.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.p2.ui/META-INF/MANIFEST.MF
index a03978268..9f1e7a9a2 100644
--- a/plugins/org.eclipse.oomph.p2.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.p2.ui/META-INF/MANIFEST.MF
@@ -17,7 +17,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.p2.ui;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.p2.core;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
diff --git a/plugins/org.eclipse.oomph.p2/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.p2/META-INF/MANIFEST.MF
index 93b36eb8c..0e444b3ec 100644
--- a/plugins/org.eclipse.oomph.p2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.p2/META-INF/MANIFEST.MF
@@ -11,8 +11,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.equinox.p2.director;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.equinox.p2.engine;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.oomph.p2;version="1.2.0";x-internal:=true,
diff --git a/plugins/org.eclipse.oomph.p2/model/P2.genmodel b/plugins/org.eclipse.oomph.p2/model/P2.genmodel
index dc00f02bc..38c354e53 100644
--- a/plugins/org.eclipse.oomph.p2/model/P2.genmodel
+++ b/plugins/org.eclipse.oomph.p2/model/P2.genmodel
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.p2/src" creationIcons="false"
-    editorDirectory="" modelPluginID="org.eclipse.oomph.p2" modelName="P2" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base"
+    editorDirectory="" modelPluginID="org.eclipse.oomph.p2" modelName="P2" updateClasspath="false"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base"
     operationReflection="true" cleanup="true">
   <foreignModel>P2.ecore</foreignModel>
   <genPackages prefix="P2" basePackage="org.eclipse.oomph" disposableProviderFactory="true"
@@ -44,6 +45,7 @@
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute P2.ecore#//Requirement/versionRange"/>
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute P2.ecore#//Requirement/optional"/>
       <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute P2.ecore#//Requirement/feature"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute P2.ecore#//Requirement/filter"/>
       <genOperations ecoreOperation="P2.ecore#//Requirement/setVersionRange">
         <genParameters ecoreParameter="P2.ecore#//Requirement/setVersionRange/version"/>
         <genParameters ecoreParameter="P2.ecore#//Requirement/setVersionRange/segment"/>
diff --git a/plugins/org.eclipse.oomph.predicates.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.predicates.edit/META-INF/MANIFEST.MF
index 28486b874..9ece3cfe9 100644
--- a/plugins/org.eclipse.oomph.predicates.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.predicates.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.predicates.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.predicates.provider.PredicatesEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,6 +12,5 @@ Export-Package: org.eclipse.oomph.predicates.provider;version="1.1.0";x-internal
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.predicates.edit/pom.xml b/plugins/org.eclipse.oomph.predicates.edit/pom.xml
index 93a8a6845..43d41a443 100644
--- a/plugins/org.eclipse.oomph.predicates.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.predicates.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.predicates.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.predicates/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.predicates/META-INF/MANIFEST.MF
index b3896deeb..e448ba44c 100644
--- a/plugins/org.eclipse.oomph.predicates/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.predicates/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.predicates;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.internal.predicates.PredicatesPlugin$Implementation
 Bundle-Name: %pluginName
@@ -12,11 +12,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.team.core;bundle-version="[3.6.0,4.0.0)";resolution:=optional,
- org.eclipse.egit.core;bundle-version="[3.0.0,5.0.0)";resolution:=optional,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.egit.core;bundle-version="[3.0.0,5.0.0)";resolution:=optional
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.internal.predicates;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.predicates;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.predicates.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.predicates.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.internal.predicates;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.predicates;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.predicates.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.predicates.util;version="1.2.0";x-internal:=true
diff --git a/plugins/org.eclipse.oomph.predicates/model/Predicates.genmodel b/plugins/org.eclipse.oomph.predicates/model/Predicates.genmodel
index a9223304d..2a7f923e0 100644
--- a/plugins/org.eclipse.oomph.predicates/model/Predicates.genmodel
+++ b/plugins/org.eclipse.oomph.predicates/model/Predicates.genmodel
@@ -2,9 +2,10 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.predicates/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.predicates" modelName="Predicates"
-    modelPluginClass="org.eclipse.oomph.internal.predicates.PredicatesPlugin" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base"
+    modelPluginClass="org.eclipse.oomph.internal.predicates.PredicatesPlugin" updateClasspath="false"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base"
     operationReflection="true" decoration="Live" cleanup="true">
   <foreignModel>Predicates.ecore</foreignModel>
   <genPackages prefix="Predicates" basePackage="org.eclipse.oomph" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.predicates/pom.xml b/plugins/org.eclipse.oomph.predicates/pom.xml
index f01a59b45..e88a92a68 100644
--- a/plugins/org.eclipse.oomph.predicates/pom.xml
+++ b/plugins/org.eclipse.oomph.predicates/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.predicates</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.preferences.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.preferences.edit/META-INF/MANIFEST.MF
index 799e5bfd9..958194345 100644
--- a/plugins/org.eclipse.oomph.preferences.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.preferences.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.preferences.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.preferences.provider.PreferencesEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,6 +12,5 @@ Export-Package: org.eclipse.oomph.preferences.provider;version="1.1.0";x-interna
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.preferences;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.preferences.edit/pom.xml b/plugins/org.eclipse.oomph.preferences.edit/pom.xml
index 575161997..7061156b7 100644
--- a/plugins/org.eclipse.oomph.preferences.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.preferences.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.preferences.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.preferences/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.preferences/META-INF/MANIFEST.MF
index 9c6d556f6..af1cb32d9 100644
--- a/plugins/org.eclipse.oomph.preferences/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.preferences/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.preferences;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
@@ -9,10 +9,9 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.preferences;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.preferences.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.preferences.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.preferences;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.preferences.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.preferences.util;version="1.2.0";x-internal:=true
diff --git a/plugins/org.eclipse.oomph.preferences/model/Preferences.genmodel b/plugins/org.eclipse.oomph.preferences/model/Preferences.genmodel
index 2fada5fab..ed2ca7c19 100644
--- a/plugins/org.eclipse.oomph.preferences/model/Preferences.genmodel
+++ b/plugins/org.eclipse.oomph.preferences/model/Preferences.genmodel
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.preferences/src" creationIcons="false"
-    modelPluginID="org.eclipse.oomph.preferences" modelName="Preferences" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base"
+    modelPluginID="org.eclipse.oomph.preferences" modelName="Preferences" updateClasspath="false"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base"
     operationReflection="true" decoration="Live" cleanup="true">
   <foreignModel>Preferences.ecore</foreignModel>
   <genPackages prefix="Preferences" basePackage="org.eclipse.oomph" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.preferences/pom.xml b/plugins/org.eclipse.oomph.preferences/pom.xml
index d99003b95..cdaa37548 100644
--- a/plugins/org.eclipse.oomph.preferences/pom.xml
+++ b/plugins/org.eclipse.oomph.preferences/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.preferences</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.projectconfig.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.projectconfig.edit/META-INF/MANIFEST.MF
index 57a48fecf..0234012fc 100644
--- a/plugins/org.eclipse.oomph.projectconfig.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.projectconfig.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.projectconfig.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.projectconfig.provider.ProjectConfigEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,11 +12,8 @@ Export-Package: org.eclipse.oomph.projectconfig.provider;version="1.1.0";x-inter
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.projectconfig;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.predicates.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.preferences;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.preferences.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.projectconfig.edit/pom.xml b/plugins/org.eclipse.oomph.projectconfig.edit/pom.xml
index 5d810b6e1..43e7ca327 100644
--- a/plugins/org.eclipse.oomph.projectconfig.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.projectconfig.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.projectconfig.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.projectconfig/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.projectconfig/META-INF/MANIFEST.MF
index 333e6a418..75d50fba9 100644
--- a/plugins/org.eclipse.oomph.projectconfig/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.projectconfig/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.projectconfig;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.projectconfig.impl.ProjectConfigPlugin$Implementation
 Bundle-Name: %pluginName
@@ -11,13 +11,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.preferences;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.team.core;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.projectconfig;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.projectconfig.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.projectconfig.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.projectconfig;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.projectconfig.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.projectconfig.util;version="1.2.0";x-internal:=true
diff --git a/plugins/org.eclipse.oomph.projectconfig/model/ProjectConfig.genmodel b/plugins/org.eclipse.oomph.projectconfig/model/ProjectConfig.genmodel
index 86d3f02dd..9d7ebd7d8 100644
--- a/plugins/org.eclipse.oomph.projectconfig/model/ProjectConfig.genmodel
+++ b/plugins/org.eclipse.oomph.projectconfig/model/ProjectConfig.genmodel
@@ -2,9 +2,9 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.projectconfig/src" creationIcons="false"
     modelPluginID="org.eclipse.oomph.projectconfig" modelName="Project Config" modelPluginClass="org.eclipse.oomph.projectconfig.impl.ProjectConfigPlugin"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.preferences/model/Preferences.genmodel#//preferences ../../org.eclipse.oomph.base/model/Base.genmodel#//base"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.preferences/model/Preferences.genmodel#//preferences ../../org.eclipse.oomph.base/model/Base.genmodel#//base"
     operationReflection="true" decoration="Live" cleanup="true">
   <foreignModel>ProjectConfig.ecore</foreignModel>
   <genPackages prefix="ProjectConfig" basePackage="org.eclipse.oomph" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.projectconfig/pom.xml b/plugins/org.eclipse.oomph.projectconfig/pom.xml
index 3f401a769..30ba7b72a 100644
--- a/plugins/org.eclipse.oomph.projectconfig/pom.xml
+++ b/plugins/org.eclipse.oomph.projectconfig/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.projectconfig</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.projectcopy/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.projectcopy/META-INF/MANIFEST.MF
index 597aefd91..3f40c1bbc 100644
--- a/plugins/org.eclipse.oomph.projectcopy/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.projectcopy/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.projectcopy;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,4 +13,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.projectcopy;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.projectcopy;version="1.2.0";x-internal:=true
diff --git a/plugins/org.eclipse.oomph.projectcopy/pom.xml b/plugins/org.eclipse.oomph.projectcopy/pom.xml
index bd0379a16..285fcd663 100644
--- a/plugins/org.eclipse.oomph.projectcopy/pom.xml
+++ b/plugins/org.eclipse.oomph.projectcopy/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.projectcopy</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.projectcopy/src/org/eclipse/oomph/projectcopy/ProjectCopyPlugin.java b/plugins/org.eclipse.oomph.projectcopy/src/org/eclipse/oomph/projectcopy/ProjectCopyPlugin.java
index bbded25a6..e00c6cc33 100644
--- a/plugins/org.eclipse.oomph.projectcopy/src/org/eclipse/oomph/projectcopy/ProjectCopyPlugin.java
+++ b/plugins/org.eclipse.oomph.projectcopy/src/org/eclipse/oomph/projectcopy/ProjectCopyPlugin.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.oomph.projectcopy;
 
+import org.eclipse.oomph.internal.util.UtilPlugin;
 import org.eclipse.oomph.util.OomphPlugin;
 
 import org.eclipse.emf.common.util.ResourceLocator;
@@ -25,7 +26,7 @@ public final class ProjectCopyPlugin extends OomphPlugin
 
   public ProjectCopyPlugin()
   {
-    super(new ResourceLocator[] {});
+    super(new ResourceLocator[] { UtilPlugin.INSTANCE });
   }
 
   @Override
diff --git a/plugins/org.eclipse.oomph.resources.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.resources.edit/META-INF/MANIFEST.MF
index 041ef7273..4a9fd1463 100644
--- a/plugins/org.eclipse.oomph.resources.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.resources.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.resources.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.resources.provider.ResourcesEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,8 +12,6 @@ Export-Package: org.eclipse.oomph.resources.provider;version="1.1.0";x-internal:
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.predicates.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.resources.edit/pom.xml b/plugins/org.eclipse.oomph.resources.edit/pom.xml
index 518620067..8973f7cc5 100644
--- a/plugins/org.eclipse.oomph.resources.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.resources.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.resources.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.resources/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.resources/META-INF/MANIFEST.MF
index ff549576c..76754143d 100644
--- a/plugins/org.eclipse.oomph.resources/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.resources/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.resources;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.internal.resources.ResourcesPlugin$Implementation
 Bundle-Name: %pluginName
@@ -11,13 +11,11 @@ Require-Bundle: org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)";visibi
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.variables;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.oomph.internal.resources;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.resources;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.resources.backend;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.resources.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.resources.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.internal.resources;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.resources;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.resources.backend;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.resources.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.resources.util;version="1.2.0";x-internal:=true
diff --git a/plugins/org.eclipse.oomph.resources/model/Resources.genmodel b/plugins/org.eclipse.oomph.resources/model/Resources.genmodel
index 67377181e..4fcc724d0 100644
--- a/plugins/org.eclipse.oomph.resources/model/Resources.genmodel
+++ b/plugins/org.eclipse.oomph.resources/model/Resources.genmodel
@@ -2,9 +2,10 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.resources/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.resources" modelName="Resources"
-    modelPluginClass="org.eclipse.oomph.internal.resources.ResourcesPlugin" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates"
+    modelPluginClass="org.eclipse.oomph.internal.resources.ResourcesPlugin" updateClasspath="false"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates"
     operationReflection="true" cleanup="true">
   <foreignModel>Resources.ecore</foreignModel>
   <genPackages prefix="Resources" basePackage="org.eclipse.oomph" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.resources/pom.xml b/plugins/org.eclipse.oomph.resources/pom.xml
index a35767ff8..b5267e991 100644
--- a/plugins/org.eclipse.oomph.resources/pom.xml
+++ b/plugins/org.eclipse.oomph.resources/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.resources</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.resources/src/org/eclipse/oomph/internal/resources/ResourcesPlugin.java b/plugins/org.eclipse.oomph.resources/src/org/eclipse/oomph/internal/resources/ResourcesPlugin.java
index afd3f12e1..2011409d1 100644
--- a/plugins/org.eclipse.oomph.resources/src/org/eclipse/oomph/internal/resources/ResourcesPlugin.java
+++ b/plugins/org.eclipse.oomph.resources/src/org/eclipse/oomph/internal/resources/ResourcesPlugin.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.oomph.internal.resources;
 
+import org.eclipse.oomph.internal.util.UtilPlugin;
 import org.eclipse.oomph.util.OomphPlugin;
 
 import org.eclipse.emf.common.util.ResourceLocator;
@@ -42,11 +43,11 @@ public final class ResourcesPlugin extends OomphPlugin
    * Create the instance.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
+   * @generated NOT
    */
   public ResourcesPlugin()
   {
-    super(new ResourceLocator[] {});
+    super(new ResourceLocator[] { UtilPlugin.INSTANCE });
   }
 
   /**
diff --git a/plugins/org.eclipse.oomph.setup.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.core/META-INF/MANIFEST.MF
index 8031c62ba..fd174969d 100644
--- a/plugins/org.eclipse.oomph.setup.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.core/META-INF/MANIFEST.MF
@@ -31,10 +31,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.equinox.p2.touchpoint.natives;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.p2.updatesite;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.security;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.oomph.p2;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.p2.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.p2;bundle-version="[1.1.0,2.0.0)",
diff --git a/plugins/org.eclipse.oomph.setup.core/src/org/eclipse/oomph/setup/internal/core/SetupCorePlugin.java b/plugins/org.eclipse.oomph.setup.core/src/org/eclipse/oomph/setup/internal/core/SetupCorePlugin.java
index 01e5a5f69..74c0f5d34 100644
--- a/plugins/org.eclipse.oomph.setup.core/src/org/eclipse/oomph/setup/internal/core/SetupCorePlugin.java
+++ b/plugins/org.eclipse.oomph.setup.core/src/org/eclipse/oomph/setup/internal/core/SetupCorePlugin.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.oomph.setup.internal.core;
 
+import org.eclipse.oomph.base.provider.BaseEditPlugin;
 import org.eclipse.oomph.internal.setup.SetupProperties;
 import org.eclipse.oomph.util.OomphPlugin;
 import org.eclipse.oomph.util.PropertiesUtil;
@@ -33,7 +34,7 @@ public final class SetupCorePlugin extends OomphPlugin
 
   public SetupCorePlugin()
   {
-    super(new ResourceLocator[] {});
+    super(new ResourceLocator[] { BaseEditPlugin.INSTANCE });
   }
 
   @Override
diff --git a/plugins/org.eclipse.oomph.setup.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.edit/META-INF/MANIFEST.MF
index f1dbe79c8..1ee041a55 100644
--- a/plugins/org.eclipse.oomph.setup.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.edit/META-INF/MANIFEST.MF
@@ -12,7 +12,5 @@ Export-Package: org.eclipse.oomph.setup.provider;version="1.1.0";x-internal:=tru
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.editor/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.editor/META-INF/MANIFEST.MF
index dec7f23d1..aaab5b38c 100644
--- a/plugins/org.eclipse.oomph.setup.editor/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.editor/META-INF/MANIFEST.MF
@@ -25,7 +25,6 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.equinox.p2.metadata;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
diff --git a/plugins/org.eclipse.oomph.setup.git.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.git.edit/META-INF/MANIFEST.MF
index 3f74f17d6..250a4fc66 100644
--- a/plugins/org.eclipse.oomph.setup.git.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.git.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.git.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.git.provider.GitEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,8 +12,6 @@ Export-Package: org.eclipse.oomph.setup.git.provider;version="1.1.0";x-internal:
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.git;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.git.edit/pom.xml b/plugins/org.eclipse.oomph.setup.git.edit/pom.xml
index 3463b5092..f26e1cc84 100644
--- a/plugins/org.eclipse.oomph.setup.git.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.git.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.git.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF
index 4145ad04a..34438c4fe 100644
--- a/plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.git/META-INF/MANIFEST.MF
@@ -13,9 +13,7 @@ Export-Package: org.eclipse.oomph.setup.git;version="1.2.0";x-internal:=true,
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.egit.core;bundle-version="[3.0.0,5.0.0)",
  org.eclipse.jgit;bundle-version="[3.0.0,5.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.git/model/Git.genmodel b/plugins/org.eclipse.oomph.setup.git/model/Git.genmodel
index 0180fc7c8..cb819ffdd 100644
--- a/plugins/org.eclipse.oomph.setup.git/model/Git.genmodel
+++ b/plugins/org.eclipse.oomph.setup.git/model/Git.genmodel
@@ -2,9 +2,9 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup.git/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.setup.git" modelName="Git"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
     importOrganizing="true" decoration="Live" cleanup="true">
   <foreignModel>Git.ecore</foreignModel>
   <genPackages prefix="Git" basePackage="org.eclipse.oomph.setup" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
index 2380df516..72db99bd0 100644
--- a/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.installer/META-INF/MANIFEST.MF
@@ -21,7 +21,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.equinox.p2.metadata.repository;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.p2.console;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.p2.engine;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.p2.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.setup.p2;bundle-version="[1.1.0,2.0.0)",
diff --git a/plugins/org.eclipse.oomph.setup.jdt.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.jdt.edit/META-INF/MANIFEST.MF
index 2b9c4c269..deae36061 100644
--- a/plugins/org.eclipse.oomph.setup.jdt.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.jdt.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.jdt.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.jdt.provider.JDTEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,9 +12,6 @@ Export-Package: org.eclipse.oomph.setup.jdt.provider;version="1.1.0";x-internal:
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup.jdt;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.jdt.edit/pom.xml b/plugins/org.eclipse.oomph.setup.jdt.edit/pom.xml
index eabaa4ff4..6093ec13e 100644
--- a/plugins/org.eclipse.oomph.setup.jdt.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.jdt.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.jdt.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.jdt/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.jdt/META-INF/MANIFEST.MF
index 248645a77..5d5969763 100644
--- a/plugins/org.eclipse.oomph.setup.jdt/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.jdt/META-INF/MANIFEST.MF
@@ -2,18 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.jdt;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.setup.jdt;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.jdt.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.jdt.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.jdt;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.jdt.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.jdt.util;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.6.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.jdt/model/JDT.genmodel b/plugins/org.eclipse.oomph.setup.jdt/model/JDT.genmodel
index fca0e681e..0de5adbc9 100644
--- a/plugins/org.eclipse.oomph.setup.jdt/model/JDT.genmodel
+++ b/plugins/org.eclipse.oomph.setup.jdt/model/JDT.genmodel
@@ -2,9 +2,9 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup.jdt/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.setup.jdt" modelName="JDT"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
     importOrganizing="true" decoration="Live" cleanup="true">
   <foreignModel>JDT.ecore</foreignModel>
   <genPackages prefix="JDT" basePackage="org.eclipse.oomph.setup" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.setup.jdt/pom.xml b/plugins/org.eclipse.oomph.setup.jdt/pom.xml
index cc50f57ea..fdc3bcd98 100644
--- a/plugins/org.eclipse.oomph.setup.jdt/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.jdt/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.jdt</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.launching.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.launching.edit/META-INF/MANIFEST.MF
index 1963ee6a6..a6c379f57 100644
--- a/plugins/org.eclipse.oomph.setup.launching.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.launching.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.launching.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.launching.provider.LaunchingEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,9 +12,6 @@ Export-Package: org.eclipse.oomph.setup.launching.provider;version="1.1.0";x-int
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup.launching;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.launching.edit/pom.xml b/plugins/org.eclipse.oomph.setup.launching.edit/pom.xml
index 5eac01b50..ed1a39cb8 100644
--- a/plugins/org.eclipse.oomph.setup.launching.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.launching.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.launching.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.launching/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.launching/META-INF/MANIFEST.MF
index a3b1b785a..61be0ee45 100644
--- a/plugins/org.eclipse.oomph.setup.launching/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.launching/META-INF/MANIFEST.MF
@@ -2,19 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.launching;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.setup.launching;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.launching.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.launching.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.launching;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.launching.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.launching.util;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.debug.core;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.oomph.setup.launching.LaunchingPlugin$Implementation
diff --git a/plugins/org.eclipse.oomph.setup.launching/model/Launching.genmodel b/plugins/org.eclipse.oomph.setup.launching/model/Launching.genmodel
index da96d959c..74e1b2958 100644
--- a/plugins/org.eclipse.oomph.setup.launching/model/Launching.genmodel
+++ b/plugins/org.eclipse.oomph.setup.launching/model/Launching.genmodel
@@ -2,9 +2,9 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup.launching/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.setup.launching" modelName="Launching"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
     importOrganizing="true" decoration="Live" cleanup="true">
   <foreignModel>Launching.ecore</foreignModel>
   <genPackages prefix="Launching" basePackage="org.eclipse.oomph.setup" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.setup.launching/pom.xml b/plugins/org.eclipse.oomph.setup.launching/pom.xml
index 3c3fb6018..c74b7469b 100644
--- a/plugins/org.eclipse.oomph.setup.launching/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.launching/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.launching</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.maven.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.maven.edit/META-INF/MANIFEST.MF
index 45b26e202..74863fb23 100644
--- a/plugins/org.eclipse.oomph.setup.maven.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.maven.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.maven.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.maven.provider.MavenEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,13 +12,8 @@ Export-Package: org.eclipse.oomph.setup.maven.provider;version="1.1.0";x-interna
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup.maven;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.predicates.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.resources.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.maven.edit/pom.xml b/plugins/org.eclipse.oomph.setup.maven.edit/pom.xml
index eeb625ba1..6f87b2adf 100644
--- a/plugins/org.eclipse.oomph.setup.maven.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.maven.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.maven.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.maven/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.maven/META-INF/MANIFEST.MF
index 9e2a09bed..2bc425c86 100644
--- a/plugins/org.eclipse.oomph.setup.maven/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.maven/META-INF/MANIFEST.MF
@@ -2,20 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.maven;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.setup.maven;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.maven.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.maven.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.maven;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.maven.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.maven.util;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.m2e.core;bundle-version="[1.5.0,2.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.m2e.core;bundle-version="[1.5.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.maven/model/Maven.genmodel b/plugins/org.eclipse.oomph.setup.maven/model/Maven.genmodel
index 0fe7beb88..fbfd82bbe 100644
--- a/plugins/org.eclipse.oomph.setup.maven/model/Maven.genmodel
+++ b/plugins/org.eclipse.oomph.setup.maven/model/Maven.genmodel
@@ -2,9 +2,9 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup.maven/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.setup.maven" modelName="Maven"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.resources/model/Resources.genmodel#//resources ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.resources/model/Resources.genmodel#//resources ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
     importOrganizing="true" decoration="Live" cleanup="true">
   <foreignModel>Maven.ecore</foreignModel>
   <genPackages prefix="Maven" basePackage="org.eclipse.oomph.setup" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.setup.maven/pom.xml b/plugins/org.eclipse.oomph.setup.maven/pom.xml
index e4a78664e..1c8c80c10 100644
--- a/plugins/org.eclipse.oomph.setup.maven/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.maven/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.maven</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.mylyn.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.mylyn.edit/META-INF/MANIFEST.MF
index d841a6f8d..ac312fc00 100644
--- a/plugins/org.eclipse.oomph.setup.mylyn.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.mylyn.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.mylyn.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.mylyn.provider.MylynEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,9 +12,6 @@ Export-Package: org.eclipse.oomph.setup.mylyn.provider;version="1.1.0";x-interna
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup.mylyn;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.mylyn.edit/pom.xml b/plugins/org.eclipse.oomph.setup.mylyn.edit/pom.xml
index 44b50d1a9..d176a9d2d 100644
--- a/plugins/org.eclipse.oomph.setup.mylyn.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.mylyn.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.mylyn.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.mylyn/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.mylyn/META-INF/MANIFEST.MF
index f9641f35a..be6fd10eb 100644
--- a/plugins/org.eclipse.oomph.setup.mylyn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.mylyn/META-INF/MANIFEST.MF
@@ -2,21 +2,19 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.mylyn;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.setup.mylyn;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.mylyn.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.mylyn.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.mylyn;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.mylyn.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.mylyn.util;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.preferences;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.mylyn.builds.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.mylyn.builds.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.mylyn.commons.net;bundle-version="[3.0.0,4.0.0)",
diff --git a/plugins/org.eclipse.oomph.setup.mylyn/model/Mylyn.genmodel b/plugins/org.eclipse.oomph.setup.mylyn/model/Mylyn.genmodel
index 0290b08c4..048e18e1e 100644
--- a/plugins/org.eclipse.oomph.setup.mylyn/model/Mylyn.genmodel
+++ b/plugins/org.eclipse.oomph.setup.mylyn/model/Mylyn.genmodel
@@ -2,9 +2,9 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup.mylyn/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.setup.mylyn" modelName="Mylyn"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
     importOrganizing="true" decoration="Live" cleanup="true">
   <foreignModel>Mylyn.ecore</foreignModel>
   <genPackages prefix="Mylyn" basePackage="org.eclipse.oomph.setup" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.setup.mylyn/pom.xml b/plugins/org.eclipse.oomph.setup.mylyn/pom.xml
index 958c51179..02fce0908 100644
--- a/plugins/org.eclipse.oomph.setup.mylyn/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.mylyn/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.mylyn</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.p2.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.p2.edit/META-INF/MANIFEST.MF
index be6dd6fb2..f3131563e 100644
--- a/plugins/org.eclipse.oomph.setup.p2.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.p2.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.p2.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.p2.provider.SetupP2EditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,11 +12,7 @@ Export-Package: org.eclipse.oomph.setup.p2.provider;version="1.1.0";x-internal:=
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup.p2;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.p2;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.p2.edit/pom.xml b/plugins/org.eclipse.oomph.setup.p2.edit/pom.xml
index 17bdee801..631653dc8 100644
--- a/plugins/org.eclipse.oomph.setup.p2.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.p2.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.p2.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.p2/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.p2/META-INF/MANIFEST.MF
index d4e4efca6..574b3c99f 100644
--- a/plugins/org.eclipse.oomph.setup.p2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.p2/META-INF/MANIFEST.MF
@@ -14,11 +14,8 @@ Export-Package: org.eclipse.oomph.setup.internal.p2;version="1.2.0";x-internal:=
  org.eclipse.oomph.setup.p2.util;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.p2;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2.core;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.equinox.p2.artifact.repository;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.p2.console;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.p2.core;bundle-version="[2.0.0,3.0.0)",
diff --git a/plugins/org.eclipse.oomph.setup.p2/model/SetupP2.genmodel b/plugins/org.eclipse.oomph.setup.p2/model/SetupP2.genmodel
index 218e1b8f5..2f8716166 100644
--- a/plugins/org.eclipse.oomph.setup.p2/model/SetupP2.genmodel
+++ b/plugins/org.eclipse.oomph.setup.p2/model/SetupP2.genmodel
@@ -2,9 +2,10 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup.p2/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.setup.p2" modelName="SetupP2"
-    modelPluginClass="org.eclipse.oomph.setup.internal.p2.SetupP2Plugin" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.p2/model/P2.genmodel#//p2 ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
+    modelPluginClass="org.eclipse.oomph.setup.internal.p2.SetupP2Plugin" updateClasspath="false"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.p2/model/P2.genmodel#//p2 ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
     importOrganizing="true" decoration="Live" cleanup="true">
   <foreignModel>SetupP2.ecore</foreignModel>
   <genPackages prefix="SetupP2" basePackage="org.eclipse.oomph.setup" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.setup.pde.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.pde.edit/META-INF/MANIFEST.MF
index 7aa49f957..c703d916d 100644
--- a/plugins/org.eclipse.oomph.setup.pde.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.pde.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.pde.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.pde.provider.PDEEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,8 +12,6 @@ Export-Package: org.eclipse.oomph.setup.pde.provider;version="1.1.0";x-internal:
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup.pde;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.pde.edit/pom.xml b/plugins/org.eclipse.oomph.setup.pde.edit/pom.xml
index d3e698e65..936b6ec5c 100644
--- a/plugins/org.eclipse.oomph.setup.pde.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.pde.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.pde.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF
index bf271f306..97f5f757e 100644
--- a/plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.pde/META-INF/MANIFEST.MF
@@ -2,22 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.pde;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.internal.setup.pde.PDEPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.oomph.internal.setup.pde;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.pde;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.pde.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.pde.util;version="1.1.0";x-internal:=true
+ org.eclipse.oomph.setup.pde;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.pde.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.pde.util;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.util.pde;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.pde.api.tools;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)"
diff --git a/plugins/org.eclipse.oomph.setup.pde/model/PDE.genmodel b/plugins/org.eclipse.oomph.setup.pde/model/PDE.genmodel
index 996bf3d5d..0bc3a8def 100644
--- a/plugins/org.eclipse.oomph.setup.pde/model/PDE.genmodel
+++ b/plugins/org.eclipse.oomph.setup.pde/model/PDE.genmodel
@@ -2,9 +2,10 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup.pde/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.setup.pde" modelName="PDE"
-    modelPluginClass="org.eclipse.oomph.internal.setup.pde.PDEPlugin" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
+    modelPluginClass="org.eclipse.oomph.internal.setup.pde.PDEPlugin" updateClasspath="false"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
     importOrganizing="true" decoration="Live" cleanup="true">
   <foreignModel>PDE.ecore</foreignModel>
   <genPackages prefix="PDE" basePackage="org.eclipse.oomph.setup" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.setup.pde/pom.xml b/plugins/org.eclipse.oomph.setup.pde/pom.xml
index f738b8a9b..945889e91 100644
--- a/plugins/org.eclipse.oomph.setup.pde/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.pde/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.pde</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.projects.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.projects.edit/META-INF/MANIFEST.MF
index f6119d9c0..0b81a3448 100644
--- a/plugins/org.eclipse.oomph.setup.projects.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.projects.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.projects.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.projects.provider.ProjectsEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,13 +12,8 @@ Export-Package: org.eclipse.oomph.setup.projects.provider;version="1.1.0";x-inte
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup.projects;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.predicates.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.resources.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.projects.edit/pom.xml b/plugins/org.eclipse.oomph.setup.projects.edit/pom.xml
index c1f6689d4..7ee7f5ccb 100644
--- a/plugins/org.eclipse.oomph.setup.projects.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.projects.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.projects.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.projects/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.projects/META-INF/MANIFEST.MF
index 52671d17a..5c6d58c4c 100644
--- a/plugins/org.eclipse.oomph.setup.projects/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.projects/META-INF/MANIFEST.MF
@@ -2,21 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.projects;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.setup.projects;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.projects.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.projects.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.projects;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.projects.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.projects.util;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.setup.core;bundle-version="[1.1.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.oomph.setup.projects.ProjectsPlugin$Implementation
diff --git a/plugins/org.eclipse.oomph.setup.projects/model/Projects.genmodel b/plugins/org.eclipse.oomph.setup.projects/model/Projects.genmodel
index 1c7da796e..e106e86a3 100644
--- a/plugins/org.eclipse.oomph.setup.projects/model/Projects.genmodel
+++ b/plugins/org.eclipse.oomph.setup.projects/model/Projects.genmodel
@@ -2,9 +2,9 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup.projects/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.setup.projects" modelName="Projects"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.resources/model/Resources.genmodel#//resources ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.resources/model/Resources.genmodel#//resources ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
     importOrganizing="true" decoration="Live" cleanup="true">
   <foreignModel>Projects.ecore</foreignModel>
   <genPackages prefix="Projects" basePackage="org.eclipse.oomph.setup" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.setup.projects/pom.xml b/plugins/org.eclipse.oomph.setup.projects/pom.xml
index ffe0d61fd..51ca4b572 100644
--- a/plugins/org.eclipse.oomph.setup.projects/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.projects/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.projects</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.projectset.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.projectset.edit/META-INF/MANIFEST.MF
index b7a3c870f..8ad22c9b5 100644
--- a/plugins/org.eclipse.oomph.setup.projectset.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.projectset.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.projectset.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.projectset.provider.ProjectSetEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,9 +12,6 @@ Export-Package: org.eclipse.oomph.setup.projectset.provider;version="1.1.0";x-in
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup.projectset;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.projectset.edit/pom.xml b/plugins/org.eclipse.oomph.setup.projectset.edit/pom.xml
index f2ecda9ae..8e1a7670a 100644
--- a/plugins/org.eclipse.oomph.setup.projectset.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.projectset.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.projectset.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.projectset/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.projectset/META-INF/MANIFEST.MF
index 38e559a1c..22a1ad74f 100644
--- a/plugins/org.eclipse.oomph.setup.projectset/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.projectset/META-INF/MANIFEST.MF
@@ -2,20 +2,18 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.projectset;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.setup.projectset;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.projectset.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.projectset.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.projectset;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.projectset.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.projectset.util;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.jface;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.team.ui;bundle-version="[3.5.0,4.0.0)"
diff --git a/plugins/org.eclipse.oomph.setup.projectset/model/ProjectSet.genmodel b/plugins/org.eclipse.oomph.setup.projectset/model/ProjectSet.genmodel
index 347f21297..fa94251b4 100644
--- a/plugins/org.eclipse.oomph.setup.projectset/model/ProjectSet.genmodel
+++ b/plugins/org.eclipse.oomph.setup.projectset/model/ProjectSet.genmodel
@@ -2,9 +2,9 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup.projectset/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.setup.projectset" modelName="ProjectSet"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
     importOrganizing="true" decoration="Live" cleanup="true">
   <foreignModel>ProjectSet.ecore</foreignModel>
   <genPackages prefix="ProjectSet" basePackage="org.eclipse.oomph.setup" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.setup.projectset/pom.xml b/plugins/org.eclipse.oomph.setup.projectset/pom.xml
index 57b8dac5d..42f74b409 100644
--- a/plugins/org.eclipse.oomph.setup.projectset/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.projectset/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.projectset</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.targlets.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.targlets.edit/META-INF/MANIFEST.MF
index a41e414c6..edf7fcc0f 100644
--- a/plugins/org.eclipse.oomph.setup.targlets.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.targlets.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.targlets.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.targlets.provider.SetupTargletsEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,18 +12,11 @@ Export-Package: org.eclipse.oomph.setup.targlets.provider;version="1.1.0";x-inte
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup.targlets;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.p2;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.predicates.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.resources.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.targlets;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.targlets;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.targlets.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.targlets.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.targlets.edit/pom.xml b/plugins/org.eclipse.oomph.setup.targlets.edit/pom.xml
index c65d26fcd..7df00cb65 100644
--- a/plugins/org.eclipse.oomph.setup.targlets.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.targlets.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.targlets.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.targlets/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.targlets/META-INF/MANIFEST.MF
index 9f2dd6c7e..100c0e86f 100644
--- a/plugins/org.eclipse.oomph.setup.targlets/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.targlets/META-INF/MANIFEST.MF
@@ -2,26 +2,23 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.targlets;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.internal.targlets.SetupTargletsPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.setup.internal.targlets;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.targlets;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.targlets.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.targlets.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.internal.targlets;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.targlets;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.targlets.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.targlets.util;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.targlets;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.targlets.core;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.util.pde;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.targlets/model/SetupTarglets.genmodel b/plugins/org.eclipse.oomph.setup.targlets/model/SetupTarglets.genmodel
index 7b2b62730..4ea026b0b 100644
--- a/plugins/org.eclipse.oomph.setup.targlets/model/SetupTarglets.genmodel
+++ b/plugins/org.eclipse.oomph.setup.targlets/model/SetupTarglets.genmodel
@@ -3,9 +3,9 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup.targlets/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.setup.targlets" modelName="SetupTarglets"
     modelPluginClass="org.eclipse.oomph.setup.internal.targlets.SetupTargletsPlugin"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.p2/model/P2.genmodel#//p2 ../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.resources/model/Resources.genmodel#//resources ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup ../../org.eclipse.oomph.targlets/model/Targlets.genmodel#//targlets"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.p2/model/P2.genmodel#//p2 ../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.resources/model/Resources.genmodel#//resources ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup ../../org.eclipse.oomph.targlets/model/Targlets.genmodel#//targlets"
     importOrganizing="true" decoration="Live" cleanup="true">
   <foreignModel>SetupTarglets.ecore</foreignModel>
   <genPackages prefix="SetupTarglets" basePackage="org.eclipse.oomph.setup" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.setup.targlets/pom.xml b/plugins/org.eclipse.oomph.setup.targlets/pom.xml
index 5e12cebb6..a62f19c9d 100644
--- a/plugins/org.eclipse.oomph.setup.targlets/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.targlets/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.targlets</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.tests/META-INF/MANIFEST.MF
index 439c43ba7..1f8bc88b9 100644
--- a/plugins/org.eclipse.oomph.setup.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.tests/META-INF/MANIFEST.MF
@@ -23,5 +23,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.p2.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.setup.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.setup.p2;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.tests;bundle-version="[1.1.0,2.0.0)"
diff --git a/plugins/org.eclipse.oomph.setup.ui.ide/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.ui.ide/META-INF/MANIFEST.MF
index 81152a70f..4de5cf7b1 100644
--- a/plugins/org.eclipse.oomph.setup.ui.ide/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.ui.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.ui.ide;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.ui.internal.ide.SetupUIIDEPlugin$Implementation
 Bundle-ActivationPolicy: lazy
@@ -20,9 +20,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.oomph.setup.ui.internal.ide;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.ui.internal.ide;version="1.2.0";x-internal:=true
diff --git a/plugins/org.eclipse.oomph.setup.ui.ide/pom.xml b/plugins/org.eclipse.oomph.setup.ui.ide/pom.xml
index 5ff0cb89e..3c061cfbe 100644
--- a/plugins/org.eclipse.oomph.setup.ui.ide/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.ui.ide/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.ui.ide</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.ui.questionnaire/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.ui.questionnaire/META-INF/MANIFEST.MF
index 38c86da52..deb6e4df8 100644
--- a/plugins/org.eclipse.oomph.setup.ui.questionnaire/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.ui.questionnaire/META-INF/MANIFEST.MF
@@ -2,17 +2,16 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.ui.questionnaire;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.ui.questionnaire.QuestionnairePlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.setup.ui.questionnaire;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.ui.questionnaire;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.oomph.preferences;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.setup.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.ui;bundle-version="[1.1.0,2.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.ui.questionnaire/pom.xml b/plugins/org.eclipse.oomph.setup.ui.questionnaire/pom.xml
index a0b84407f..5f04720ed 100644
--- a/plugins/org.eclipse.oomph.setup.ui.questionnaire/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.ui.questionnaire/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.ui.questionnaire</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.ui/META-INF/MANIFEST.MF
index c5d14f6db..605d8dbb0 100644
--- a/plugins/org.eclipse.oomph.setup.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.ui/META-INF/MANIFEST.MF
@@ -24,9 +24,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.core;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.p2.ui;bundle-version="[1.1.0,2.0.0)",
diff --git a/plugins/org.eclipse.oomph.setup.workbench.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.workbench.edit/META-INF/MANIFEST.MF
index 1101a63ea..fba51d839 100644
--- a/plugins/org.eclipse.oomph.setup.workbench.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.workbench.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.workbench.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.workbench.provider.WorkbenchEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,9 +12,6 @@ Export-Package: org.eclipse.oomph.setup.workbench.provider;version="1.1.0";x-int
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup.workbench;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.workbench.edit/pom.xml b/plugins/org.eclipse.oomph.setup.workbench.edit/pom.xml
index 2375ae472..02ba90114 100644
--- a/plugins/org.eclipse.oomph.setup.workbench.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.workbench.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.workbench.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.workbench/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.workbench/META-INF/MANIFEST.MF
index e450a96e3..e0fdb3956 100644
--- a/plugins/org.eclipse.oomph.setup.workbench/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.workbench/META-INF/MANIFEST.MF
@@ -2,19 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.workbench;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.setup.workbench;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.workbench.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.workbench.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.workbench;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.workbench.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.workbench.util;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.ui.workbench;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.commands;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.jface;bundle-version="[3.0.0,4.0.0)"
diff --git a/plugins/org.eclipse.oomph.setup.workbench/model/Workbench.genmodel b/plugins/org.eclipse.oomph.setup.workbench/model/Workbench.genmodel
index 815f2e368..faf9f3bb8 100644
--- a/plugins/org.eclipse.oomph.setup.workbench/model/Workbench.genmodel
+++ b/plugins/org.eclipse.oomph.setup.workbench/model/Workbench.genmodel
@@ -2,9 +2,9 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup.workbench/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.setup.workbench" modelName="Workbench"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup"
     importOrganizing="true" decoration="Live" cleanup="true">
   <foreignModel>Workbench.ecore</foreignModel>
   <genPackages prefix="Workbench" basePackage="org.eclipse.oomph.setup" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.setup.workbench/pom.xml b/plugins/org.eclipse.oomph.setup.workbench/pom.xml
index 7fbf8892c..50e0579fb 100644
--- a/plugins/org.eclipse.oomph.setup.workbench/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.workbench/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.workbench</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.workingsets.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.workingsets.edit/META-INF/MANIFEST.MF
index 1c0288fc2..d9c6d6adf 100644
--- a/plugins/org.eclipse.oomph.setup.workingsets.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.workingsets.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.workingsets.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.setup.workingsets.provider.SetupWorkingSetsEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,12 +12,8 @@ Export-Package: org.eclipse.oomph.setup.workingsets.provider;version="1.1.0";x-i
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.setup.workingsets;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.predicates.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.workingsets;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.workingsets.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.workingsets.edit/pom.xml b/plugins/org.eclipse.oomph.setup.workingsets.edit/pom.xml
index ac880a671..7d2366f20 100644
--- a/plugins/org.eclipse.oomph.setup.workingsets.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.workingsets.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.workingsets.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup.workingsets/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup.workingsets/META-INF/MANIFEST.MF
index 87b5f48bc..16eb6fe0a 100644
--- a/plugins/org.eclipse.oomph.setup.workingsets/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup.workingsets/META-INF/MANIFEST.MF
@@ -2,19 +2,17 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.setup.workingsets;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.oomph.setup.workingsets;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.workingsets.impl;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.setup.workingsets.util;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.setup.workingsets;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.workingsets.impl;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.setup.workingsets.util;version="1.2.0";x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.setup;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.workingsets;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.workingsets;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.setup.workingsets/model/SetupWorkingSets.genmodel b/plugins/org.eclipse.oomph.setup.workingsets/model/SetupWorkingSets.genmodel
index 78a0e71a4..ee93d0f51 100644
--- a/plugins/org.eclipse.oomph.setup.workingsets/model/SetupWorkingSets.genmodel
+++ b/plugins/org.eclipse.oomph.setup.workingsets/model/SetupWorkingSets.genmodel
@@ -2,9 +2,9 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup.workingsets/src" creationIcons="false"
     editorDirectory="" modelPluginID="org.eclipse.oomph.setup.workingsets" modelName="SetupWorkingSets"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup ../../org.eclipse.oomph.workingsets/model/WorkingSets.genmodel#//workingsets"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.setup/model/Setup.genmodel#//setup ../../org.eclipse.oomph.workingsets/model/WorkingSets.genmodel#//workingsets"
     importOrganizing="true" decoration="Live" cleanup="true">
   <foreignModel>SetupWorkingSets.ecore</foreignModel>
   <genPackages prefix="SetupWorkingSets" basePackage="org.eclipse.oomph.setup" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.setup.workingsets/pom.xml b/plugins/org.eclipse.oomph.setup.workingsets/pom.xml
index 3ecc7cceb..b4418078b 100644
--- a/plugins/org.eclipse.oomph.setup.workingsets/pom.xml
+++ b/plugins/org.eclipse.oomph.setup.workingsets/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.setup.workingsets</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.setup/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.setup/META-INF/MANIFEST.MF
index 51788ca60..21a9f31af 100644
--- a/plugins/org.eclipse.oomph.setup/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.setup/META-INF/MANIFEST.MF
@@ -13,8 +13,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.oomph.internal.setup;version="1.2.0";x-internal:=true,
diff --git a/plugins/org.eclipse.oomph.setup/Setup (Installer Dialog).launch b/plugins/org.eclipse.oomph.setup/Setup (Installer Dialog).launch
index 9194da7c0..3978da53a 100644
--- a/plugins/org.eclipse.oomph.setup/Setup (Installer Dialog).launch
+++ b/plugins/org.eclipse.oomph.setup/Setup (Installer Dialog).launch
@@ -51,7 +51,7 @@
 <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
 <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms1024m -Xmx2500m -XX:MaxPermSize=512m&#13;&#10;-Declipse.p2.max.threads=10&#13;&#10;-Doomph.setup.remote.debug=false&#13;&#10;-Doomph.update.url=${file_uri:${resource_loc:/org.eclipse.oomph.site}}/target/repository/&#13;&#10;-Doomph.redirection.setups=http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/-&gt;${file_uri:${resource_loc:/setups}}/&#13;&#10;-Dorg.eclipse.swtbot.generator.enable=false"/>
+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms1024m -Xmx2500m -XX:MaxPermSize=512m&#13;&#10;-Declipse.p2.max.threads=10&#13;&#10;-Doomph.update.url=${file_uri:${resource_loc:/org.eclipse.oomph.site}}/target/repository/&#13;&#10;-Doomph.redirection.setups=http://git.eclipse.org/c/oomph/org.eclipse.oomph.git/plain/setups/-&gt;${file_uri:${resource_loc:/setups}}/&#13;&#10;-Doomph.setup.remote.debug=false&#13;&#10;-Dorg.eclipse.swtbot.generator.enable=false"/>
 <stringAttribute key="pde.version" value="3.3"/>
 <stringAttribute key="product" value="org.eclipse.oomph.setup.installer.product"/>
 <setAttribute key="selected_features">
diff --git a/plugins/org.eclipse.oomph.setup/model/Setup.genmodel b/plugins/org.eclipse.oomph.setup/model/Setup.genmodel
index b2479c396..c41a81b74 100644
--- a/plugins/org.eclipse.oomph.setup/model/Setup.genmodel
+++ b/plugins/org.eclipse.oomph.setup/model/Setup.genmodel
@@ -2,9 +2,9 @@
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.setup/src" creationIcons="false"
     modelPluginID="org.eclipse.oomph.setup" modelName="Setup" modelPluginClass="org.eclipse.oomph.internal.setup.SetupPlugin"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" containmentProxies="true" complianceLevel="5.0"
-    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" containmentProxies="true"
+    complianceLevel="5.0" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base"
     decoration="Live" cleanup="true">
   <foreignModel>Setup.ecore</foreignModel>
   <genPackages prefix="Setup" basePackage="org.eclipse.oomph" disposableProviderFactory="true"
@@ -166,6 +166,7 @@
     </genClasses>
     <genClasses ecoreClass="Setup.ecore#//InstallationTask" labelFeature="#//setup/InstallationTask/location">
       <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Setup.ecore#//InstallationTask/location"/>
+      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute Setup.ecore#//InstallationTask/relativeProductFolder"/>
     </genClasses>
     <genClasses ecoreClass="Setup.ecore#//Workspace">
       <genFeatures createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference Setup.ecore#//Workspace/streams"/>
diff --git a/plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/internal/setup/SetupPlugin.java b/plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/internal/setup/SetupPlugin.java
index b3a47c5c8..4946608c9 100644
--- a/plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/internal/setup/SetupPlugin.java
+++ b/plugins/org.eclipse.oomph.setup/src/org/eclipse/oomph/internal/setup/SetupPlugin.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.oomph.internal.setup;
 
+import org.eclipse.oomph.internal.base.BasePlugin;
 import org.eclipse.oomph.util.OomphPlugin;
 
 import org.eclipse.emf.common.util.ResourceLocator;
@@ -42,11 +43,11 @@ public final class SetupPlugin extends OomphPlugin
    * Create the instance.
    * <!-- begin-user-doc -->
    * <!-- end-user-doc -->
-   * @generated
+   * @generated NOT
    */
   public SetupPlugin()
   {
-    super(new ResourceLocator[] {});
+    super(new ResourceLocator[] { BasePlugin.INSTANCE });
   }
 
   /**
diff --git a/plugins/org.eclipse.oomph.targlets.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.targlets.core/META-INF/MANIFEST.MF
index b909506c6..dda8459a7 100644
--- a/plugins/org.eclipse.oomph.targlets.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.targlets.core/META-INF/MANIFEST.MF
@@ -29,8 +29,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.targlets;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2.core;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util.pde;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.util.pde;bundle-version="[1.1.0,2.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.oomph.targlets.core;version="1.2.0";x-internal:=true,
diff --git a/plugins/org.eclipse.oomph.targlets.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.targlets.edit/META-INF/MANIFEST.MF
index 4ebd3444d..fb16e16c0 100644
--- a/plugins/org.eclipse.oomph.targlets.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.targlets.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.targlets.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.targlets.provider.TargletEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,12 +12,8 @@ Export-Package: org.eclipse.oomph.targlets.provider;version="1.1.0";x-internal:=
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.targlets;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.p2;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.predicates.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.resources.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.targlets.edit/pom.xml b/plugins/org.eclipse.oomph.targlets.edit/pom.xml
index d7459d9ab..5a39e0ab5 100644
--- a/plugins/org.eclipse.oomph.targlets.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.targlets.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.targlets.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.targlets.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.targlets.ui/META-INF/MANIFEST.MF
index 75147707a..77ab3279d 100644
--- a/plugins/org.eclipse.oomph.targlets.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.targlets.ui/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.targlets.ui;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
@@ -24,7 +24,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.equinox.p2.repository.tools;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0)",
  org.eclipse.equinox.p2.updatesite;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.pde.ui;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.targlets.core;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
@@ -38,5 +37,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.oomph.targlets.internal.ui;version="1.1.0";x-internal:=true
+Export-Package: org.eclipse.oomph.targlets.internal.ui;version="1.2.0";x-internal:=true
 Bundle-Activator: org.eclipse.oomph.targlets.internal.ui.TargletsUIPlugin$Implementation
diff --git a/plugins/org.eclipse.oomph.targlets.ui/pom.xml b/plugins/org.eclipse.oomph.targlets.ui/pom.xml
index cb334ae00..cb7ba1a20 100644
--- a/plugins/org.eclipse.oomph.targlets.ui/pom.xml
+++ b/plugins/org.eclipse.oomph.targlets.ui/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.targlets.ui</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.targlets/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.targlets/META-INF/MANIFEST.MF
index 2c2c9769f..c55324d85 100644
--- a/plugins/org.eclipse.oomph.targlets/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.targlets/META-INF/MANIFEST.MF
@@ -12,13 +12,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.equinox.p2.publisher.eclipse;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.p2.publisher;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.p2.repository;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.p2;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy
-Export-Package: org.eclipse.oomph.targlets;version="1.2.0";x-internal:=true,
+Export-Package: org.eclipse.oomph.internal.targlets;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.targlets;version="1.2.0";x-internal:=true,
  org.eclipse.oomph.targlets.impl;version="1.2.0";x-internal:=true,
  org.eclipse.oomph.targlets.util;version="1.2.0";x-internal:=true
diff --git a/plugins/org.eclipse.oomph.targlets/model/Targlets.genmodel b/plugins/org.eclipse.oomph.targlets/model/Targlets.genmodel
index 2647f9217..06809b474 100644
--- a/plugins/org.eclipse.oomph.targlets/model/Targlets.genmodel
+++ b/plugins/org.eclipse.oomph.targlets/model/Targlets.genmodel
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.targlets/src" creationIcons="false"
-    modelPluginID="org.eclipse.oomph.targlets" modelName="Targlet" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
-    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
-    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.p2/model/P2.genmodel#//p2 ../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.resources/model/Resources.genmodel#//resources"
+    modelPluginID="org.eclipse.oomph.targlets" modelName="Targlet" updateClasspath="false"
+    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
+    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
+    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.base/model/Base.genmodel#//base ../../org.eclipse.oomph.p2/model/P2.genmodel#//p2 ../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.resources/model/Resources.genmodel#//resources"
     operationReflection="true" decoration="Live" cleanup="true">
   <foreignModel>Targlets.ecore</foreignModel>
   <genPackages prefix="Targlet" basePackage="org.eclipse.oomph" disposableProviderFactory="true"
diff --git a/plugins/org.eclipse.oomph.targlets/src/org/eclipse/oomph/internal/targlets/TargletsPlugin.java b/plugins/org.eclipse.oomph.targlets/src/org/eclipse/oomph/internal/targlets/TargletsPlugin.java
new file mode 100644
index 000000000..f67b5fc5d
--- /dev/null
+++ b/plugins/org.eclipse.oomph.targlets/src/org/eclipse/oomph/internal/targlets/TargletsPlugin.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2014, 2015 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.oomph.internal.targlets;
+
+import org.eclipse.oomph.internal.predicates.PredicatesPlugin;
+import org.eclipse.oomph.internal.resources.ResourcesPlugin;
+import org.eclipse.oomph.util.OomphPlugin;
+
+import org.eclipse.emf.common.util.ResourceLocator;
+
+/**
+ * @author Eike Stepper
+ */
+public final class TargletsPlugin extends OomphPlugin
+{
+  public static final TargletsPlugin INSTANCE = new TargletsPlugin();
+
+  private static Implementation plugin;
+
+  public TargletsPlugin()
+  {
+    super(new ResourceLocator[] { PredicatesPlugin.INSTANCE, ResourcesPlugin.INSTANCE });
+  }
+
+  @Override
+  public ResourceLocator getPluginResourceLocator()
+  {
+    return plugin;
+  }
+
+  /**
+   * @author Eike Stepper
+   */
+  public static class Implementation extends EclipsePlugin
+  {
+    public Implementation()
+    {
+      plugin = this;
+    }
+  }
+}
diff --git a/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF
index 735d25f90..83323f839 100644
--- a/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.ui/META-INF/MANIFEST.MF
@@ -15,8 +15,7 @@ Require-Bundle: org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.core.filebuffers;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.jface.text;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
+ org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit.ui;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.10.0,3.0.0)",
  org.eclipse.swtbot.generator;bundle-version="[2.0.0,3.0.0)";resolution:=optional
diff --git a/plugins/org.eclipse.oomph.ui/src/org/eclipse/oomph/internal/ui/UIPlugin.java b/plugins/org.eclipse.oomph.ui/src/org/eclipse/oomph/internal/ui/UIPlugin.java
index e30d42602..5ff15ce1b 100644
--- a/plugins/org.eclipse.oomph.ui/src/org/eclipse/oomph/internal/ui/UIPlugin.java
+++ b/plugins/org.eclipse.oomph.ui/src/org/eclipse/oomph/internal/ui/UIPlugin.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.oomph.internal.ui;
 
+import org.eclipse.oomph.base.provider.BaseEditPlugin;
 import org.eclipse.oomph.internal.util.UtilPlugin;
 import org.eclipse.oomph.ui.OomphUIPlugin;
 import org.eclipse.oomph.ui.ToggleCommandHandler;
@@ -56,7 +57,7 @@ public final class UIPlugin extends OomphUIPlugin
 
   public UIPlugin()
   {
-    super(new ResourceLocator[] {});
+    super(new ResourceLocator[] { BaseEditPlugin.INSTANCE });
   }
 
   @Override
diff --git a/plugins/org.eclipse.oomph.util.doc/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.util.doc/META-INF/MANIFEST.MF
index a235f81ba..5fb8d39f5 100644
--- a/plugins/org.eclipse.oomph.util.doc/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.util.doc/META-INF/MANIFEST.MF
@@ -9,12 +9,9 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.help;bundle-version="[3.3.0,4.0.0)";resolution:=optional,
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.oomph.util.pde;bundle-version="[1.1.0,2.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.oomph.ui;bundle-version="[1.1.0,2.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.oomph.predicates.edit;bundle-version="[1.1.0,2.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.oomph.resources.edit;bundle-version="[1.1.0,2.0.0)";resolution:=optional;visibility:=reexport
diff --git a/plugins/org.eclipse.oomph.util.pde/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.util.pde/META-INF/MANIFEST.MF
index 713df97c5..bfe13979c 100644
--- a/plugins/org.eclipse.oomph.util.pde/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.util.pde/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.util.pde;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,9 +12,9 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.variables;bundle-version="[3.0.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)"
-Export-Package: org.eclipse.oomph.util.internal.pde;version="1.1.0";x-internal:=true,
- org.eclipse.oomph.util.pde;version="1.1.0"
+ org.eclipse.equinox.frameworkadmin;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
+Export-Package: org.eclipse.oomph.util.internal.pde;version="1.2.0";x-internal:=true,
+ org.eclipse.oomph.util.pde;version="1.2.0"
 Eclipse-BuddyPolicy: dependent
diff --git a/plugins/org.eclipse.oomph.util.pde/pom.xml b/plugins/org.eclipse.oomph.util.pde/pom.xml
index 6692ec734..6be9b312e 100644
--- a/plugins/org.eclipse.oomph.util.pde/pom.xml
+++ b/plugins/org.eclipse.oomph.util.pde/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.util.pde</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.util.pde/src/org/eclipse/oomph/util/internal/pde/UtilPDEPlugin.java b/plugins/org.eclipse.oomph.util.pde/src/org/eclipse/oomph/util/internal/pde/UtilPDEPlugin.java
index 2094ac06a..f17f989a7 100644
--- a/plugins/org.eclipse.oomph.util.pde/src/org/eclipse/oomph/util/internal/pde/UtilPDEPlugin.java
+++ b/plugins/org.eclipse.oomph.util.pde/src/org/eclipse/oomph/util/internal/pde/UtilPDEPlugin.java
@@ -10,6 +10,7 @@
  */
 package org.eclipse.oomph.util.internal.pde;
 
+import org.eclipse.oomph.internal.util.UtilPlugin;
 import org.eclipse.oomph.util.OomphPlugin;
 
 import org.eclipse.emf.common.util.ResourceLocator;
@@ -25,7 +26,7 @@ public final class UtilPDEPlugin extends OomphPlugin
 
   public UtilPDEPlugin()
   {
-    super(new ResourceLocator[] {});
+    super(new ResourceLocator[] { UtilPlugin.INSTANCE });
   }
 
   @Override
diff --git a/plugins/org.eclipse.oomph.version.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.version.tests/META-INF/MANIFEST.MF
index 121e8b502..06ecbe2af 100644
--- a/plugins/org.eclipse.oomph.version.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.version.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.oomph.version.tests
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -17,8 +17,7 @@ Require-Bundle: org.eclipse.equinox.ds;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.oomph.version;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.version.digest;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.version.ui;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.resources;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.oomph.tests;bundle-version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.oomph.version.tests;version="1.1.0"
+Export-Package: org.eclipse.oomph.version.tests;version="1.2.0"
 Bundle-Activator: org.eclipse.oomph.version.tests.VersionTestsPlugin$Implementation
diff --git a/plugins/org.eclipse.oomph.version.tests/pom.xml b/plugins/org.eclipse.oomph.version.tests/pom.xml
index a1996a721..325672062 100644
--- a/plugins/org.eclipse.oomph.version.tests/pom.xml
+++ b/plugins/org.eclipse.oomph.version.tests/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.version.tests</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.version.ui/.project b/plugins/org.eclipse.oomph.version.ui/.project
index 0e03a46bd..0e0d665da 100644
--- a/plugins/org.eclipse.oomph.version.ui/.project
+++ b/plugins/org.eclipse.oomph.version.ui/.project
@@ -19,13 +19,13 @@
 			<name>org.eclipse.oomph.version.VersionBuilder</name>
 			<arguments>
 				<dictionary>
-					<key>release.path</key>
-					<value>/org.eclipse.oomph.util/release.xml</value>
-				</dictionary>
-				<dictionary>
 					<key>check.maven.pom</key>
 					<value>true</value>
 				</dictionary>
+				<dictionary>
+					<key>release.path</key>
+					<value>/org.eclipse.oomph.util/release.xml</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 	</buildSpec>
diff --git a/plugins/org.eclipse.oomph.version/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.version/META-INF/MANIFEST.MF
index fa49fb998..3a1038ad1 100644
--- a/plugins/org.eclipse.oomph.version/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.version/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.pde.core;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Export-Package: org.eclipse.oomph.internal.version;version="1.2.0";x-friends:="org.eclipse.oomph.version.ui",
  org.eclipse.oomph.version;version="1.2.0"
 Eclipse-RegisterBuddy: org.eclipse.oomph.util
diff --git a/plugins/org.eclipse.oomph.workingsets.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.workingsets.edit/META-INF/MANIFEST.MF
index 667016d0c..91e9caeb7 100644
--- a/plugins/org.eclipse.oomph.workingsets.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.workingsets.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.oomph.workingsets.edit;singleton:=true
-Bundle-Version: 1.1.0.qualifier
+Bundle-Version: 1.2.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.oomph.workingsets.provider.WorkingSetsEditPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -12,8 +12,6 @@ Export-Package: org.eclipse.oomph.workingsets.provider;version="1.1.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.oomph.workingsets;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.predicates.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
  org.eclipse.oomph.base.edit;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.oomph.workingsets.edit/pom.xml b/plugins/org.eclipse.oomph.workingsets.edit/pom.xml
index 30b121a68..749040f86 100644
--- a/plugins/org.eclipse.oomph.workingsets.edit/pom.xml
+++ b/plugins/org.eclipse.oomph.workingsets.edit/pom.xml
@@ -20,7 +20,7 @@
   </parent>
   <groupId>org.eclipse.oomph</groupId>
   <artifactId>org.eclipse.oomph.workingsets.edit</artifactId>
-  <version>1.1.0-SNAPSHOT</version>
+  <version>1.2.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/plugins/org.eclipse.oomph.workingsets/META-INF/MANIFEST.MF b/plugins/org.eclipse.oomph.workingsets/META-INF/MANIFEST.MF
index fa1535a77..cb0c0e209 100644
--- a/plugins/org.eclipse.oomph.workingsets/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.oomph.workingsets/META-INF/MANIFEST.MF
@@ -9,9 +9,7 @@ Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.10.0,3.0.0)";visibility:=reexport,
- org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.base;bundle-version="[1.1.0,2.0.0)";visibility:=reexport,
- org.eclipse.oomph.util;bundle-version="[1.1.0,2.0.0)"
+ org.eclipse.oomph.predicates;bundle-version="[1.1.0,2.0.0)";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Export-Package: org.eclipse.oomph.workingsets;version="1.2.0",
diff --git a/plugins/org.eclipse.oomph.workingsets/model/WorkingSets.genmodel b/plugins/org.eclipse.oomph.workingsets/model/WorkingSets.genmodel
index c1468563f..ac6592192 100644
--- a/plugins/org.eclipse.oomph.workingsets/model/WorkingSets.genmodel
+++ b/plugins/org.eclipse.oomph.workingsets/model/WorkingSets.genmodel
@@ -3,9 +3,9 @@
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.oomph.workingsets/src" creationIcons="false"
     modelPluginID="org.eclipse.oomph.workingsets" modelName="Workingsets" editPluginClass="org.eclipse.oomph.workingsets.provider.WorkingSetsEditPlugin"
     editorPluginClass="org.eclipse.oomph.workingsets.presentation.WorkingSetsEditorPlugin"
-    rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container" testsDirectory=""
-    importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0" copyrightFields="false"
-    optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.base/model/Base.genmodel#//base"
+    updateClasspath="false" rootExtendsClass="org.eclipse.emf.ecore.impl.MinimalEObjectImpl$Container"
+    testsDirectory="" importerID="org.eclipse.emf.importer.ecore" complianceLevel="5.0"
+    copyrightFields="false" optimizedHasChildren="true" runtimeVersion="2.10" usedGenPackages="../../org.eclipse.oomph.predicates/model/Predicates.genmodel#//predicates ../../org.eclipse.oomph.base/model/Base.genmodel#//base"
     operationReflection="true" decoration="Live" cleanup="true">
   <foreignModel>WorkingSets.ecore</foreignModel>
   <genPackages prefix="WorkingSets" basePackage="org.eclipse.oomph" disposableProviderFactory="true"