[534701] Photon support - 1.5.0

Change-Id: Ia841444fc9c02e80f20f136ada4d347a183a5450
Signed-off-by: Paul Leacu <pleacu@redhat.com>
diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF
index ca2cbb3..e36b2ed 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.customtask;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml
index a097ce3..d40d7c4 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml
@@ -14,7 +14,7 @@
   <parent>
 	<groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId>
-    <version>1.4.3-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF
index ab40972..7107dd7 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.datatypes;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.examples.datatypes.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml
index 0e79f38..bc39c21 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml
@@ -14,7 +14,7 @@
   <parent>
 	<groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId>
-    <version>1.4.3-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF
index d345417..2c934d5 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.dynamic;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.examples.dynamic.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui.ide,
diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml
index d31fb2b..592e19c 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml
@@ -14,7 +14,7 @@
   <parent>
 	<groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId>
-    <version>1.4.3-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF
index b9d8372..82396a8 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.modelreader;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: %providerName
 Export-Package: org.eclipse.bpmn2.modeler.examples.modelreader
 Require-Bundle: org.eclipse.ui.ide,
diff --git a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml
index 6f11138..68732db 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/examples/plugins/pom.xml b/examples/plugins/pom.xml
index e1f0295..5b2f9c5 100644
--- a/examples/plugins/pom.xml
+++ b/examples/plugins/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.examples</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.examples.parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/examples/pom.xml b/examples/pom.xml
index 4f362ea..21b35fc 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 
diff --git a/examples/projects/pom.xml b/examples/projects/pom.xml
index af59817..77084e5 100644
--- a/examples/projects/pom.xml
+++ b/examples/projects/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.examples</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.examples.parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/features/org.eclipse.bpmn2.modeler.examples/feature.xml b/features/org.eclipse.bpmn2.modeler.examples/feature.xml
index e2047f7..d5550a4 100644
--- a/features/org.eclipse.bpmn2.modeler.examples/feature.xml
+++ b/features/org.eclipse.bpmn2.modeler.examples/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.bpmn2.modeler.examples"
       label="BPMN2 Modeler - Examples"
-      version="1.4.3.qualifier"
+      version="1.5.0.qualifier"
       provider-name="%providerName">
 
    <description>
diff --git a/features/org.eclipse.bpmn2.modeler.examples/pom.xml b/features/org.eclipse.bpmn2.modeler.examples/pom.xml
index d8038e3..fefdc3b 100644
--- a/features/org.eclipse.bpmn2.modeler.examples/pom.xml
+++ b/features/org.eclipse.bpmn2.modeler.examples/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml b/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml
index ab0d8a3..8263b42 100644
--- a/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml
+++ b/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.bpmn2.modeler.runtime.jboss"
       label="BPMN2 Modeler - jBPM Runtime Extension Feature"
-      version="1.4.3.qualifier"
+      version="1.5.0.qualifier"
       provider-name="%providerName">
 
    <description url="http://jbpm.jboss.org/">
diff --git a/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml b/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml
index 64f2d9a..3dcd0cc 100644
--- a/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml
+++ b/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml
@@ -14,7 +14,7 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml b/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml
index 1de9d81..7b2b466 100644
--- a/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml
+++ b/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/features/org.eclipse.bpmn2.modeler/feature.xml b/features/org.eclipse.bpmn2.modeler/feature.xml
index ce77fc5..5e302aa 100644
--- a/features/org.eclipse.bpmn2.modeler/feature.xml
+++ b/features/org.eclipse.bpmn2.modeler/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.bpmn2.modeler"
       label="BPMN2 Modeler - Diagram Editor"
-      version="1.4.3.qualifier"
+      version="1.5.0.qualifier"
       provider-name="%providerName">
 
    <description url="https://www.eclipse.org/bpmn2-modeler/">
diff --git a/features/org.eclipse.bpmn2.modeler/pom.xml b/features/org.eclipse.bpmn2.modeler/pom.xml
index 5bcf7f1..f08bcdb 100644
--- a/features/org.eclipse.bpmn2.modeler/pom.xml
+++ b/features/org.eclipse.bpmn2.modeler/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/features/pom.xml b/features/pom.xml
index 676a5b2..546bd73 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -7,14 +7,14 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId>
 	<name>BPMN2 Modeler: Features Parent</name>
-	<version>1.4.3-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/parent/pom.xml b/parent/pom.xml
index 571a3a3..c63877d 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -8,7 +8,7 @@
 
 	<groupId>org.eclipse.bpmn2.modeler</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
-	<version>1.4.3-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>BPMN2 Modeler Parent</name>
@@ -29,7 +29,7 @@
 	</licenses>
 
 	<properties>
-		<tycho-version>0.26.0</tycho-version>
+		<tycho-version>1.1.0</tycho-version>
 		<tycho-extras-version>${tycho-version}</tycho-extras-version>
 		<BUILD_ALIAS>RC1</BUILD_ALIAS>
 		<BUILD_NUMBER>1</BUILD_NUMBER>
@@ -176,6 +176,33 @@
 			</build>
 		</profile>
 		<profile>
+			<id>platform-photon</id>
+			<activation>
+				<property>
+					<name>platform-version-name</name>
+					<value>photon</value>
+				</property>
+			</activation>
+			<properties>
+				<eclipse-site>http://download.eclipse.org/releases/photon</eclipse-site>
+				<platform-version>[4.8,5.0)</platform-version>
+				<platform-version-name>photon</platform-version-name>
+				<eclipse.orbit.url>http://download.eclipse.org/tools/orbit/S-builds/S20180504181223/repository</eclipse.orbit.url>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+					    <groupId>org.eclipse.tycho</groupId>
+					    <artifactId>tycho-surefire-plugin</artifactId>
+					    <version>${tycho-version}</version>
+						<configuration>
+							<useUIThread>false</useUIThread>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
 			<id>sign</id>
 			<build>
 				<plugins>
@@ -256,7 +283,7 @@
 
 		<repository>
 			<id>eclipse-bpel</id>
-			<url>http://download.eclipse.org/bpel/updates/oxygen/1.1.1</url>
+			<url>http://download.eclipse.org/bpel/updates/photon/1.1.2</url>
 			<layout>p2</layout>
 			<snapshots>
 				<enabled>true</enabled>
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF
index 918b280..4e07b2d 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.core.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.emf.transaction,
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/pom.xml b/plugins/org.eclipse.bpmn2.modeler.core/pom.xml
index e28060e..9db35ac 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/pom.xml
+++ b/plugins/org.eclipse.bpmn2.modeler.core/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/XMLConfigElement.java b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/XMLConfigElement.java
index 79dadd8..e1a9b66 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/XMLConfigElement.java
+++ b/plugins/org.eclipse.bpmn2.modeler.core/src/org/eclipse/bpmn2/modeler/core/runtime/XMLConfigElement.java
@@ -190,6 +190,11 @@
 	public boolean isValid() {
 		return valid;
 	}
+    
+	@Override
+	public int getHandleId() {
+		return 0;
+	}
 
 	public static class XMLExtension implements IExtension {
 
diff --git a/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF
index 0569dfd..5d707bd 100644
--- a/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpmn2.modeler.help/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.help;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.help.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui,
diff --git a/plugins/org.eclipse.bpmn2.modeler.help/pom.xml b/plugins/org.eclipse.bpmn2.modeler.help/pom.xml
index 037e537..d030ec7 100644
--- a/plugins/org.eclipse.bpmn2.modeler.help/pom.xml
+++ b/plugins/org.eclipse.bpmn2.modeler.help/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
     <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId>
-    <version>1.4.3-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF
index fc9d7f0..9fe632d 100644
--- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml
index 016df08..01d82eb 100644
--- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml
+++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml
@@ -14,7 +14,7 @@
   <parent>
     <groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
     <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId>
-    <version>1.4.3-SNAPSHOT</version>
+    <version>1.5.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF
index 9d14d8d..9b703f4 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.ui;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.ui.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml b/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml
index 4c5a5c3..fcf7e7d 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml
@@ -17,7 +17,7 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
diff --git a/plugins/pom.xml b/plugins/pom.xml
index c50c9ea..69afbb4 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -7,14 +7,14 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId>
 	<name>BPMN2 Modeler: Plugins Parent</name>
-	<version>1.4.3-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/pom.xml b/pom.xml
index a59666b..51b0207 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>org.eclipse</groupId>
 	<artifactId>org-eclipse-bpmn2-modeler</artifactId>
 	<name>BPMN2 Modeler</name>
-	<version>1.4.3-SNAPSHOT</version>
+	<version>1.5.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<!-- must build parent BEFORE building the rest of this project 
diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF
index c8946b1..27c325b 100644
--- a/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.bpmn2.modeler.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core.tests;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.5.0.qualifier
 Require-Bundle: org.eclipse.bpmn2.edit,
  org.eclipse.bpmn2.editor,
  org.eclipse.bpmn2.modeler.core,
diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml b/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml
index 12d6cb5..9ce0643 100644
--- a/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml
+++ b/tests/org.eclipse.bpmn2.modeler.core.tests/pom.xml
@@ -3,7 +3,7 @@
         <parent>
 		<groupId>org.eclipse.bpmn2.modeler.tests</groupId>
         	<artifactId>tests-parent</artifactId>
-	        <version>1.4.3-SNAPSHOT</version>
+	        <version>1.5.0-SNAPSHOT</version>
         </parent>
 
         <artifactId>org.eclipse.bpmn2.modeler.core.tests</artifactId>
diff --git a/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/validators/tests/GatewayValidatorTest.java b/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/validators/tests/GatewayValidatorTest.java
index 7074401..89985c2 100644
--- a/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/validators/tests/GatewayValidatorTest.java
+++ b/tests/org.eclipse.bpmn2.modeler.core.tests/src/org/eclipse/bpmn2/modeler/core/validation/validators/tests/GatewayValidatorTest.java
@@ -73,8 +73,8 @@
 		twoFlows.add(flowTwo);
 		twoFlows.add(flowThree);
 		
-		when(eClass.getEStructuralFeature(anyString())).thenReturn(eFeature);
-		when(gateway.eClass()).thenReturn(eClass);
+		//when(eClass.getEStructuralFeature(anyString())).thenReturn(eFeature);
+		//when(gateway.eClass()).thenReturn(eClass);
 		
 	}
 
diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF
index d983b50..d921370 100644
--- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests;singleton:=true
-Bundle-Version: 1.4.3.qualifier
+Bundle-Version: 1.5.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit,
diff --git a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml
index 6406cc1..3e4a439 100644
--- a/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml
+++ b/tests/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests/pom.xml
@@ -5,7 +5,7 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.tests</groupId>
 		<artifactId>tests-parent</artifactId>
-		<version>1.4.3-SNAPSHOT</version>
+		<version>1.5.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index 42c9953..46b06f4 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler</groupId>
         <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
-        <version>1.4.3-SNAPSHOT</version>
+        <version>1.5.0-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
 	</parent>