Upversion to 1.4.0 for Eclipse Oxygen

31 files changed, 90 insertions, 63 deletions

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 aaed48c3..6c21dee9 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 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.customtask;singleton:=true
-Bundle-Version: 1.3.1.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,8 +13,8 @@ Export-Package: org.eclipse.bpmn2.modeler.examples.customtask.MyModel,
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.emf.ecore;visibility:=reexport,
  org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.graphiti;bundle-version="[0.12.0,0.14.0)",
- org.eclipse.graphiti.ui;bundle-version="[0.12.0,0.14.0)",
+ org.eclipse.graphiti;bundle-version="[0.14.0,0.15.0)",
+ org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.15.0)",
  org.eclipse.gef,
  org.eclipse.bpmn2,
  org.eclipse.bpmn2.edit,
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 b65c8997..e6865aa5 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.customtask/pom.xml
@@ -14,13 +14,13 @@
   <parent>
 	<groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.examples.customtask</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <name>BPMN2 Modeler Example Plug-in: EMF Model</name>
   <description>BPMN2 Modeler Runtime Example Plug-in using EMF extension model</description>
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 bfb00487..71c47b27 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 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.datatypes;singleton:=true
-Bundle-Version: 1.3.1.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.examples.datatypes.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,8 +13,8 @@ Require-Bundle: org.eclipse.ui,
  org.eclipse.emf.transaction,
  org.eclipse.bpmn2.modeler.core,
  org.eclipse.bpmn2.modeler.ui,
- org.eclipse.graphiti;bundle-version="[0.12.0,0.14.0)",
- org.eclipse.graphiti.ui;bundle-version="[0.12.0,0.14.0)",
+ org.eclipse.graphiti;bundle-version="[0.14.0,0.15.0)",
+ org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.15.0)",
  org.eclipse.bpmn2
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ActivationPolicy: lazy
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 01e1e056..1fbc8687 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.datatypes/pom.xml
@@ -14,13 +14,13 @@
   <parent>
 	<groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.examples.datatypes</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <name>BPMN2 Modeler Example Plug-in: Data Types</name>
   <description>BPMN2 Modeler Runtime Example Plug-in demonstrating custom EMF Data Types</description>
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 0eb56ae7..68f7c5cf 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,15 +3,15 @@ Bundle-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.dynamic;singleton:=true
-Bundle-Version: 1.3.1.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.examples.dynamic.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.core.runtime,
  org.eclipse.ui.views.properties.tabbed,
  org.eclipse.gef,
- org.eclipse.graphiti;bundle-version="[0.12.0,0.14.0)",
- org.eclipse.graphiti.ui;bundle-version="[0.12.0,0.14.0)",
+ org.eclipse.graphiti;bundle-version="[0.14.0,0.15.0)",
+ org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.15.0)",
  org.eclipse.emf.transaction,
  org.eclipse.emf.databinding,
  org.eclipse.emf.edit.ui,
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 a7a62596..93d5b035 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.dynamic/pom.xml
@@ -14,13 +14,13 @@
   <parent>
 	<groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.examples.dynamic</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <name>BPMN2 Modeler Example Plug-in: Dynamic Model</name>
   <description>BPMN2 Modeler Runtime Example Plug-in using dynamic model extensions</description>
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 336e3358..27243b7c 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,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Org.eclipse.bpmn2.modeler.examples.modelreader
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.modelreader
-Bundle-Version: 1.3.1.qualifier
+Bundle-Version: 1.4.0.qualifier
 Export-Package: org.eclipse.bpmn2.modeler.examples.modelreader
 Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.core.runtime,
  org.eclipse.ui.views.properties.tabbed,
  org.eclipse.gef,
- org.eclipse.graphiti;bundle-version="[0.12.0,0.14.0)",
- org.eclipse.graphiti.ui;bundle-version="[0.12.0,0.14.0)",
+ org.eclipse.graphiti;bundle-version="[0.14.0,0.15.0)",
+ org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.15.0)",
  org.eclipse.emf.transaction,
  org.eclipse.emf.databinding,
  org.eclipse.emf.edit.ui,
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 47a63835..c2fadd8c 100644
--- a/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml
+++ b/examples/plugins/org.eclipse.bpmn2.modeler.examples.modelreader/pom.xml
@@ -17,13 +17,13 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId>
-		<version>1.3.1-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.examples.plugins</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.examples.modelreader</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>BPMN2 Modeler Example Plug-in: Java Model Loader</name>
 	<description>BPMN2 Model Loader in Java</description>
diff --git a/examples/plugins/pom.xml b/examples/plugins/pom.xml
index a716ae30..8bd3fb67 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.3.1-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -25,7 +25,7 @@
 	<artifactId>org.eclipse.bpmn2.modeler.examples.plugins.parent</artifactId>
 	<name>BPMN2 Modeler Examples: Plugins Parent</name>
 	<description>BPMN2 Modeler Example Plug-ins</description>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/examples/pom.xml b/examples/pom.xml
index 4d3721a7..29f046ca 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.3.1-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath>../parent/pom.xml</relativePath>
 	</parent>
 
@@ -25,7 +25,7 @@
 	<artifactId>org.eclipse.bpmn2.modeler.examples.parent</artifactId>
 	<name>BPMN2 Modeler: Examples Parent</name>
 	<description>BPMN2 Modeler Example Plug-ins and Projects</description>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/examples/projects/pom.xml b/examples/projects/pom.xml
index 75f52321..9b74c0b1 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.3.1-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
@@ -25,6 +25,6 @@
 	<artifactId>org.eclipse.bpmn2.modeler.examples.projects.modelreader</artifactId>
 	<name>BPMN2 Modeler Examples: Projects</name>
 	<description>BPMN2 Modeler Example Projects</description>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 </project>
diff --git a/features/org.eclipse.bpmn2.modeler.examples/feature.xml b/features/org.eclipse.bpmn2.modeler.examples/feature.xml
index fd38743e..8f25f398 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.3.1.qualifier"
+      version="1.4.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 ac544292..6f6edd56 100644
--- a/features/org.eclipse.bpmn2.modeler.examples/pom.xml
+++ b/features/org.eclipse.bpmn2.modeler.examples/pom.xml
@@ -17,13 +17,13 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId>
-		<version>1.3.1-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.examples</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<name>BPMN2 Modeler Feature: Examples</name>
 	<description>BPMN2 Modeler Examples Feature</description>
diff --git a/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml b/features/org.eclipse.bpmn2.modeler.runtime.jboss/feature.xml
index 6bae56d9..8c815d17 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.3.1.qualifier"
+      version="1.4.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 f55850d7..fd9b91fb 100644
--- a/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml
+++ b/features/org.eclipse.bpmn2.modeler.runtime.jboss/pom.xml
@@ -14,13 +14,13 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId>
-		<version>1.3.1-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.runtime.jboss</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<name>BPMN2 Modeler Feature: jBPM Runtime</name>
 	<description>BPMN2 Modeler JBoss jBPM Runtime Feature</description>
diff --git a/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml b/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml
index c3f9ef0d..45f8728d 100644
--- a/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml
+++ b/features/org.eclipse.bpmn2.modeler.updatesite/pom.xml
@@ -17,13 +17,13 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId>
-		<version>1.3.1-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.updatesite</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 	<name>BPMN2 Modeler Feature: Update Site</name>
 	<description>BPMN2 Modeler Update SiteFeature</description>
diff --git a/features/org.eclipse.bpmn2.modeler/feature.xml b/features/org.eclipse.bpmn2.modeler/feature.xml
index 37fe817b..0c04c875 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.3.1.qualifier"
+      version="1.4.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 a14f0d9c..07d376b4 100644
--- a/features/org.eclipse.bpmn2.modeler/pom.xml
+++ b/features/org.eclipse.bpmn2.modeler/pom.xml
@@ -17,13 +17,13 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.features.parent</artifactId>
-		<version>1.3.1-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 	<name>BPMN2 Modeler Feature: Editor</name>
 	<description>BPMN2 Modeler Editor Feature</description>
diff --git a/features/pom.xml b/features/pom.xml
index 9abf6cab..c0b5a0e6 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.3.1-SNAPSHOT</version>
+		<version>1.4.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.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/parent/pom.xml b/parent/pom.xml
index 4c0afb9f..4f0fea82 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.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>BPMN2 Modeler Parent</name>
@@ -134,6 +134,20 @@
 			</properties>
 		</profile>
 		<profile>
+			<id>platform-oxygen</id>
+			<activation>
+				<property>
+					<name>platform-version-name</name>
+					<value>oxygen</value>
+				</property>
+			</activation>
+			<properties>
+				<eclipse-site>http://download.eclipse.org/releases/oxygen</eclipse-site>
+				<platform-version>[4.7,5.0)</platform-version>
+				<platform-version-name>oxygen</platform-version-name>
+			</properties>
+		</profile>
+		<profile>
 			<id>sign</id>
 			<build>
 				<plugins>
@@ -205,7 +219,7 @@
 
 		<repository>
 			<id>eclipse-bpel</id>
-			<url>http://download.eclipse.org/bpel/site/1.0.5</url>
+			<url>http://download.eclipse.org/bpel/updates/neon/1.1.0</url>
 			<layout>p2</layout>
 			<snapshots>
 				<enabled>true</enabled>
@@ -251,6 +265,19 @@
 			</releases>
 		</repository>
 
+		<!-- Remove when Web Tools gets a build out for oxygen -->
+		<repository>
+			<id>eclipse-wst</id>
+			<url>http://download.eclipse.org/webtools/downloads/drops/R3.9.0/I-latest/repository</url>
+			<layout>p2</layout>
+			<snapshots>
+				<enabled>true</enabled>
+			</snapshots>
+			<releases>
+				<enabled>true</enabled>
+			</releases>
+		</repository>
+
 	</repositories>
 
 	<pluginRepositories>
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 38a1549e..4c702df2 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpmn2.modeler.core/META-INF/MANIFEST.MF
@@ -3,15 +3,15 @@ Bundle-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core;singleton:=true
-Bundle-Version: 1.3.1.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.core.Activator
 Bundle-Vendor: %providerName
 Require-Bundle: org.eclipse.emf.transaction,
  org.eclipse.emf.edit.ui,
  org.eclipse.emf.validation.ocl,
  org.eclipse.osgi,
- org.eclipse.graphiti;bundle-version="[0.12.0,0.14.0)",
- org.eclipse.graphiti.ui;bundle-version="[0.12.0,0.14.0)",
+ org.eclipse.graphiti;bundle-version="[0.14.0,0.15.0)",
+ org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.15.0)",
  org.eclipse.gef,
  org.eclipse.bpmn2.edit,
  org.eclipse.bpmn2.editor,
diff --git a/plugins/org.eclipse.bpmn2.modeler.core/pom.xml b/plugins/org.eclipse.bpmn2.modeler.core/pom.xml
index 984f8483..bd7567f4 100644
--- a/plugins/org.eclipse.bpmn2.modeler.core/pom.xml
+++ b/plugins/org.eclipse.bpmn2.modeler.core/pom.xml
@@ -17,13 +17,13 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId>
-		<version>1.3.1-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.core</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>BPMN2 Modeler Plugins: Core</name>
 	<description>Common Core functionality for BPMN2 Modeler</description>
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 138df3ee..d0203dda 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-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.help;singleton:=true
-Bundle-Version: 1.3.1.qualifier
+Bundle-Version: 1.4.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 bf4d654f..ed2f21b8 100644
--- a/plugins/org.eclipse.bpmn2.modeler.help/pom.xml
+++ b/plugins/org.eclipse.bpmn2.modeler.help/pom.xml
@@ -14,13 +14,13 @@
   <parent>
     <groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
     <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.help</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <name>BPMN2 Modeler Plugins: Help</name>
   <description>Context Help for BPMN2 Modeler</description>
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 a78b1c37..8117bce0 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,13 +2,13 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm;singleton:=true
-Bundle-Version: 1.3.1.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui.ide,
- org.eclipse.graphiti;bundle-version="[0.12.0,0.14.0)",
- org.eclipse.graphiti.ui;bundle-version="[0.12.0,0.14.0)",
+ org.eclipse.graphiti;bundle-version="[0.14.0,0.15.0)",
+ org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.15.0)",
  org.eclipse.bpmn2.modeler.core,
  org.eclipse.emf.transaction,
  org.eclipse.ui.views.properties.tabbed,
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 6dc2b31f..a8647a98 100644
--- a/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml
+++ b/plugins/org.eclipse.bpmn2.modeler.runtime.jboss.jbpm/pom.xml
@@ -14,13 +14,13 @@
   <parent>
     <groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
     <artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId>
-    <version>1.3.1-SNAPSHOT</version>
+    <version>1.4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.runtime.jboss.jbpm</artifactId>
-  <version>1.3.1-SNAPSHOT</version>
+  <version>1.4.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   <name>BPMN2 Modeler Plugins: jBPM Runtime</name>
   <description>BPMN2 Modeler Runtime Specialization for JBoss jBPM</description>
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 016a2da8..6d2a4ab3 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/META-INF/MANIFEST.MF
@@ -2,14 +2,14 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.ui;singleton:=true
-Bundle-Version: 1.3.1.qualifier
+Bundle-Version: 1.4.0.qualifier
 Bundle-Activator: org.eclipse.bpmn2.modeler.ui.Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui.ide,
  org.eclipse.osgi,
- org.eclipse.graphiti;bundle-version="[0.12.0,0.14.0)",
- org.eclipse.graphiti.ui;bundle-version="[0.12.0,0.14.0)",
+ org.eclipse.graphiti;bundle-version="[0.14.0,0.15.0)",
+ org.eclipse.graphiti.ui;bundle-version="[0.14.0,0.15.0)",
  org.eclipse.bpmn2.modeler.core,
  org.eclipse.emf.transaction,
  org.eclipse.ui.views.properties.tabbed,
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml b/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml
index dc82b92f..616a7c64 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/pom.xml
@@ -17,13 +17,13 @@
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
 		<artifactId>org.eclipse.bpmn2.modeler.plugins.parent</artifactId>
-		<version>1.3.1-SNAPSHOT</version>
+		<version>1.4.0-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.ui</artifactId>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>BPMN2 Modeler Plugins: UI</name>
 	<description>Main UI for BPMN2 Modeler</description>
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 4822c74c..f66d9327 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.3.1-SNAPSHOT</version>
+		<version>1.4.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.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/pom.xml b/pom.xml
index c8561494..c160dd42 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<groupId>org.eclipse</groupId>
 	<artifactId>org-eclipse-bpmn2-modeler</artifactId>
 	<name>BPMN2 Modeler</name>
-	<version>1.3.1-SNAPSHOT</version>
+	<version>1.4.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<modules>
 		<!-- must build parent BEFORE building the rest of this project 
diff --git a/upversion.sh b/upversion.sh
index 8a5b3f0d..aaa1d80b 100644
--- a/upversion.sh
+++ b/upversion.sh
@@ -1 +1 @@
-mvn -Dtycho.mode=maven org.sonatype.tycho:tycho-versions-plugin:set-version -DnewVersion=1.3.1-SNAPSHOT
+mvn -Dtycho.mode=maven org.sonatype.tycho:tycho-versions-plugin:set-version -DnewVersion=1.4.0-SNAPSHOT