[501318] Overlapping Lanes resize bug on delete

Change-Id: I59d834cf9954184cdaccb8d739db3ef64795acc5
Signed-off-by: Paul Leacu <pleacu@redhat.com>

36 files changed, 55 insertions, 53 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 f029ab25..7b784603 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.4.1.qualifier
+Bundle-Version: 1.4.2.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 4d268d9a..32ecdb72 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.4.1-SNAPSHOT</version>
+    <version>1.4.2-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.4.1-SNAPSHOT</version>
+  <version>1.4.2-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 8ca334ab..68370a68 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.4.1.qualifier
+Bundle-Version: 1.4.2.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 dc81c44e..7b2fb760 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.4.1-SNAPSHOT</version>
+    <version>1.4.2-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.4.1-SNAPSHOT</version>
+  <version>1.4.2-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 b7b275d9..aeaedd7d 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-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.dynamic;singleton:=true
-Bundle-Version: 1.4.1.qualifier
+Bundle-Version: 1.4.2.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 ddc03548..c748cfeb 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.4.1-SNAPSHOT</version>
+    <version>1.4.2-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.4.1-SNAPSHOT</version>
+  <version>1.4.2-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 6804bb2c..e19ea1e6 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 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.examples.modelreader;singleton:=true
-Bundle-Version: 1.4.1.qualifier
+Bundle-Version: 1.4.2.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 b5929f2d..eea4876c 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.4.1-SNAPSHOT</version>
+		<version>1.4.2-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.4.1-SNAPSHOT</version>
+	<version>1.4.2-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 c5119981..583342f9 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.1-SNAPSHOT</version>
+		<version>1.4.2-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.4.1-SNAPSHOT</version>
+	<version>1.4.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/examples/pom.xml b/examples/pom.xml
index 4e475e38..32b3e00c 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.1-SNAPSHOT</version>
+		<version>1.4.2-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.4.1-SNAPSHOT</version>
+	<version>1.4.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/examples/projects/pom.xml b/examples/projects/pom.xml
index c87b0fec..5bd8f47f 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.1-SNAPSHOT</version>
+		<version>1.4.2-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.4.1-SNAPSHOT</version>
+	<version>1.4.2-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 525c31b3..38f0196a 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.1.qualifier"
+      version="1.4.2.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 b44e36a5..5adc112c 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.4.1-SNAPSHOT</version>
+		<version>1.4.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.examples</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.4.2-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 59090a23..a35f8708 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.1.qualifier"
+      version="1.4.2.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 b8d85b82..10b28805 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.4.1-SNAPSHOT</version>
+		<version>1.4.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.runtime.jboss</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.4.2-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 42f66b22..c56f9715 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.4.1-SNAPSHOT</version>
+		<version>1.4.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.updatesite</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.4.2-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 d260c9c3..9f2b3c34 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.1.qualifier"
+      version="1.4.2.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 85211808..205df4e2 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.4.1-SNAPSHOT</version>
+		<version>1.4.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.features</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.4.2-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 e4626715..d1e07578 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.1-SNAPSHOT</version>
+		<version>1.4.2-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.1-SNAPSHOT</version>
+	<version>1.4.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/parent/pom.xml b/parent/pom.xml
index 9d1cf3c5..8fcf8a89 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.1-SNAPSHOT</version>
+	<version>1.4.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<name>BPMN2 Modeler Parent</name>
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 204737f8..9132f659 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-ManifestVersion: 2
 Bundle-Localization: plugin
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core;singleton:=true
-Bundle-Version: 1.4.1.qualifier
+Bundle-Version: 1.4.2.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 e72fbab9..100f09f8 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.4.1-SNAPSHOT</version>
+		<version>1.4.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.core</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.4.2-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 030b0a99..0e86a8ab 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.4.1.qualifier
+Bundle-Version: 1.4.2.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 e6a84398..8df570d7 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.4.1-SNAPSHOT</version>
+    <version>1.4.2-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
   <groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
   <artifactId>org.eclipse.bpmn2.modeler.help</artifactId>
-  <version>1.4.1-SNAPSHOT</version>
+  <version>1.4.2-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 fe0e5210..5fd78cc1 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 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm;singleton:=true
-Bundle-Version: 1.4.1.qualifier
+Bundle-Version: 1.4.2.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 605ad03a..8764bb47 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.4.1-SNAPSHOT</version>
+    <version>1.4.2-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.4.1-SNAPSHOT</version>
+  <version>1.4.2-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 73d686e4..5d4adeec 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 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.ui;singleton:=true
-Bundle-Version: 1.4.1.qualifier
+Bundle-Version: 1.4.2.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 4e8e0c46..45fdfbb7 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.4.1-SNAPSHOT</version>
+		<version>1.4.2-SNAPSHOT</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 
 	<groupId>org.eclipse.bpmn2.modeler.plugins</groupId>
 	<artifactId>org.eclipse.bpmn2.modeler.ui</artifactId>
-	<version>1.4.1-SNAPSHOT</version>
+	<version>1.4.2-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<name>BPMN2 Modeler Plugins: UI</name>
 	<description>Main UI for BPMN2 Modeler</description>
diff --git a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/lane/DeleteLaneFeature.java b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/lane/DeleteLaneFeature.java
index 57764c57..46a8c813 100644
--- a/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/lane/DeleteLaneFeature.java
+++ b/plugins/org.eclipse.bpmn2.modeler.ui/src/org/eclipse/bpmn2/modeler/ui/features/lane/DeleteLaneFeature.java
@@ -25,6 +25,7 @@ import org.eclipse.graphiti.features.context.IDeleteContext;
 import org.eclipse.graphiti.features.context.impl.ResizeShapeContext;
 import org.eclipse.graphiti.mm.algorithms.GraphicsAlgorithm;
 import org.eclipse.graphiti.mm.pictograms.ContainerShape;
+import org.eclipse.graphiti.mm.pictograms.Diagram;
 import org.eclipse.graphiti.mm.pictograms.PictogramElement;
 import org.eclipse.graphiti.services.Graphiti;
 
@@ -52,7 +53,8 @@ public class DeleteLaneFeature extends AbstractDefaultDeleteFeature {
 		}
 		LaneSet laneSet = (LaneSet)lane.eContainer();
 		
-		if (parentContainerShape != null) {
+		// Don't resize if deleted lane feature is not part of another element.
+		if ((parentContainerShape != null) && !(parentContainerShape.getContainer() instanceof Diagram)) {
 			boolean before = false;
 			ContainerShape neighborContainerShape = getLaneAfter(laneContainerShape);
 			if (neighborContainerShape == null) {
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 8e14bec6..1920d972 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.1-SNAPSHOT</version>
+		<version>1.4.2-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.1-SNAPSHOT</version>
+	<version>1.4.2-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<modules>
diff --git a/pom.xml b/pom.xml
index e3a5fbd8..9ff73002 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.4.1-SNAPSHOT</version>
+	<version>1.4.2-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 b68c4ad2..496e9653 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 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.core.tests;singleton:=true
-Bundle-Version: 1.4.1.qualifier
+Bundle-Version: 1.4.2.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 e8527e89..2a7c8789 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.1-SNAPSHOT</version>
+	        <version>1.4.2-SNAPSHOT</version>
         </parent>
 
         <artifactId>org.eclipse.bpmn2.modeler.core.tests</artifactId>
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 0c0132f9..ae7f3e39 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 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests;singleton:=true
-Bundle-Version: 1.4.1.qualifier
+Bundle-Version: 1.4.2.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 e2793f70..e87adc08 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.1-SNAPSHOT</version>
+		<version>1.4.2-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>org.eclipse.bpmn2.modeler.runtime.jboss.jbpm5.tests</artifactId>
diff --git a/tests/pom.xml b/tests/pom.xml
index edac1e8c..c717b4ea 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 	<parent>
 		<groupId>org.eclipse.bpmn2.modeler</groupId>
         <artifactId>org.eclipse.bpmn2.modeler.parent</artifactId>
-        <version>1.4.1-SNAPSHOT</version>
+        <version>1.4.2-SNAPSHOT</version>
         <relativePath>../parent/pom.xml</relativePath>
 	</parent>