fix build problems
diff --git a/examples/plugins/org.eclipse.bpel.extensionsample.model/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpel.extensionsample.model/META-INF/MANIFEST.MF
index 154606d..a9459e5 100644
--- a/examples/plugins/org.eclipse.bpel.extensionsample.model/META-INF/MANIFEST.MF
+++ b/examples/plugins/org.eclipse.bpel.extensionsample.model/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
  org.eclipse.bpel.extensionsample.model.util
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.bpel.model;bundle-version="1.0.4";visibility:=reexport,
+ org.eclipse.bpel.model;bundle-version="1.0.5";visibility:=reexport,
  org.eclipse.wst.wsdl;visibility:=reexport,
  org.eclipse.xsd;visibility:=reexport,
  javax.wsdl;bundle-version="[1.5.0,1.6.2]"
diff --git a/examples/plugins/org.eclipse.bpel.extensionssample.ui/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpel.extensionssample.ui/META-INF/MANIFEST.MF
index 980c3c9..ddb8f22 100644
--- a/examples/plugins/org.eclipse.bpel.extensionssample.ui/META-INF/MANIFEST.MF
+++ b/examples/plugins/org.eclipse.bpel.extensionssample.ui/META-INF/MANIFEST.MF
@@ -6,11 +6,11 @@
 Bundle-Activator: org.eclipse.bpel.extensionssample.ui.Activator
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
- org.eclipse.bpel.common.ui;bundle-version="1.0.4",
- org.eclipse.bpel.ui;bundle-version="1.0.4",
+ org.eclipse.bpel.common.ui;bundle-version="1.0.5",
+ org.eclipse.bpel.ui;bundle-version="1.0.5",
  org.eclipse.gef;bundle-version="3.4.0",
  org.eclipse.emf.ecore,
- org.eclipse.bpel.extensionsample.model;bundle-version="1.0.4",
+ org.eclipse.bpel.extensionsample.model;bundle-version="1.0.5",
  org.eclipse.core.resources;bundle-version="3.4.0",
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.4.0"
 Bundle-ActivationPolicy: lazy
diff --git a/examples/plugins/org.xtext.example.mydsl/META-INF/MANIFEST.MF b/examples/plugins/org.xtext.example.mydsl/META-INF/MANIFEST.MF
index 2e7bff2..90f6931 100644
--- a/examples/plugins/org.xtext.example.mydsl/META-INF/MANIFEST.MF
+++ b/examples/plugins/org.xtext.example.mydsl/META-INF/MANIFEST.MF
@@ -1,34 +1,34 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: org.xtext.example.mydsl

-Bundle-Vendor: My Company

-Bundle-Version: 1.0.0.qualifier

-Bundle-SymbolicName: org.xtext.example.mydsl; singleton:=true

-Bundle-ActivationPolicy: lazy

-Require-Bundle: org.eclipse.xtext;visibility:=reexport,

- org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,

- org.eclipse.xtext.generator;resolution:=optional,

- org.apache.commons.logging;bundle-version="1.0.4";resolution:=optional,

- org.eclipse.emf.codegen.ecore;resolution:=optional,

- org.eclipse.emf.mwe.utils;resolution:=optional,

- org.eclipse.emf.mwe2.launch;resolution:=optional,

- org.eclipse.xtext.util,

- org.eclipse.emf.ecore,

- org.eclipse.emf.common,

- org.antlr.runtime,

- org.eclipse.xtext.common.types

-Import-Package: org.apache.log4j,

- org.eclipse.xtext.xbase.lib

-Bundle-RequiredExecutionEnvironment: J2SE-1.5

-Export-Package: org.xtext.example.mydsl,

- org.xtext.example.mydsl.services,

- org.xtext.example.mydsl.myDsl,

- org.xtext.example.mydsl.myDsl.impl,

- org.xtext.example.mydsl.myDsl.util,

- org.xtext.example.mydsl.serializer,

- org.xtext.example.mydsl.parser.antlr,

- org.xtext.example.mydsl.parser.antlr.internal,

- org.xtext.example.mydsl.validation,

- org.xtext.example.mydsl.scoping,

- org.xtext.example.mydsl.generator,

- org.xtext.example.mydsl.formatting

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: org.xtext.example.mydsl
+Bundle-Vendor: My Company
+Bundle-Version: 1.0.0.qualifier
+Bundle-SymbolicName: org.xtext.example.mydsl; singleton:=true
+Bundle-ActivationPolicy: lazy
+Require-Bundle: org.eclipse.xtext;visibility:=reexport,
+ org.eclipse.xtext.xbase;resolution:=optional;visibility:=reexport,
+ org.eclipse.xtext.generator;resolution:=optional,
+ org.apache.commons.logging;bundle-version="1.0.5";resolution:=optional,
+ org.eclipse.emf.codegen.ecore;resolution:=optional,
+ org.eclipse.emf.mwe.utils;resolution:=optional,
+ org.eclipse.emf.mwe2.launch;resolution:=optional,
+ org.eclipse.xtext.util,
+ org.eclipse.emf.ecore,
+ org.eclipse.emf.common,
+ org.antlr.runtime,
+ org.eclipse.xtext.common.types
+Import-Package: org.apache.log4j,
+ org.eclipse.xtext.xbase.lib
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.xtext.example.mydsl,
+ org.xtext.example.mydsl.services,
+ org.xtext.example.mydsl.myDsl,
+ org.xtext.example.mydsl.myDsl.impl,
+ org.xtext.example.mydsl.myDsl.util,
+ org.xtext.example.mydsl.serializer,
+ org.xtext.example.mydsl.parser.antlr,
+ org.xtext.example.mydsl.parser.antlr.internal,
+ org.xtext.example.mydsl.validation,
+ org.xtext.example.mydsl.scoping,
+ org.xtext.example.mydsl.generator,
+ org.xtext.example.mydsl.formatting
diff --git a/parent/pom.xml b/parent/pom.xml
index 8ec0004..321a0ec 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -156,48 +156,6 @@
 			</plugin>
 
 			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-pack200a-plugin</artifactId>
-				<version>${tycho-extras-version}</version>
-				<executions>
-					<execution>
-						<id>pack200-normalize</id>
-						<goals>
-							<goal>normalize</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.cbi.maven.plugins</groupId>
-				<artifactId>eclipse-jarsigner-plugin</artifactId>
-				<version>1.0.5</version>
-				<executions>
-					<execution>
-						<id>sign</id>
-						<goals>
-							<goal>sign</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
-				<groupId>org.eclipse.tycho.extras</groupId>
-				<artifactId>tycho-pack200b-plugin</artifactId>
-				<version>${tycho-extras-version}</version>
-				<executions>
-					<execution>
-						<id>pack200-pack</id>
-						<goals>
-							<goal>pack</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
-			<plugin>
 				<groupId>org.eclipse.tycho</groupId>
 				<artifactId>tycho-source-plugin</artifactId>
 				<executions>
@@ -539,6 +497,75 @@
 				</repository>
 			</repositories>
 		</profile>
+		
+		<!-- Mars -->
+		<profile>
+			<id>platform-mars</id>
+			<activation>
+				<property>
+					<name>platform.name</name>
+					<value>mars</value>
+				</property>
+			</activation>
+			
+			<repositories>
+				<repository>
+					<id>mars-repository</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/releases/mars/</url>
+				</repository>
+			</repositories>
+		</profile>
+
+		<profile>
+			<id>sign</id>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200a-plugin</artifactId>
+						<version>${tycho-extras-version}</version>
+						<executions>
+							<execution>
+								<id>pack200-normalize</id>
+								<goals>
+									<goal>normalize</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+		
+					<plugin>
+						<groupId>org.eclipse.cbi.maven.plugins</groupId>
+						<artifactId>eclipse-jarsigner-plugin</artifactId>
+						<version>1.0.5</version>
+						<executions>
+							<execution>
+								<id>sign</id>
+								<phase>verify</phase>
+								<goals>
+									<goal>sign</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+		
+					<plugin>
+						<groupId>org.eclipse.tycho.extras</groupId>
+						<artifactId>tycho-pack200b-plugin</artifactId>
+						<version>${tycho-extras-version}</version>
+						<executions>
+							<execution>
+								<id>pack200-pack</id>
+								<goals>
+									<goal>pack</goal>
+								</goals>
+							</execution>
+						</executions>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
 	</profiles>
 
 	<repositories>
@@ -639,6 +666,5 @@
 			<id>repo.eclipse.org.cbi-releases</id>
 			<url>https://repo.eclipse.org/content/repositories/cbi-releases/</url>
 		</pluginRepository>
-
 	</pluginRepositories>
 </project>
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
index b1e228b..45159bd 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.model/META-INF/MANIFEST.MF
@@ -12,7 +12,7 @@
  org.eclipse.bpel.apache.ode.deploy.model.dd.util
 Require-Bundle: org.eclipse.emf.ecore.xmi;visibility:=reexport,
  javax.wsdl;bundle-version="[1.5.0,1.6.2]",
- org.eclipse.bpel.model;bundle-version="1.0.4",
+ org.eclipse.bpel.model;bundle-version="1.0.5",
  org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
  org.eclipse.xsd
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
index b76e817..5bd6be1 100644
--- a/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.apache.ode.deploy.ui/META-INF/MANIFEST.MF
@@ -5,22 +5,22 @@
 Bundle-Version: 1.0.5.Final
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.bpel.apache.ode.deploy.ui.Activator
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.jface.text,
+ org.eclipse.core.resources,
+ org.eclipse.ui.editors,
+ org.eclipse.ui.ide,
  org.eclipse.ui.forms;bundle-version="[3.3.100,4.0.0)",
- org.eclipse.bpel.apache.ode.deploy.model;bundle-version="1.0.4",
- org.eclipse.bpel.model;bundle-version="1.0.4",
+ org.eclipse.bpel.apache.ode.deploy.model;bundle-version="1.0.5",
+ org.eclipse.bpel.model;bundle-version="1.0.5",
  org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
  org.eclipse.xsd,
  javax.wsdl;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.core.databinding;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.jface.databinding;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.emf.edit.ui,
- org.eclipse.bpel.ui;bundle-version="1.0.4",
+ org.eclipse.bpel.ui;bundle-version="1.0.5",
  org.eclipse.wst.common.modulecore,
  org.eclipse.wst.common.emfworkbench.integration,
  org.eclipse.jem.util
diff --git a/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF
index 9ff4d3e..8251563 100644
--- a/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.apache.ode.runtime/META-INF/MANIFEST.MF
@@ -5,19 +5,19 @@
 Bundle-Version: 1.0.5.Final
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.resources,
  org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.emf.ecore,
  org.eclipse.jst.server.generic.core;bundle-version="[1.0.305,2.0.0)",
  org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.bpel.model;bundle-version="1.0.4",
+ org.eclipse.bpel.model;bundle-version="1.0.5",
  org.eclipse.jem.util;bundle-version="[2.0.100,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.bpel.runtimes;bundle-version="1.0.4",
+ org.eclipse.core.runtime,
+ org.eclipse.bpel.runtimes;bundle-version="1.0.5",
  org.eclipse.jst.server.generic.ui;bundle-version="[1.0.305,2.0.0)",
  org.eclipse.emf.ecore.xmi,
- org.eclipse.bpel.ui;bundle-version="1.0.4",
+ org.eclipse.bpel.ui;bundle-version="1.0.5",
  org.apache.xerces;bundle-version="[2.9.0,3.0.0)",
  org.eclipse.xsd,
  org.eclipse.jst.server.ui;bundle-version="[1.0.303,2.0.0)",
diff --git a/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF
index e09af1d..ecac875 100644
--- a/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.common.model/META-INF/MANIFEST.MF
@@ -5,7 +5,7 @@
 Bundle-Version: 1.0.5.Final
 Bundle-Activator: org.eclipse.bpel.common.extension.model.Activator
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore.xmi
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.bpel.common,
diff --git a/plugins/org.eclipse.bpel.common.ui.noEmbeddedEditors/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.common.ui.noEmbeddedEditors/META-INF/MANIFEST.MF
index 475fabf..3558816 100644
--- a/plugins/org.eclipse.bpel.common.ui.noEmbeddedEditors/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.common.ui.noEmbeddedEditors/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
 Bundle-Version: 1.0.5.Final
 Bundle-Activator: org.eclipse.bpel.common.ui.CommonUIPlugin
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.4.0,4.0.0)",
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.ide,
+ org.eclipse.core.resources,
+ org.eclipse.gef,
  org.eclipse.emf.ecore.change,
- org.eclipse.bpel.model;bundle-version="1.0.4"
+ org.eclipse.bpel.model;bundle-version="1.0.5"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.bpel.common.ui,
  org.eclipse.bpel.common.ui.assist,
diff --git a/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF
index 18aa21d..ee8189a 100644
--- a/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.common.ui/META-INF/MANIFEST.MF
@@ -5,13 +5,13 @@
 Bundle-Version: 1.0.5.Final
 Bundle-Activator: org.eclipse.bpel.common.ui.CommonUIPlugin
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.4.0,4.0.0)",
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.ui.ide,
+ org.eclipse.core.resources,
+ org.eclipse.gef,
  org.eclipse.emf.ecore.change,
- org.eclipse.bpel.model;bundle-version="1.0.4"
+ org.eclipse.bpel.model;bundle-version="1.0.5"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.bpel.common.ui,
  org.eclipse.bpel.common.ui.assist,
diff --git a/plugins/org.eclipse.bpel.compare.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.compare.ui/META-INF/MANIFEST.MF
index cf025db..90b7974 100644
--- a/plugins/org.eclipse.bpel.compare.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.compare.ui/META-INF/MANIFEST.MF
@@ -11,17 +11,17 @@
  org.eclipse.core.resources;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)",
  org.eclipse.emf.compare;bundle-version="[1.0.0,3.0.1)",
- org.eclipse.bpel.ui;bundle-version="1.0.4",
- org.eclipse.bpel.common.ui;bundle-version="1.0.4",
+ org.eclipse.bpel.ui;bundle-version="1.0.5",
+ org.eclipse.bpel.common.ui;bundle-version="1.0.5",
  org.eclipse.gef;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.ui.ide;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.bpel.model;bundle-version="1.0.4",
+ org.eclipse.bpel.model;bundle-version="1.0.5",
  org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
  javax.wsdl;bundle-version="[1.5.0,1.6.2]",
  org.eclipse.gmf.runtime.diagram.ui;bundle-version="1.1.3",
  org.eclipse.emf.compare.match;bundle-version="[1.0.0,3.0.1)",
  org.eclipse.emf.compare.diff;bundle-version="[1.0.0,3.0.1)",
- org.eclipse.bpel.common.model;bundle-version="1.0.4",
+ org.eclipse.bpel.common.model;bundle-version="1.0.5",
  org.eclipse.emf.compare.ui;bundle-version="[1.0.0,3.0.1)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.bpel.examples.extensionPoints.noEmbeddedEditors/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.examples.extensionPoints.noEmbeddedEditors/META-INF/MANIFEST.MF
index fbc9c94..bb2fecd 100644
--- a/plugins/org.eclipse.bpel.examples.extensionPoints.noEmbeddedEditors/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.examples.extensionPoints.noEmbeddedEditors/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui;bundle-version="3.3.0",
  org.eclipse.core.runtime;bundle-version="3.3.0",
- org.eclipse.bpel.common.ui;bundle-version="1.0.4",
+ org.eclipse.bpel.common.ui;bundle-version="1.0.5",
  org.eclipse.gef;bundle-version="3.2.0",
- org.eclipse.bpel.ui;bundle-version="1.0.4",
- org.eclipse.bpel.model;bundle-version="1.0.4",
+ org.eclipse.bpel.ui;bundle-version="1.0.5",
+ org.eclipse.bpel.model;bundle-version="1.0.5",
  org.eclipse.emf.ecore;bundle-version="2.3.0",
  javax.wsdl;bundle-version="[1.5.0,1.6.2]",
  org.eclipse.core.resources,
@@ -20,7 +20,7 @@
  org.eclipse.jdt.ui,
  org.eclipse.jface.text,
  org.eclipse.jdt.core,
- org.eclipse.bpel.common.model;bundle-version="1.0.4",
+ org.eclipse.bpel.common.model;bundle-version="1.0.5",
  org.eclipse.wst.jsdt.core;bundle-version="1.1.1",
  org.eclipse.wst.jsdt.ui;bundle-version="1.1.1"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.bpel.examples.extensionPoints/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.examples.extensionPoints/META-INF/MANIFEST.MF
index fbc9c94..bb2fecd 100644
--- a/plugins/org.eclipse.bpel.examples.extensionPoints/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.examples.extensionPoints/META-INF/MANIFEST.MF
@@ -7,10 +7,10 @@
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui;bundle-version="3.3.0",
  org.eclipse.core.runtime;bundle-version="3.3.0",
- org.eclipse.bpel.common.ui;bundle-version="1.0.4",
+ org.eclipse.bpel.common.ui;bundle-version="1.0.5",
  org.eclipse.gef;bundle-version="3.2.0",
- org.eclipse.bpel.ui;bundle-version="1.0.4",
- org.eclipse.bpel.model;bundle-version="1.0.4",
+ org.eclipse.bpel.ui;bundle-version="1.0.5",
+ org.eclipse.bpel.model;bundle-version="1.0.5",
  org.eclipse.emf.ecore;bundle-version="2.3.0",
  javax.wsdl;bundle-version="[1.5.0,1.6.2]",
  org.eclipse.core.resources,
@@ -20,7 +20,7 @@
  org.eclipse.jdt.ui,
  org.eclipse.jface.text,
  org.eclipse.jdt.core,
- org.eclipse.bpel.common.model;bundle-version="1.0.4",
+ org.eclipse.bpel.common.model;bundle-version="1.0.5",
  org.eclipse.wst.jsdt.core;bundle-version="1.1.1",
  org.eclipse.wst.jsdt.ui;bundle-version="1.1.1"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/MANIFEST.MF
index c94bf89..fcf368b 100644
--- a/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.jboss.riftsaw.runtime/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@
 Bundle-Version: 1.0.5.Final
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
  org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.wst.web.ui;bundle-version="[1.1.200,2.0.0)",
  org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
@@ -18,15 +18,15 @@
  org.eclipse.jst.server.generic.core;bundle-version="[1.0.305,2.0.0)",
  org.eclipse.jst.server.core,
  org.eclipse.jem.util;bundle-version="[2.0.100,3.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.bpel.model;bundle-version="1.0.4",
+ org.eclipse.debug.ui,
+ org.eclipse.bpel.model;bundle-version="1.0.5",
  org.eclipse.emf.ecore,
  javax.wsdl;bundle-version="[1.5.0,1.6.0)",
  org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
  org.eclipse.jst.common.frameworks,
  org.eclipse.jem.workbench,
- org.eclipse.bpel.runtimes;bundle-version="1.0.4",
- org.eclipse.bpel.validator;bundle-version="1.0.4"
+ org.eclipse.bpel.runtimes;bundle-version="1.0.5",
+ org.eclipse.bpel.validator;bundle-version="1.0.5"
 Bundle-Activator: org.eclipse.bpel.jboss.riftsaw.runtime.RiftsawPlugin
 Export-Package: org.eclipse.bpel.jboss.riftsaw.runtime,
  org.eclipse.bpel.jboss.riftsaw.runtime.facets,
diff --git a/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
index c87082b..9a93118 100644
--- a/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.model/META-INF/MANIFEST.MF
@@ -6,13 +6,13 @@
 Bundle-Activator: org.eclipse.bpel.model.BPELPlugin$Implementation
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
  org.eclipse.emf.ecore.xmi,
  org.eclipse.xsd,
  org.eclipse.wst.wsdl,
  javax.wsdl;bundle-version="[1.5.0,1.6.2]",
- org.eclipse.bpel.common.model;bundle-version="1.0.4",
+ org.eclipse.bpel.common.model;bundle-version="1.0.5",
  org.eclipse.wst.xml.core,
  org.eclipse.wst.xml.ui
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF
index 2d0addd..5100825 100644
--- a/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.runtimes/META-INF/MANIFEST.MF
@@ -5,9 +5,9 @@
 Bundle-Version: 1.0.5.Final
 Bundle-Activator: org.eclipse.bpel.runtimes.RuntimesPlugin
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.core.resources,
  org.eclipse.wst.server.core;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.wst.web.ui;bundle-version="[1.1.200,2.0.0)",
  org.eclipse.wst.common.project.facet.ui;bundle-version="[1.3.0,2.0.0)",
@@ -17,8 +17,8 @@
  org.eclipse.wst.common.frameworks.ui;bundle-version="[1.1.200,2.0.0)",
  org.eclipse.jst.server.generic.core;bundle-version="[1.0.305,2.0.0)",
  org.eclipse.jem.util;bundle-version="[2.0.100,3.0.0)",
- org.eclipse.debug.ui;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.bpel.model;bundle-version="1.0.4",
+ org.eclipse.debug.ui,
+ org.eclipse.bpel.model;bundle-version="1.0.5",
  org.eclipse.emf.ecore,
  javax.wsdl;bundle-version="[1.5.0,1.6.2]",
  org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
diff --git a/plugins/org.eclipse.bpel.ui.noEmbeddedEditors/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.ui.noEmbeddedEditors/META-INF/MANIFEST.MF
index 8246cde..874a643 100644
--- a/plugins/org.eclipse.bpel.ui.noEmbeddedEditors/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.ui.noEmbeddedEditors/META-INF/MANIFEST.MF
@@ -6,21 +6,21 @@
 Bundle-Activator: org.eclipse.bpel.ui.BPELUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.views.properties.tabbed;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.4.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views.properties.tabbed,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.jface.text,
+ org.eclipse.gef,
  org.eclipse.xsd,
- org.eclipse.bpel.common.ui;bundle-version="1.0.4",
+ org.eclipse.bpel.common.ui;bundle-version="1.0.5",
  org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.bpel.common.model;bundle-version="1.0.4",
- org.eclipse.bpel.model;bundle-version="1.0.4",
+ org.eclipse.bpel.common.model;bundle-version="1.0.5",
+ org.eclipse.bpel.model;bundle-version="1.0.5",
  org.eclipse.wst.xml.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.bpel.wsil.model;bundle-version="1.0.4",
+ org.eclipse.bpel.wsil.model;bundle-version="1.0.5",
  org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.1.300,2.0.0)",
  javax.wsdl;bundle-version="[1.5.0,1.6.2]";visibility:=reexport,
@@ -32,8 +32,8 @@
  org.eclipse.wst.common.emfworkbench.integration,
  org.eclipse.jem.util,
  org.eclipse.wst.common.project.facet.core,
- org.eclipse.bpel.runtimes;bundle-version="1.0.4",
- org.eclipse.bpel.common.wsdl;bundle-version="1.0.4"
+ org.eclipse.bpel.runtimes;bundle-version="1.0.5",
+ org.eclipse.bpel.common.wsdl;bundle-version="1.0.5"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.bpel.ui,
  org.eclipse.bpel.ui.actions,
diff --git a/plugins/org.eclipse.bpel.ui.xtext/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.ui.xtext/META-INF/MANIFEST.MF
index 1729885..5d75877 100644
--- a/plugins/org.eclipse.bpel.ui.xtext/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.ui.xtext/META-INF/MANIFEST.MF
@@ -6,11 +6,11 @@
 Bundle-Activator: org.eclipse.bpel.ui.xtext.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.xtext.ui;bundle-version="2.3.0";visibility:=reexport,
- org.eclipse.bpel.ui;bundle-version="1.0.4";visibility:=reexport,
- org.eclipse.bpel.model;bundle-version="1.0.4";visibility:=reexport,
+ org.eclipse.bpel.ui;bundle-version="1.0.5";visibility:=reexport,
+ org.eclipse.bpel.model;bundle-version="1.0.5";visibility:=reexport,
  org.eclipse.ui.views.properties.tabbed;bundle-version="3.5.0";visibility:=reexport,
  org.eclipse.gef;visibility:=reexport,
- org.eclipse.bpel.common.ui;bundle-version="1.0.4";visibility:=reexport
+ org.eclipse.bpel.common.ui;bundle-version="1.0.5";visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Export-Package: org.eclipse.bpel.ui.properties.xtext
diff --git a/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
index 8246cde..874a643 100644
--- a/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.ui/META-INF/MANIFEST.MF
@@ -6,21 +6,21 @@
 Bundle-Activator: org.eclipse.bpel.ui.BPELUIPlugin
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.views.properties.tabbed;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.workbench.texteditor;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.ui.editors;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.jface.text;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.gef;bundle-version="[3.4.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime,
+ org.eclipse.core.resources,
+ org.eclipse.ui.ide,
+ org.eclipse.ui.views.properties.tabbed,
+ org.eclipse.ui.workbench.texteditor,
+ org.eclipse.ui.editors,
+ org.eclipse.jface.text,
+ org.eclipse.gef,
  org.eclipse.xsd,
- org.eclipse.bpel.common.ui;bundle-version="1.0.4",
+ org.eclipse.bpel.common.ui;bundle-version="1.0.5",
  org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.bpel.common.model;bundle-version="1.0.4",
- org.eclipse.bpel.model;bundle-version="1.0.4",
+ org.eclipse.bpel.common.model;bundle-version="1.0.5",
+ org.eclipse.bpel.model;bundle-version="1.0.5",
  org.eclipse.wst.xml.core;bundle-version="[1.1.300,2.0.0)",
- org.eclipse.bpel.wsil.model;bundle-version="1.0.4",
+ org.eclipse.bpel.wsil.model;bundle-version="1.0.5",
  org.eclipse.wst.sse.ui;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.wst.sse.core;bundle-version="[1.1.300,2.0.0)",
  javax.wsdl;bundle-version="[1.5.0,1.6.2]";visibility:=reexport,
@@ -32,8 +32,8 @@
  org.eclipse.wst.common.emfworkbench.integration,
  org.eclipse.jem.util,
  org.eclipse.wst.common.project.facet.core,
- org.eclipse.bpel.runtimes;bundle-version="1.0.4",
- org.eclipse.bpel.common.wsdl;bundle-version="1.0.4"
+ org.eclipse.bpel.runtimes;bundle-version="1.0.5",
+ org.eclipse.bpel.common.wsdl;bundle-version="1.0.5"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.bpel.ui,
  org.eclipse.bpel.ui.actions,
diff --git a/plugins/org.eclipse.bpel.validator.junit/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.validator.junit/META-INF/MANIFEST.MF
index fda5a0f..b058502 100644
--- a/plugins/org.eclipse.bpel.validator.junit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.validator.junit/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
-Manifest-Version: 1.0

-Bundle-ManifestVersion: 2

-Bundle-Name: %pluginName

-Bundle-SymbolicName: org.eclipse.bpel.validator.junit

-Bundle-Version: 1.0.4

-Fragment-Host: org.eclipse.bpel.validator;bundle-version="1.0.4"

-Bundle-RequiredExecutionEnvironment: JavaSE-1.6

-Bundle-ClassPath: .

-Require-Bundle: org.junit;bundle-version="4.8.1"

-Bundle-Vendor: %providerName

-Bundle-Localization: plugin

+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.bpel.validator.junit
+Bundle-Version: 1.0.4
+Fragment-Host: org.eclipse.bpel.validator;bundle-version="1.0.5"
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ClassPath: .
+Require-Bundle: org.junit;bundle-version="4.8.1"
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
index 1be08a6..a2f502e 100644
--- a/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.validator/META-INF/MANIFEST.MF
@@ -7,17 +7,17 @@
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.emf.ecore.xmi,
- org.eclipse.core.resources;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+ org.eclipse.core.resources,
+ org.eclipse.core.runtime,
  org.eclipse.xsd,
  org.eclipse.wst.wsdl;bundle-version="[1.1.200,2.0.0)",
- org.eclipse.bpel.model;bundle-version="1.0.4",
- org.eclipse.bpel.common.model;bundle-version="1.0.4",
+ org.eclipse.bpel.model;bundle-version="1.0.5",
+ org.eclipse.bpel.common.model;bundle-version="1.0.5",
  org.eclipse.wst.validation;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.wst.wsdl.validation;bundle-version="[1.1.301,2.0.0)",
  org.eclipse.wst.xml.core;bundle-version="[1.1.300,2.0.0)",
  javax.wsdl;bundle-version="[1.5.0,1.6.2]",
- org.eclipse.bpel.xpath10;bundle-version="1.0.4"
+ org.eclipse.bpel.xpath10;bundle-version="1.0.5"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: .
diff --git a/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF
index 12c0f07..f8eb048 100644
--- a/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.wsil.model/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@
    org.eclipse.emf.ecore.xmi.util,
    org.eclipse.emf.ecore.resource.impl,
    org.eclipse.bpel.wsil.model.inspection"
-Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
+Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore.xmi;visibility:=reexport
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.bpel.xpath10.junit/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpel.xpath10.junit/META-INF/MANIFEST.MF
index 87473cf..512b8e3 100644
--- a/plugins/org.eclipse.bpel.xpath10.junit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpel.xpath10.junit/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpel.xpath10.junit
 Bundle-Version: 1.0.5.Final
-Fragment-Host: org.eclipse.bpel.xpath10;bundle-version="1.0.4"
+Fragment-Host: org.eclipse.bpel.xpath10;bundle-version="1.0.5"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.junit;bundle-version="4.8.1"
 Export-Package: org.eclipse.bpel.xpath10.parser
diff --git a/tests/org.eclipse.bpel.common.wsdl.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.bpel.common.wsdl.tests/META-INF/MANIFEST.MF
index 4803f65..6a1ea45 100644
--- a/tests/org.eclipse.bpel.common.wsdl.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.bpel.common.wsdl.tests/META-INF/MANIFEST.MF
@@ -6,7 +6,7 @@
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-Vendor: Eclipse.org
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.bpel.common.wsdl;bundle-version="1.0.4",
+Require-Bundle: org.eclipse.bpel.common.wsdl;bundle-version="1.0.5",
  org.eclipse.emf.ecore.xmi,
  org.eclipse.wst.wsdl,
  javax.wsdl;bundle-version="[1.5.0,1.6.2]",
diff --git a/tests/org.eclipse.bpel.ui.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.bpel.ui.tests/META-INF/MANIFEST.MF
index d857c86..8a1a0ad 100644
--- a/tests/org.eclipse.bpel.ui.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.bpel.ui.tests/META-INF/MANIFEST.MF
@@ -16,12 +16,12 @@
  org.eclipse.core.runtime,
  org.hamcrest,
  org.junit;bundle-version="4.8.1",
- org.eclipse.bpel.common.model;bundle-version="1.0.4",
- org.eclipse.bpel.common.ui;bundle-version="1.0.4",
- org.eclipse.bpel.common.wsdl;bundle-version="1.0.4",
- org.eclipse.bpel.model;bundle-version="1.0.4",
- org.eclipse.bpel.ui;bundle-version="1.0.4",
- org.eclipse.bpel.validator;bundle-version="1.0.4",
- org.eclipse.bpel.wsil.model;bundle-version="1.0.4",
- org.eclipse.bpel.xpath10;bundle-version="1.0.4",
+ org.eclipse.bpel.common.model;bundle-version="1.0.5",
+ org.eclipse.bpel.common.ui;bundle-version="1.0.5",
+ org.eclipse.bpel.common.wsdl;bundle-version="1.0.5",
+ org.eclipse.bpel.model;bundle-version="1.0.5",
+ org.eclipse.bpel.ui;bundle-version="1.0.5",
+ org.eclipse.bpel.validator;bundle-version="1.0.5",
+ org.eclipse.bpel.wsil.model;bundle-version="1.0.5",
+ org.eclipse.bpel.xpath10;bundle-version="1.0.5",
  org.eclipse.swtbot.junit4_x