Update RAP Runtime version to 3.18

Change-Id: I0ca8626158873d108ff3a58e7bef406ff0eb9e47
diff --git a/bundles/org.eclipse.e4.core.commands/pom.xml b/bundles/org.eclipse.e4.core.commands/pom.xml
index edb7c04..333b71c 100644
--- a/bundles/org.eclipse.e4.core.commands/pom.xml
+++ b/bundles/org.eclipse.e4.core.commands/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.ui.bindings/pom.xml b/bundles/org.eclipse.e4.ui.bindings/pom.xml
index 4c6631c..3f466fb 100644
--- a/bundles/org.eclipse.e4.ui.bindings/pom.xml
+++ b/bundles/org.eclipse.e4.ui.bindings/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml b/bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml
index 811519f..d82064c 100644
--- a/bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml
+++ b/bundles/org.eclipse.e4.ui.workbench.addons.swt/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml
index 52b7174..a3f9eea 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/pom.xml b/bundles/org.eclipse.e4.ui.workbench.swt/pom.xml
index 9071eda..c44dea2 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/pom.xml
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.e4.ui.workbench/pom.xml b/bundles/org.eclipse.e4.ui.workbench/pom.xml
index 069c508..3a23d67 100644
--- a/bundles/org.eclipse.e4.ui.workbench/pom.xml
+++ b/bundles/org.eclipse.e4.ui.workbench/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
diff --git a/bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF
index ebd86de..71d0c57 100644
--- a/bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.e4
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
@@ -26,8 +26,8 @@
 Import-Package: javax.annotation;version="1.2.0",
  javax.inject;version="1.0.0",
  org.osgi.service.event;version="1.3.0"
-Export-Package: org.eclipse.rap.e4;version="3.17.0",
- org.eclipse.rap.e4.preferences;version="3.17.0"
+Export-Package: org.eclipse.rap.e4;version="3.18.0",
+ org.eclipse.rap.e4.preferences;version="3.18.0"
 Service-Component: OSGI-INF/rapeventbroker.xml,OSGI-INF/rapeventobjectsupplier.xml,OSGI-INF/rapuieventobjectsupplier.xml,OSGI-INF/rappreferenceobjectsupplier.xml,
  OSGI-INF/preferenceserviceCF.xml,OSGI-INF/raptranslationobjectsupplier.xml
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/bundles/org.eclipse.rap.e4/pom.xml b/bundles/org.eclipse.rap.e4/pom.xml
index f31b2ca..a06091e 100644
--- a/bundles/org.eclipse.rap.e4/pom.xml
+++ b/bundles/org.eclipse.rap.e4/pom.xml
@@ -18,13 +18,13 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.e4</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
   <build>
     <resources>
diff --git a/bundles/org.eclipse.rap.filedialog/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.filedialog/META-INF/MANIFEST.MF
index b9ccc85..cff6163 100644
--- a/bundles/org.eclipse.rap.filedialog/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.filedialog/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.rap.filedialog
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.fileupload;bundle-version="[3.17.0,4.0.0)"
-Export-Package: org.eclipse.swt.internal.widgets;version="3.17.0";x-friends:="org.eclipse.rap.filedialog.test",
- org.eclipse.swt.widgets;version="3.17.0"
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.fileupload;bundle-version="[3.18.0,4.0.0)"
+Export-Package: org.eclipse.swt.internal.widgets;version="3.18.0";x-friends:="org.eclipse.rap.filedialog.test",
+ org.eclipse.swt.widgets;version="3.18.0"
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  javax.servlet.http;version="[3.1.0,5.0.0)"
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.rap.filedialog/pom.xml b/bundles/org.eclipse.rap.filedialog/pom.xml
index 0ded083..c194d13 100644
--- a/bundles/org.eclipse.rap.filedialog/pom.xml
+++ b/bundles/org.eclipse.rap.filedialog/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.filedialog</artifactId>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.rap.fileupload/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.fileupload/META-INF/MANIFEST.MF
index 69476ee..6d8df90 100644
--- a/bundles/org.eclipse.rap.fileupload/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.fileupload/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.rap.fileupload;singleton:=true
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)"
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)"
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  javax.servlet.http;version="[3.1.0,5.0.0)",
  org.apache.commons.fileupload;version="[1.3.1,2.0.0)",
  org.apache.commons.fileupload.disk;version="[1.3.1,2.0.0)",
  org.apache.commons.fileupload.servlet;version="[1.3.1,2.0.0)",
  org.apache.commons.io;version="[2.2.0,3.0.0)"
-Export-Package: org.eclipse.rap.fileupload;version="3.17.0",
- org.eclipse.rap.fileupload.internal;version="3.17.0";x-friends:="org.eclipse.rap.fileupload.test"
+Export-Package: org.eclipse.rap.fileupload;version="3.18.0",
+ org.eclipse.rap.fileupload.internal;version="3.18.0";x-friends:="org.eclipse.rap.fileupload.test"
 Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.rap.fileupload/pom.xml b/bundles/org.eclipse.rap.fileupload/pom.xml
index ef6d25e..fd4d3dc 100644
--- a/bundles/org.eclipse.rap.fileupload/pom.xml
+++ b/bundles/org.eclipse.rap.fileupload/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.fileupload</artifactId>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/bundles/org.eclipse.rap.jface.databinding/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.jface.databinding/META-INF/MANIFEST.MF
index f0ac291..5d3c278 100644
--- a/bundles/org.eclipse.rap.jface.databinding/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.jface.databinding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rap.jface.databinding
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -18,8 +18,8 @@
  org.eclipse.jface.internal.databinding.swt;x-internal:=true,
  org.eclipse.jface.internal.databinding.util;x-internal:=true,
  org.eclipse.jface.internal.databinding.viewers;x-internal:=true
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.jface;bundle-version="[3.17.0,4.0.0)",
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.jface;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.3.0,2.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.3.0,2.0.0)",
diff --git a/bundles/org.eclipse.rap.jface.databinding/pom.xml b/bundles/org.eclipse.rap.jface.databinding/pom.xml
index 0919451..63e4a90 100644
--- a/bundles/org.eclipse.rap.jface.databinding/pom.xml
+++ b/bundles/org.eclipse.rap.jface.databinding/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.jface.databinding</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.rap.jface/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.jface/META-INF/MANIFEST.MF
index 2780854..63e0c63 100644
--- a/bundles/org.eclipse.rap.jface/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.jface/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rap.jface
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -34,7 +34,7 @@
  org.eclipse.jface.window,
  org.eclipse.jface.wizard,
  org.eclipse.jface.wizard.images
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)";visibility:=reexport,
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)";visibility:=reexport,
  org.eclipse.core.commands;bundle-version="[3.4.0,4.0.0)";visibility:=reexport,
  org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.rap.jface/pom.xml b/bundles/org.eclipse.rap.jface/pom.xml
index 73bc24c..1f80c0f 100644
--- a/bundles/org.eclipse.rap.jface/pom.xml
+++ b/bundles/org.eclipse.rap.jface/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.jface</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.rap.nebula.jface.gridviewer/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.nebula.jface.gridviewer/META-INF/MANIFEST.MF
index d3ddcda..93f6ecf 100644
--- a/bundles/org.eclipse.rap.nebula.jface.gridviewer/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.nebula.jface.gridviewer/META-INF/MANIFEST.MF
@@ -2,10 +2,10 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.nebula.jface.gridviewer
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.rap.nebula.widgets.grid;bundle-version="3.17.0",
- org.eclipse.rap.jface;bundle-version="[3.17.0,4.0.0)"
+Require-Bundle: org.eclipse.rap.nebula.widgets.grid;bundle-version="3.18.0",
+ org.eclipse.rap.jface;bundle-version="[3.18.0,4.0.0)"
 Export-Package: org.eclipse.nebula.jface.gridviewer
diff --git a/bundles/org.eclipse.rap.nebula.jface.gridviewer/pom.xml b/bundles/org.eclipse.rap.nebula.jface.gridviewer/pom.xml
index df76c56..a5e7117 100644
--- a/bundles/org.eclipse.rap.nebula.jface.gridviewer/pom.xml
+++ b/bundles/org.eclipse.rap.nebula.jface.gridviewer/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.nebula.jface.gridviewer</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.rap.nebula.widgets.grid/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.nebula.widgets.grid/META-INF/MANIFEST.MF
index 405162e..2f35c55 100644
--- a/bundles/org.eclipse.rap.nebula.widgets.grid/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.nebula.widgets.grid/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.rap.nebula.widgets.grid
-Bundle-Version: 3.17.0.qualifier
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)"
+Bundle-Version: 3.18.0.qualifier
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)"
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
diff --git a/bundles/org.eclipse.rap.nebula.widgets.grid/pom.xml b/bundles/org.eclipse.rap.nebula.widgets.grid/pom.xml
index 8f6e75d..bf3f671 100644
--- a/bundles/org.eclipse.rap.nebula.widgets.grid/pom.xml
+++ b/bundles/org.eclipse.rap.nebula.widgets.grid/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.nebula.widgets.grid</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.rap.nebula.widgets.richtext/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.nebula.widgets.richtext/META-INF/MANIFEST.MF
index 948b9b6..5466ff9 100644
--- a/bundles/org.eclipse.rap.nebula.widgets.richtext/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.nebula.widgets.richtext/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.nebula.widgets.richtext
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  javax.servlet.http;version="[3.1.0,5.0.0)"
-Export-Package: org.eclipse.nebula.widgets.richtext;version="3.17.0",
- org.eclipse.nebula.widgets.richtext.toolbar;version="3.17.0"
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)"
+Export-Package: org.eclipse.nebula.widgets.richtext;version="3.18.0",
+ org.eclipse.nebula.widgets.richtext.toolbar;version="3.18.0"
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)"
diff --git a/bundles/org.eclipse.rap.nebula.widgets.richtext/pom.xml b/bundles/org.eclipse.rap.nebula.widgets.richtext/pom.xml
index 0eba1bc..47d8bd4 100644
--- a/bundles/org.eclipse.rap.nebula.widgets.richtext/pom.xml
+++ b/bundles/org.eclipse.rap.nebula.widgets.richtext/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.nebula.widgets.richtext</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.rap.rwt.osgi/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.rwt.osgi/META-INF/MANIFEST.MF
index 477bed1..e4382f9 100644
--- a/bundles/org.eclipse.rap.rwt.osgi/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.rwt.osgi/META-INF/MANIFEST.MF
@@ -4,20 +4,20 @@
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-SymbolicName: org.eclipse.rap.rwt.osgi
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  javax.servlet.descriptor;version="[3.1.0,5.0.0)";resolution:=optional,
  javax.servlet.http;version="[3.1.0,5.0.0)",
- org.eclipse.rap.rwt.application;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.engine;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.internal.application;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.internal.lifecycle;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.service;version="[3.17.0,4.0.0)",
+ org.eclipse.rap.rwt.application;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.engine;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.internal.application;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.internal.lifecycle;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.service;version="[3.18.0,4.0.0)",
  org.osgi.framework;version="[1.3.0,2.0.0)",
  org.osgi.service.http;version="[1.2.0,2.0.0)",
  org.osgi.service.log;version="[1.3.0,2.0.0)",
  org.osgi.util.tracker;version="[1.4.0,2.0.0)"
 Bundle-Activator: org.eclipse.rap.rwt.osgi.internal.Activator
-Export-Package: org.eclipse.rap.rwt.osgi;version="3.17.0",
- org.eclipse.rap.rwt.osgi.internal;version="3.17.0";x-internal:=true
+Export-Package: org.eclipse.rap.rwt.osgi;version="3.18.0",
+ org.eclipse.rap.rwt.osgi.internal;version="3.18.0";x-internal:=true
diff --git a/bundles/org.eclipse.rap.rwt.osgi/pom.xml b/bundles/org.eclipse.rap.rwt.osgi/pom.xml
index cb35b1f..7a19ae6 100644
--- a/bundles/org.eclipse.rap.rwt.osgi/pom.xml
+++ b/bundles/org.eclipse.rap.rwt.osgi/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.osgi</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.rap.rwt/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.rwt/META-INF/MANIFEST.MF
index 13077ff..7727e6b 100644
--- a/bundles/org.eclipse.rap.rwt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.rwt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.rwt
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
@@ -13,39 +13,39 @@
  org.w3c.dom,
  org.xml.sax,
  org.xml.sax.helpers
-Export-Package: org.eclipse.rap.json;version="3.17.0",
- org.eclipse.rap.rwt;version="3.17.0",
+Export-Package: org.eclipse.rap.json;version="3.18.0",
+ org.eclipse.rap.rwt;version="3.18.0",
  org.eclipse.rap.rwt.apache.batik.css.parser;x-internal:=true,
  org.eclipse.rap.rwt.apache.batik.util.io;x-internal:=true,
- org.eclipse.rap.rwt.application;version="3.17.0",
- org.eclipse.rap.rwt.client;version="3.17.0",
- org.eclipse.rap.rwt.client.service;version="3.17.0",
- org.eclipse.rap.rwt.dnd;version="3.17.0",
- org.eclipse.rap.rwt.engine;version="3.17.0",
- org.eclipse.rap.rwt.internal;version="3.17.0";x-friends:="org.eclipse.rap.ui.workbench",
- org.eclipse.rap.rwt.internal.application;version="3.17.0";x-friends:="org.eclipse.rap.jface,org.eclipse.rap.ui.workbench",
- org.eclipse.rap.rwt.internal.client;version="3.17.0";x-internal:=true,
- org.eclipse.rap.rwt.internal.engine;version="3.17.0";x-friends:="org.eclipse.rap.jface,org.eclipse.rap.ui.workbench",
- org.eclipse.rap.rwt.internal.lifecycle;version="3.17.0";x-friends:="org.eclipse.rap.ui.workbench,org.eclipse.rap.jface",
- org.eclipse.rap.rwt.internal.protocol;version="3.17.0";x-internal:=true,
- org.eclipse.rap.rwt.internal.remote;version="3.17.0";x-internal:=true,
- org.eclipse.rap.rwt.internal.resources;version="3.17.0";x-friends:="org.eclipse.rap.ui.workbench",
- org.eclipse.rap.rwt.internal.scripting;version="3.17.0";x-internal:=true,
- org.eclipse.rap.rwt.internal.serverpush;version="3.17.0";x-friends:="org.eclipse.rap.jface,org.eclipse.rap.ui.workbench",
- org.eclipse.rap.rwt.internal.service;version="3.17.0";x-friends:="org.eclipse.rap.ui.workbench,org.eclipse.rap.ui,org.eclipse.rap.jface",
- org.eclipse.rap.rwt.internal.template;version="3.17.0";x-internal:=true,
- org.eclipse.rap.rwt.internal.textsize;version="3.17.0";x-friends:="org.eclipse.rap.ui.workbench,org.eclipse.rap.ui,org.eclipse.rap.jface",
- org.eclipse.rap.rwt.internal.theme;version="3.17.0";x-friends:="org.eclipse.rap.ui.workbench",
- org.eclipse.rap.rwt.internal.theme.css;version="3.17.0";x-friends:="org.eclipse.rap.ui.workbench",
- org.eclipse.rap.rwt.internal.util;version="3.17.0";x-friends:="org.eclipse.rap.ui.workbench",
- org.eclipse.rap.rwt.internal.widgets;version="3.17.0";x-internal:=true,
- org.eclipse.rap.rwt.internal.widgets.fileuploadkit;version="3.17.0";x-internal:=true,
- org.eclipse.rap.rwt.remote;version="3.17.0",
- org.eclipse.rap.rwt.scripting;version="3.17.0",
- org.eclipse.rap.rwt.service;version="3.17.0",
- org.eclipse.rap.rwt.template;version="3.17.0",
- org.eclipse.rap.rwt.theme;version="3.17.0",
- org.eclipse.rap.rwt.widgets;version="3.17.0",
+ org.eclipse.rap.rwt.application;version="3.18.0",
+ org.eclipse.rap.rwt.client;version="3.18.0",
+ org.eclipse.rap.rwt.client.service;version="3.18.0",
+ org.eclipse.rap.rwt.dnd;version="3.18.0",
+ org.eclipse.rap.rwt.engine;version="3.18.0",
+ org.eclipse.rap.rwt.internal;version="3.18.0";x-friends:="org.eclipse.rap.ui.workbench",
+ org.eclipse.rap.rwt.internal.application;version="3.18.0";x-friends:="org.eclipse.rap.jface,org.eclipse.rap.ui.workbench",
+ org.eclipse.rap.rwt.internal.client;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.rwt.internal.engine;version="3.18.0";x-friends:="org.eclipse.rap.jface,org.eclipse.rap.ui.workbench",
+ org.eclipse.rap.rwt.internal.lifecycle;version="3.18.0";x-friends:="org.eclipse.rap.ui.workbench,org.eclipse.rap.jface",
+ org.eclipse.rap.rwt.internal.protocol;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.rwt.internal.remote;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.rwt.internal.resources;version="3.18.0";x-friends:="org.eclipse.rap.ui.workbench",
+ org.eclipse.rap.rwt.internal.scripting;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.rwt.internal.serverpush;version="3.18.0";x-friends:="org.eclipse.rap.jface,org.eclipse.rap.ui.workbench",
+ org.eclipse.rap.rwt.internal.service;version="3.18.0";x-friends:="org.eclipse.rap.ui.workbench,org.eclipse.rap.ui,org.eclipse.rap.jface",
+ org.eclipse.rap.rwt.internal.template;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.rwt.internal.textsize;version="3.18.0";x-friends:="org.eclipse.rap.ui.workbench,org.eclipse.rap.ui,org.eclipse.rap.jface",
+ org.eclipse.rap.rwt.internal.theme;version="3.18.0";x-friends:="org.eclipse.rap.ui.workbench",
+ org.eclipse.rap.rwt.internal.theme.css;version="3.18.0";x-friends:="org.eclipse.rap.ui.workbench",
+ org.eclipse.rap.rwt.internal.util;version="3.18.0";x-friends:="org.eclipse.rap.ui.workbench",
+ org.eclipse.rap.rwt.internal.widgets;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.rwt.internal.widgets.fileuploadkit;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.rwt.remote;version="3.18.0",
+ org.eclipse.rap.rwt.scripting;version="3.18.0",
+ org.eclipse.rap.rwt.service;version="3.18.0",
+ org.eclipse.rap.rwt.template;version="3.18.0",
+ org.eclipse.rap.rwt.theme;version="3.18.0",
+ org.eclipse.rap.rwt.widgets;version="3.18.0",
  org.eclipse.swt,
  org.eclipse.swt.accessibility,
  org.eclipse.swt.browser,
diff --git a/bundles/org.eclipse.rap.rwt/pom.xml b/bundles/org.eclipse.rap.rwt/pom.xml
index 61c6ddc..f0cff01 100644
--- a/bundles/org.eclipse.rap.rwt/pom.xml
+++ b/bundles/org.eclipse.rap.rwt/pom.xml
@@ -18,13 +18,13 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
   <build>
     <plugins>
@@ -59,7 +59,7 @@
     <dependency>
       <groupId>org.eclipse.rap</groupId>
       <artifactId>org.eclipse.rap.clientbuilder</artifactId>
-      <version>3.17.0-SNAPSHOT</version>
+      <version>3.18.0-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
diff --git a/bundles/org.eclipse.rap.ui.cheatsheets/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.ui.cheatsheets/META-INF/MANIFEST.MF
index ac8f8a1..5894d12 100644
--- a/bundles/org.eclipse.rap.ui.cheatsheets/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.ui.cheatsheets/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %PLUGIN_NAME
 Bundle-SymbolicName: org.eclipse.rap.ui.cheatsheets;singleton:=true
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Activator: org.eclipse.ui.internal.cheatsheets.CheatSheetPlugin
 Bundle-Vendor: %PROVIDER_NAME
 Bundle-Localization: plugin
@@ -22,8 +22,8 @@
  org.eclipse.ui.internal.provisional.cheatsheets;x-friends:="org.eclipse.ua.tests"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.1.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="3.4.0",
- org.eclipse.rap.ui;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.ui.forms;bundle-version="[3.17.0,4.0.0)",
+ org.eclipse.rap.ui;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.ui.forms;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
 Eclipse-LazyStart: true
 Import-Package: com.ibm.icu.text,
diff --git a/bundles/org.eclipse.rap.ui.cheatsheets/pom.xml b/bundles/org.eclipse.rap.ui.cheatsheets/pom.xml
index 6841f49..7072b66 100644
--- a/bundles/org.eclipse.rap.ui.cheatsheets/pom.xml
+++ b/bundles/org.eclipse.rap.ui.cheatsheets/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.ui.cheatsheets</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.rap.ui.forms/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.ui.forms/META-INF/MANIFEST.MF
index a5dc6ea..7070b0e 100644
--- a/bundles/org.eclipse.rap.ui.forms/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.ui.forms/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %name
 Bundle-SymbolicName: org.eclipse.rap.ui.forms;singleton:=true
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: %provider-name
 Bundle-Localization: plugin
 Export-Package: org.eclipse.ui.forms,
@@ -12,8 +12,8 @@
  org.eclipse.ui.internal.forms;x-internal:=true,
  org.eclipse.ui.internal.forms.widgets;x-internal:=true
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.rap.jface;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.ui;bundle-version="[3.17.0,4.0.0)"
+ org.eclipse.rap.jface;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.ui;bundle-version="[3.18.0,4.0.0)"
 Eclipse-LazyStart: true
 Import-Package: com.ibm.icu.text,
  javax.xml.parsers,
diff --git a/bundles/org.eclipse.rap.ui.forms/pom.xml b/bundles/org.eclipse.rap.ui.forms/pom.xml
index 5eca271..3283f33 100644
--- a/bundles/org.eclipse.rap.ui.forms/pom.xml
+++ b/bundles/org.eclipse.rap.ui.forms/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.ui.forms</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.rap.ui.views/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.ui.views/META-INF/MANIFEST.MF
index 5514124..67627d5 100644
--- a/bundles/org.eclipse.rap.ui.views/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.ui.views/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rap.ui.views; singleton:=true
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.ui.internal.views.ViewsPlugin
 Bundle-Vendor: %providerName
@@ -13,7 +13,7 @@
  org.eclipse.ui.views.contentoutline,
  org.eclipse.ui.views.properties; ui.views="split"; mandatory:="ui.views"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.rap.ui;bundle-version="[3.17.0,4.0.0)",
+ org.eclipse.rap.ui;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Eclipse-LazyStart: true
diff --git a/bundles/org.eclipse.rap.ui.views/pom.xml b/bundles/org.eclipse.rap.ui.views/pom.xml
index ac6df70..2575f09 100644
--- a/bundles/org.eclipse.rap.ui.views/pom.xml
+++ b/bundles/org.eclipse.rap.ui.views/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.ui.views</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.rap.ui.workbench/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.ui.workbench/META-INF/MANIFEST.MF
index dddfe02..f0848d4 100644
--- a/bundles/org.eclipse.rap.ui.workbench/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.ui.workbench/META-INF/MANIFEST.MF
@@ -2,23 +2,23 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.rap.ui.workbench;singleton:=true
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.ui.internal.WorkbenchPlugin
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package:  org.eclipse.rap.ui.resources;version="3.17.0",
- org.eclipse.rap.ui.interactiondesign;version="3.17.0",
- org.eclipse.rap.ui.interactiondesign.internal;version="3.17.0";x-friends:="org.eclipse.rap.ui.tests",
- org.eclipse.rap.ui.interactiondesign.layout;version="3.17.0",
- org.eclipse.rap.ui.interactiondesign.layout.model;version="3.17.0",
- org.eclipse.rap.ui.internal;version="3.17.0";x-internal:=true,
- org.eclipse.rap.ui.internal.application;version="3.17.0";x-internal:=true,
- org.eclipse.rap.ui.internal.branding;version="3.17.0";x-internal:=true,
- org.eclipse.rap.ui.internal.preferences;version="3.17.0";x-internal:=true,
- org.eclipse.rap.ui.internal.progress;version="3.17.0";x-internal:=true,
- org.eclipse.rap.ui.internal.servlet;version="3.17.0";x-internal:=true,
+Export-Package:  org.eclipse.rap.ui.resources;version="3.18.0",
+ org.eclipse.rap.ui.interactiondesign;version="3.18.0",
+ org.eclipse.rap.ui.interactiondesign.internal;version="3.18.0";x-friends:="org.eclipse.rap.ui.tests",
+ org.eclipse.rap.ui.interactiondesign.layout;version="3.18.0",
+ org.eclipse.rap.ui.interactiondesign.layout.model;version="3.18.0",
+ org.eclipse.rap.ui.internal;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.ui.internal.application;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.ui.internal.branding;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.ui.internal.preferences;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.ui.internal.progress;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.ui.internal.servlet;version="3.18.0";x-internal:=true,
  org.eclipse.ui;ui.workbench=split;mandatory:="ui.workbench",
  org.eclipse.ui.about,
  org.eclipse.ui.actions;ui.workbench=split;mandatory:="ui.workbench",
@@ -96,12 +96,12 @@
  org.eclipse.ui.views,
  org.eclipse.ui.wizards
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
- org.eclipse.rap.jface;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)",
+ org.eclipse.rap.jface;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.help;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.equinox.http.registry,
- org.eclipse.rap.jface.databinding;bundle-version="[3.17.0,4.0.0)",
+ org.eclipse.rap.jface.databinding;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.core.databinding.property;bundle-version="[1.2.0,2.0.0)",
  org.eclipse.core.databinding.observable;bundle-version="[1.2.0,2.0.0)"
 Import-Package: com.ibm.icu.text,
@@ -109,7 +109,7 @@
  javax.servlet;version="[3.1.0,5.0.0)",
  javax.servlet.http;version="[3.1.0,5.0.0)",
  javax.xml.parsers,
- org.eclipse.rap.rwt.osgi;version="[3.17.0,4.0.0)",
+ org.eclipse.rap.rwt.osgi;version="[3.18.0,4.0.0)",
  org.osgi.service.event;version="1.3.0",
  org.osgi.service.http;version="[1.2.0,2.0.0)",
  org.w3c.dom,
diff --git a/bundles/org.eclipse.rap.ui.workbench/pom.xml b/bundles/org.eclipse.rap.ui.workbench/pom.xml
index 0d2e08b..60b6507 100644
--- a/bundles/org.eclipse.rap.ui.workbench/pom.xml
+++ b/bundles/org.eclipse.rap.ui.workbench/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.ui.workbench</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/bundles/org.eclipse.rap.ui/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.ui/META-INF/MANIFEST.MF
index cdebe84..e5425de 100644
--- a/bundles/org.eclipse.rap.ui/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Plugin.name
 Bundle-SymbolicName: org.eclipse.rap.ui; singleton:=true
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.ui.internal.UIPlugin
 Bundle-ActivationPolicy: lazy
@@ -13,8 +13,8 @@
  org.osgi.service.http;version="[1.2.0,2.0.0)"
 Export-Package: org.eclipse.ui.internal;x-friends:="org.eclipse.rap.ui"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)";visibility:=reexport,
- org.eclipse.rap.jface;bundle-version="[3.17.0,4.0.0)";visibility:=reexport,
- org.eclipse.rap.ui.workbench;bundle-version="[3.17.0,4.0.0)";visibility:=reexport,
+ org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)";visibility:=reexport,
+ org.eclipse.rap.jface;bundle-version="[3.18.0,4.0.0)";visibility:=reexport,
+ org.eclipse.rap.ui.workbench;bundle-version="[3.18.0,4.0.0)";visibility:=reexport,
  org.eclipse.core.expressions;bundle-version="[3.5.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/bundles/org.eclipse.rap.ui/pom.xml b/bundles/org.eclipse.rap.ui/pom.xml
index 84c47b3..8485f29 100644
--- a/bundles/org.eclipse.rap.ui/pom.xml
+++ b/bundles/org.eclipse.rap.ui/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.ui</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/examples/org.eclipse.rap.demo.controls/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.demo.controls/META-INF/MANIFEST.MF
index 05380f2..b8f2009 100644
--- a/examples/org.eclipse.rap.demo.controls/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.demo.controls/META-INF/MANIFEST.MF
@@ -3,16 +3,16 @@
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.rap.demo.controls;singleton:=true
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet.http;version="[3.1.0,5.0.0)",
  org.eclipse.core.runtime.jobs
-Export-Package: org.eclipse.rap.demo.controls;version="3.17.0",
- org.eclipse.rap.demo.controls.internal;version="3.17.0";x-internal:=true
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.jface;bundle-version="[3.17.0,4.0.0)",
+Export-Package: org.eclipse.rap.demo.controls;version="3.18.0",
+ org.eclipse.rap.demo.controls.internal;version="3.18.0";x-internal:=true
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.jface;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.rap.nebula.widgets.grid;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.nebula.widgets.richtext;bundle-version="[3.17.0,4.0.0)"
+ org.eclipse.rap.nebula.widgets.grid;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.nebula.widgets.richtext;bundle-version="[3.18.0,4.0.0)"
 Service-Component: OSGI-INF/contribution.xml
diff --git a/examples/org.eclipse.rap.demo.controls/pom.xml b/examples/org.eclipse.rap.demo.controls/pom.xml
index 0a84d60..570a8c2 100644
--- a/examples/org.eclipse.rap.demo.controls/pom.xml
+++ b/examples/org.eclipse.rap.demo.controls/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.demo.controls</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/examples/org.eclipse.rap.demo.databinding/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.demo.databinding/META-INF/MANIFEST.MF
index 57b809f..975df26 100644
--- a/examples/org.eclipse.rap.demo.databinding/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.demo.databinding/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.demo.databinding;singleton:=true
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.rap.jface.databinding;bundle-version="[3.17.0,4.0.0)",
+Require-Bundle: org.eclipse.rap.jface.databinding;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.core.databinding,
  org.eclipse.core.databinding.beans,
- org.eclipse.rap.ui;bundle-version="[3.17.0,4.0.0)"
+ org.eclipse.rap.ui;bundle-version="[3.18.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
-Export-Package: org.eclipse.rap.demo.databinding;version="3.17.0";x-internal:=true,
- org.eclipse.rap.demo.databinding.nestedselection;version="3.17.0";x-internal:=true
+Export-Package: org.eclipse.rap.demo.databinding;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.demo.databinding.nestedselection;version="3.18.0";x-internal:=true
diff --git a/examples/org.eclipse.rap.demo.databinding/pom.xml b/examples/org.eclipse.rap.demo.databinding/pom.xml
index 904fe50..57397b3 100644
--- a/examples/org.eclipse.rap.demo.databinding/pom.xml
+++ b/examples/org.eclipse.rap.demo.databinding/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.demo.databinding</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/examples/org.eclipse.rap.demo/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.demo/META-INF/MANIFEST.MF
index 34e1df2..1f5cc8d 100644
--- a/examples/org.eclipse.rap.demo/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.demo/META-INF/MANIFEST.MF
@@ -3,15 +3,15 @@
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.rap.demo;singleton:=true
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.rap.ui;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.ui.views;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.ui.forms;bundle-version="[3.17.0,4.0.0)"
+Require-Bundle: org.eclipse.rap.ui;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.ui.views;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.ui.forms;bundle-version="[3.18.0,4.0.0)"
 Import-Package: javax.servlet.http;version="[3.1.0,5.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.rap.demo;version="3.17.0";x-internal:=true,
- org.eclipse.rap.demo.actions;version="3.17.0";x-internal:=true,
- org.eclipse.rap.demo.editor;version="3.17.0";x-internal:=true,
- org.eclipse.rap.demo.presentation;version="3.17.0";x-internal:=true,
- org.eclipse.rap.demo.wizard;version="3.17.0";x-internal:=true
+Export-Package: org.eclipse.rap.demo;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.demo.actions;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.demo.editor;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.demo.presentation;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.demo.wizard;version="3.18.0";x-internal:=true
diff --git a/examples/org.eclipse.rap.demo/pom.xml b/examples/org.eclipse.rap.demo/pom.xml
index f994d24..e59050f 100644
--- a/examples/org.eclipse.rap.demo/pom.xml
+++ b/examples/org.eclipse.rap.demo/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.demo</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/examples/org.eclipse.rap.design.example/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.design.example/META-INF/MANIFEST.MF
index 43bac4e..6a384f1 100644
--- a/examples/org.eclipse.rap.design.example/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.design.example/META-INF/MANIFEST.MF
@@ -2,19 +2,19 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.design.example;singleton:=true
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.rap.ui;bundle-version="[3.17.0,4.0.0)"
+Require-Bundle: org.eclipse.rap.ui;bundle-version="[3.18.0,4.0.0)"
 Bundle-Localization: plugin
-Export-Package: org.eclipse.rap.internal.design.example;version="3.17.0";x-internal:=true,
- org.eclipse.rap.internal.design.example.builder;version="3.17.0";x-internal:=true,
- org.eclipse.rap.internal.design.example.business;version="3.17.0";x-internal:=true,
- org.eclipse.rap.internal.design.example.business.builder;version="3.17.0";x-internal:=true,
- org.eclipse.rap.internal.design.example.business.layoutsets;version="3.17.0";x-internal:=true,
- org.eclipse.rap.internal.design.example.fancy;version="3.17.0";x-internal:=true,
- org.eclipse.rap.internal.design.example.fancy.builder;version="3.17.0";x-internal:=true,
- org.eclipse.rap.internal.design.example.fancy.layoutsets;version="3.17.0";x-internal:=true,
- org.eclipse.rap.internal.design.example.managers;version="3.17.0";x-internal:=true,
- org.eclipse.rap.internal.design.example.stacks;version="3.17.0";x-internal:=true
+Export-Package: org.eclipse.rap.internal.design.example;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.internal.design.example.builder;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.internal.design.example.business;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.internal.design.example.business.builder;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.internal.design.example.business.layoutsets;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.internal.design.example.fancy;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.internal.design.example.fancy.builder;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.internal.design.example.fancy.layoutsets;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.internal.design.example.managers;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.internal.design.example.stacks;version="3.18.0";x-internal:=true
 Bundle-ClassPath: .
diff --git a/examples/org.eclipse.rap.design.example/pom.xml b/examples/org.eclipse.rap.design.example/pom.xml
index 589dcfa..90cd784 100644
--- a/examples/org.eclipse.rap.design.example/pom.xml
+++ b/examples/org.eclipse.rap.design.example/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.design.example</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/examples/org.eclipse.rap.e4.demo/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.e4.demo/META-INF/MANIFEST.MF
index 0a162d4..2247258 100644
--- a/examples/org.eclipse.rap.e4.demo/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.e4.demo/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2

 Bundle-Name: RAP E4 Demo

 Bundle-SymbolicName: org.eclipse.rap.e4.demo

-Bundle-Version: 3.17.0.qualifier

+Bundle-Version: 3.18.0.qualifier

 Bundle-Vendor: Eclipse.org - RAP

 Bundle-RequiredExecutionEnvironment: JavaSE-11

 Bundle-ClassPath: .

-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)",

- org.eclipse.rap.e4;bundle-version="[3.17.0,4.0.0)",

- org.eclipse.rap.jface;bundle-version="[3.17.0,4.0.0)",

+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)",

+ org.eclipse.rap.e4;bundle-version="[3.18.0,4.0.0)",

+ org.eclipse.rap.jface;bundle-version="[3.18.0,4.0.0)",

  org.eclipse.equinox.common,

  org.eclipse.e4.core.di,

  org.eclipse.e4.core.di.extensions,

diff --git a/examples/org.eclipse.rap.e4.demo/pom.xml b/examples/org.eclipse.rap.e4.demo/pom.xml
index 64d2c38..c7f9399 100644
--- a/examples/org.eclipse.rap.e4.demo/pom.xml
+++ b/examples/org.eclipse.rap.e4.demo/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.e4.demo</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/examples/org.eclipse.rap.examples.pages/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.examples.pages/META-INF/MANIFEST.MF
index 665e2e8..bb61bc2 100644
--- a/examples/org.eclipse.rap.examples.pages/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.examples.pages/META-INF/MANIFEST.MF
@@ -1,18 +1,18 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.rap.examples.pages
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.jface;bundle-version="[3.17.0,4.0.0)",
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.jface;bundle-version="[3.18.0,4.0.0)",
  org.eclipse.equinox.common;bundle-version="[3.2.0,4.0.0)"
-Export-Package: org.eclipse.rap.examples.pages;version="3.17.0",
- org.eclipse.rap.examples.pages.internal;version="3.17.0";x-internal:=true
+Export-Package: org.eclipse.rap.examples.pages;version="3.18.0",
+ org.eclipse.rap.examples.pages.internal;version="3.18.0";x-internal:=true
 Bundle-Activator: org.eclipse.rap.examples.pages.internal.Activator
 Import-Package: javax.servlet.http;version="[3.1.0,5.0.0)",
- org.eclipse.rap.examples;version="[3.17.0,4.0.0)",
+ org.eclipse.rap.examples;version="[3.18.0,4.0.0)",
  org.osgi.framework;version="[1.6.0,2.0.0)"
diff --git a/examples/org.eclipse.rap.examples.pages/pom.xml b/examples/org.eclipse.rap.examples.pages/pom.xml
index 7e57070..c23a6ce 100644
--- a/examples/org.eclipse.rap.examples.pages/pom.xml
+++ b/examples/org.eclipse.rap.examples.pages/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.examples.pages</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/examples/org.eclipse.rap.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.examples/META-INF/MANIFEST.MF
index 35e9eda..f57f367 100644
--- a/examples/org.eclipse.rap.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.examples/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.rap.examples
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Activator: org.eclipse.rap.examples.internal.Activator
@@ -12,6 +12,6 @@
  javax.servlet.http;version="[3.1.0,5.0.0)",
  org.osgi.framework;version="[1.6.0,2.0.0)",
  org.osgi.util.tracker;version="[1.5.0,2.0.0)"
-Export-Package: org.eclipse.rap.examples;version="3.17.0",
- org.eclipse.rap.examples.internal;version="3.17.0";x-internal:=true
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)"
+Export-Package: org.eclipse.rap.examples;version="3.18.0",
+ org.eclipse.rap.examples.internal;version="3.18.0";x-internal:=true
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)"
diff --git a/examples/org.eclipse.rap.examples/pom.xml b/examples/org.eclipse.rap.examples/pom.xml
index cc3972d..acb883f 100644
--- a/examples/org.eclipse.rap.examples/pom.xml
+++ b/examples/org.eclipse.rap.examples/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.examples</artifactId>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <build>
diff --git a/examples/org.eclipse.rap.filedialog.demo.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.filedialog.demo.examples/META-INF/MANIFEST.MF
index b41e59b..fc31281 100644
--- a/examples/org.eclipse.rap.filedialog.demo.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.filedialog.demo.examples/META-INF/MANIFEST.MF
@@ -1,17 +1,17 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-SymbolicName: org.eclipse.rap.filedialog.demo.examples
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  javax.servlet.http;version="[3.1.0,5.0.0)",
- org.eclipse.rap.fileupload;version="[3.17.0,4.0.0)",
+ org.eclipse.rap.fileupload;version="[3.18.0,4.0.0)",
  org.osgi.framework;version="1.3.0"
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.examples;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.filedialog;bundle-version="[3.17.0,4.0.0)"
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.examples;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.filedialog;bundle-version="[3.18.0,4.0.0)"
 Bundle-Localization: plugin
 Bundle-Activator: org.eclipse.rap.filedialog.demo.examples.Activator
-Export-Package: org.eclipse.rap.filedialog.demo.examples;version="3.17.0"
+Export-Package: org.eclipse.rap.filedialog.demo.examples;version="3.18.0"
diff --git a/examples/org.eclipse.rap.filedialog.demo.examples/pom.xml b/examples/org.eclipse.rap.filedialog.demo.examples/pom.xml
index 5a31697..1a7fde4 100644
--- a/examples/org.eclipse.rap.filedialog.demo.examples/pom.xml
+++ b/examples/org.eclipse.rap.filedialog.demo.examples/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.filedialog.demo.examples</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/examples/org.eclipse.rap.nebula.widgets.grid.demo.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.nebula.widgets.grid.demo.examples/META-INF/MANIFEST.MF
index 82263e0..1111549 100644
--- a/examples/org.eclipse.rap.nebula.widgets.grid.demo.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.nebula.widgets.grid.demo.examples/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.nebula.widgets.grid.demo.examples
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Activator: org.eclipse.rap.nebula.widget.grid.demo.examples.Activator
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="3.17.0",
- org.eclipse.rap.examples;bundle-version="3.17.0",
- org.eclipse.rap.nebula.widgets.grid;bundle-version="3.17.0"
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="3.18.0",
+ org.eclipse.rap.examples;bundle-version="3.18.0",
+ org.eclipse.rap.nebula.widgets.grid;bundle-version="3.18.0"
 Export-Package: org.eclipse.rap.nebula.widget.grid.demo.examples
diff --git a/examples/org.eclipse.rap.nebula.widgets.grid.demo.examples/pom.xml b/examples/org.eclipse.rap.nebula.widgets.grid.demo.examples/pom.xml
index c34b2a6..ed4a96c 100644
--- a/examples/org.eclipse.rap.nebula.widgets.grid.demo.examples/pom.xml
+++ b/examples/org.eclipse.rap.nebula.widgets.grid.demo.examples/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.nebula.widgets.grid.demo.examples</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/examples/org.eclipse.rap.nebula.widgets.richtext.demo.examples/META-INF/MANIFEST.MF b/examples/org.eclipse.rap.nebula.widgets.richtext.demo.examples/META-INF/MANIFEST.MF
index cce66c4..96921aa 100644
--- a/examples/org.eclipse.rap.nebula.widgets.richtext.demo.examples/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.rap.nebula.widgets.richtext.demo.examples/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.nebula.widgets.richtext.demo.examples
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Activator: org.eclipse.rap.nebula.widgets.richtext.demo.examples.Activator
 Import-Package: org.eclipse.nebula.widgets.richtext;version="[3.2.0,4.0.0)",
  org.osgi.framework;version="1.7.0"
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.examples;bundle-version="[3.17.0,4.0.0)"
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.examples;bundle-version="[3.18.0,4.0.0)"
diff --git a/examples/org.eclipse.rap.nebula.widgets.richtext.demo.examples/pom.xml b/examples/org.eclipse.rap.nebula.widgets.richtext.demo.examples/pom.xml
index fe29dd7..25a87b9 100644
--- a/examples/org.eclipse.rap.nebula.widgets.richtext.demo.examples/pom.xml
+++ b/examples/org.eclipse.rap.nebula.widgets.richtext.demo.examples/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.nebula.widgets.richtext.demo.examples</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/features/org.eclipse.rap.e4.equinox.target.feature/feature.xml b/features/org.eclipse.rap.e4.equinox.target.feature/feature.xml
index 319c4ae..2072501 100644
--- a/features/org.eclipse.rap.e4.equinox.target.feature/feature.xml
+++ b/features/org.eclipse.rap.e4.equinox.target.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rap.e4.equinox.target.feature"
       label="RAP Basic E4 Equinox Target"
-      version="3.17.0.qualifier"
+      version="3.18.0.qualifier"
       provider-name="Eclipse.org - RAP"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -20,7 +20,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rap.e4.feature" version="3.17.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rap.e4.feature" version="3.18.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.rap.e4.equinox.target.feature/pom.xml b/features/org.eclipse.rap.e4.equinox.target.feature/pom.xml
index 6d65f36..cf733db 100644
--- a/features/org.eclipse.rap.e4.equinox.target.feature/pom.xml
+++ b/features/org.eclipse.rap.e4.equinox.target.feature/pom.xml
@@ -17,13 +17,13 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.e4.equinox.target.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
   <repositories>
     <repository>
diff --git a/features/org.eclipse.rap.e4.examples.feature/feature.xml b/features/org.eclipse.rap.e4.examples.feature/feature.xml
index c1fbfd2..e65d58b 100644
--- a/features/org.eclipse.rap.e4.examples.feature/feature.xml
+++ b/features/org.eclipse.rap.e4.examples.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rap.e4.examples.feature"
       label="RAP E4 Examples"
-      version="3.17.0.qualifier"
+      version="3.18.0.qualifier"
       provider-name="Eclipse.org - RAP"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -20,7 +20,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rap.e4.feature" version="3.17.0" match="compatible"/>
+      <import feature="org.eclipse.rap.e4.feature" version="3.18.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.rap.e4.examples.feature/pom.xml b/features/org.eclipse.rap.e4.examples.feature/pom.xml
index fbf5c51..937b6e8 100644
--- a/features/org.eclipse.rap.e4.examples.feature/pom.xml
+++ b/features/org.eclipse.rap.e4.examples.feature/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.e4.examples.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/features/org.eclipse.rap.e4.feature/feature.xml b/features/org.eclipse.rap.e4.feature/feature.xml
index 3294435..10562fc 100644
--- a/features/org.eclipse.rap.e4.feature/feature.xml
+++ b/features/org.eclipse.rap.e4.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rap.e4.feature"
       label="RAP E4 Runtime"
-      version="3.17.0.qualifier"
+      version="3.18.0.qualifier"
       provider-name="Eclipse.org - RAP"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.rap.e4.feature/pom.xml b/features/org.eclipse.rap.e4.feature/pom.xml
index 13d5499..3390112 100644
--- a/features/org.eclipse.rap.e4.feature/pom.xml
+++ b/features/org.eclipse.rap.e4.feature/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.e4.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/features/org.eclipse.rap.e4.sdk.feature/feature.xml b/features/org.eclipse.rap.e4.sdk.feature/feature.xml
index 1bae502..24a2ff6 100644
--- a/features/org.eclipse.rap.e4.sdk.feature/feature.xml
+++ b/features/org.eclipse.rap.e4.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rap.e4.sdk.feature"
       label="RAP E4 SDK"
-      version="3.17.0.qualifier"
+      version="3.18.0.qualifier"
       provider-name="Eclipse.org - RAP"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.rap.e4.sdk.feature/pom.xml b/features/org.eclipse.rap.e4.sdk.feature/pom.xml
index 3ac98f7..3b76380 100644
--- a/features/org.eclipse.rap.e4.sdk.feature/pom.xml
+++ b/features/org.eclipse.rap.e4.sdk.feature/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.e4.sdk.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/features/org.eclipse.rap.equinox.target.feature/feature.xml b/features/org.eclipse.rap.equinox.target.feature/feature.xml
index ec90542..0da928f 100644
--- a/features/org.eclipse.rap.equinox.target.feature/feature.xml
+++ b/features/org.eclipse.rap.equinox.target.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rap.equinox.target.feature"
       label="RAP Basic Equinox Target"
-      version="3.17.0.qualifier"
+      version="3.18.0.qualifier"
       provider-name="Eclipse.org - RAP"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -20,7 +20,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rap.feature" version="3.17.0" match="greaterOrEqual"/>
+      <import feature="org.eclipse.rap.feature" version="3.18.0" match="greaterOrEqual"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.rap.equinox.target.feature/pom.xml b/features/org.eclipse.rap.equinox.target.feature/pom.xml
index ea94b7d..42c4fa1 100644
--- a/features/org.eclipse.rap.equinox.target.feature/pom.xml
+++ b/features/org.eclipse.rap.equinox.target.feature/pom.xml
@@ -17,13 +17,13 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.equinox.target.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
   <repositories>
     <repository>
diff --git a/features/org.eclipse.rap.examples.feature/feature.xml b/features/org.eclipse.rap.examples.feature/feature.xml
index 3570af1..4946492 100644
--- a/features/org.eclipse.rap.examples.feature/feature.xml
+++ b/features/org.eclipse.rap.examples.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rap.examples.feature"
       label="RAP Examples"
-      version="3.17.0.qualifier"
+      version="3.18.0.qualifier"
       provider-name="Eclipse.org - RAP"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
@@ -20,7 +20,7 @@
    </license>
 
    <requires>
-      <import feature="org.eclipse.rap.feature" version="3.17.0" match="compatible"/>
+      <import feature="org.eclipse.rap.feature" version="3.18.0" match="compatible"/>
    </requires>
 
    <plugin
diff --git a/features/org.eclipse.rap.examples.feature/pom.xml b/features/org.eclipse.rap.examples.feature/pom.xml
index 00982ae..3e35b9e 100644
--- a/features/org.eclipse.rap.examples.feature/pom.xml
+++ b/features/org.eclipse.rap.examples.feature/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.examples.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/features/org.eclipse.rap.feature/feature.xml b/features/org.eclipse.rap.feature/feature.xml
index a3937ff..62ce011 100644
--- a/features/org.eclipse.rap.feature/feature.xml
+++ b/features/org.eclipse.rap.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rap.feature"
       label="RAP Runtime"
-      version="3.17.0.qualifier"
+      version="3.18.0.qualifier"
       provider-name="Eclipse.org - RAP"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.rap.feature/pom.xml b/features/org.eclipse.rap.feature/pom.xml
index cd901b3..e05c3ea 100644
--- a/features/org.eclipse.rap.feature/pom.xml
+++ b/features/org.eclipse.rap.feature/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/features/org.eclipse.rap.sdk.feature/feature.xml b/features/org.eclipse.rap.sdk.feature/feature.xml
index 174886e..3f042d8 100644
--- a/features/org.eclipse.rap.sdk.feature/feature.xml
+++ b/features/org.eclipse.rap.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.rap.sdk.feature"
       label="RAP SDK"
-      version="3.17.0.qualifier"
+      version="3.18.0.qualifier"
       provider-name="Eclipse.org - RAP"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.rap.sdk.feature/pom.xml b/features/org.eclipse.rap.sdk.feature/pom.xml
index 608dc8f..cdbdc31 100644
--- a/features/org.eclipse.rap.sdk.feature/pom.xml
+++ b/features/org.eclipse.rap.sdk.feature/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.sdk.feature</artifactId>
   <packaging>eclipse-feature</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/pom.xml b/pom.xml
index bd42ef3..94f2fe3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
   <groupId>org.eclipse.rap</groupId>
   <artifactId>org.eclipse.rap.runtime-build</artifactId>
   <packaging>pom</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
   <modules>
     <!-- Runtime projects -->
diff --git a/releng/org.eclipse.rap.build/pom.xml b/releng/org.eclipse.rap.build/pom.xml
index fb344a0..463d1b2 100644
--- a/releng/org.eclipse.rap.build/pom.xml
+++ b/releng/org.eclipse.rap.build/pom.xml
@@ -16,7 +16,7 @@
 
   <groupId>org.eclipse.rap</groupId>
   <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/releng/org.eclipse.rap.build/repository.e4/category.xml b/releng/org.eclipse.rap.build/repository.e4/category.xml
index 4218fb8..1062a98 100644
--- a/releng/org.eclipse.rap.build/repository.e4/category.xml
+++ b/releng/org.eclipse.rap.build/repository.e4/category.xml
@@ -11,34 +11,34 @@
 -->
 <site>
    <stats location="http://download.eclipse.org/stats/rt/rap">
-      <feature url="features/org.eclipse.rap.e4.equinox.target.feature_3.17.0.qualifier.jar" id="org.eclipse.rap.e4.equinox.target.feature" version="3.17.0.qualifier"/>
-      <feature url="features/org.eclipse.rap.e4.examples.feature_3.17.0.qualifier.jar" id="org.eclipse.rap.e4.examples.feature" version="3.17.0.qualifier"/>
-      <feature url="features/org.eclipse.rap.e4.feature_3.17.0.qualifier.jar" id="org.eclipse.rap.e4.feature" version="3.17.0.qualifier"/>
-      <feature url="features/org.eclipse.rap.e4.sdk.feature_3.17.0.qualifier.jar" id="org.eclipse.rap.e4.sdk.feature" version="3.17.0.qualifier"/>
-      <bundle id="org.eclipse.rap.e4" version="3.17.0.qualifier"/>
+      <feature url="features/org.eclipse.rap.e4.equinox.target.feature_3.18.0.qualifier.jar" id="org.eclipse.rap.e4.equinox.target.feature" version="3.18.0.qualifier"/>
+      <feature url="features/org.eclipse.rap.e4.examples.feature_3.18.0.qualifier.jar" id="org.eclipse.rap.e4.examples.feature" version="3.18.0.qualifier"/>
+      <feature url="features/org.eclipse.rap.e4.feature_3.18.0.qualifier.jar" id="org.eclipse.rap.e4.feature" version="3.18.0.qualifier"/>
+      <feature url="features/org.eclipse.rap.e4.sdk.feature_3.18.0.qualifier.jar" id="org.eclipse.rap.e4.sdk.feature" version="3.18.0.qualifier"/>
+      <bundle id="org.eclipse.rap.e4" version="3.18.0.qualifier"/>
    </stats>
 
   <feature url="http://eclipse.org/rap"
       id="org.eclipse.rap.e4.feature"
-      version="3.17.0.qualifier">
+      version="3.18.0.qualifier">
     <category name="org.eclipse.rap.e4.category"/>
   </feature>
 
   <feature url="http://eclipse.org/rap"
       id="org.eclipse.rap.e4.sdk.feature"
-      version="3.17.0.qualifier">
+      version="3.18.0.qualifier">
     <category name="org.eclipse.rap.e4.category"/>
   </feature>
 
   <feature url="http://eclipse.org/rap"
       id="org.eclipse.rap.e4.examples.feature"
-      version="3.17.0.qualifier">
+      version="3.18.0.qualifier">
     <category name="org.eclipse.rap.e4.category"/>
   </feature>
 
   <feature url="http://eclipse.org/rap"
       id="org.eclipse.rap.e4.equinox.target.feature"
-      version="3.17.0.qualifier">
+      version="3.18.0.qualifier">
     <category name="org.eclipse.rap.e4.category"/>
   </feature>
 
diff --git a/releng/org.eclipse.rap.build/repository.e4/pom.xml b/releng/org.eclipse.rap.build/repository.e4/pom.xml
index 59d423f..50eb90b 100644
--- a/releng/org.eclipse.rap.build/repository.e4/pom.xml
+++ b/releng/org.eclipse.rap.build/repository.e4/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rap.runtime-aggregation-repository-e4</artifactId>
   <packaging>eclipse-repository</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
   <repositories>
     <repository>
diff --git a/releng/org.eclipse.rap.build/repository/category.xml b/releng/org.eclipse.rap.build/repository/category.xml
index c7f6659..c9f1fa6 100644
--- a/releng/org.eclipse.rap.build/repository/category.xml
+++ b/releng/org.eclipse.rap.build/repository/category.xml
@@ -11,36 +11,36 @@
 -->
 <site>
    <stats location="http://download.eclipse.org/stats/rt/rap">
-      <feature url="features/org.eclipse.rap.equinox.target.feature_3.17.0.qualifier.jar" id="org.eclipse.rap.equinox.target.feature" version="3.17.0.qualifier"/>
-      <feature url="features/org.eclipse.rap.examples.feature_3.17.0.qualifier.jar" id="org.eclipse.rap.examples.feature" version="3.17.0.qualifier"/>
-      <feature url="features/org.eclipse.rap.feature_3.17.0.qualifier.jar" id="org.eclipse.rap.feature" version="3.17.0.qualifier"/>
-      <feature url="features/org.eclipse.rap.sdk.feature_3.17.0.qualifier.jar" id="org.eclipse.rap.sdk.feature" version="3.17.0.qualifier"/>
-      <bundle id="org.eclipse.rap.rwt" version="3.17.0.qualifier"/>
-      <bundle id="org.eclipse.rap.rwt.osgi" version="3.17.0.qualifier"/>
-      <bundle id="org.eclipse.rap.ui" version="3.17.0.qualifier"/>
+      <feature url="features/org.eclipse.rap.equinox.target.feature_3.18.0.qualifier.jar" id="org.eclipse.rap.equinox.target.feature" version="3.18.0.qualifier"/>
+      <feature url="features/org.eclipse.rap.examples.feature_3.18.0.qualifier.jar" id="org.eclipse.rap.examples.feature" version="3.18.0.qualifier"/>
+      <feature url="features/org.eclipse.rap.feature_3.18.0.qualifier.jar" id="org.eclipse.rap.feature" version="3.18.0.qualifier"/>
+      <feature url="features/org.eclipse.rap.sdk.feature_3.18.0.qualifier.jar" id="org.eclipse.rap.sdk.feature" version="3.18.0.qualifier"/>
+      <bundle id="org.eclipse.rap.rwt" version="3.18.0.qualifier"/>
+      <bundle id="org.eclipse.rap.rwt.osgi" version="3.18.0.qualifier"/>
+      <bundle id="org.eclipse.rap.ui" version="3.18.0.qualifier"/>
    </stats>
 
   <feature url="http://eclipse.org/rap"
       id="org.eclipse.rap.feature"
-      version="3.17.0.qualifier">
+      version="3.18.0.qualifier">
     <category name="org.eclipse.rap.category"/>
   </feature>
 
   <feature url="http://eclipse.org/rap"
       id="org.eclipse.rap.sdk.feature"
-      version="3.17.0.qualifier">
+      version="3.18.0.qualifier">
     <category name="org.eclipse.rap.category"/>
   </feature>
 
   <feature url="http://eclipse.org/rap"
       id="org.eclipse.rap.examples.feature"
-      version="3.17.0.qualifier">
+      version="3.18.0.qualifier">
     <category name="org.eclipse.rap.category"/>
   </feature>
 
   <feature url="http://eclipse.org/rap"
       id="org.eclipse.rap.equinox.target.feature"
-      version="3.17.0.qualifier">
+      version="3.18.0.qualifier">
     <category name="org.eclipse.rap.category"/>
   </feature>
   
diff --git a/releng/org.eclipse.rap.build/repository/pom.xml b/releng/org.eclipse.rap.build/repository/pom.xml
index a510209..cc253ae 100644
--- a/releng/org.eclipse.rap.build/repository/pom.xml
+++ b/releng/org.eclipse.rap.build/repository/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>org.eclipse.rap.runtime-aggregation-repository</artifactId>
   <packaging>eclipse-repository</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
   <repositories>
     <repository>
diff --git a/releng/org.eclipse.rap.clientbuilder/META-INF/MANIFEST.MF b/releng/org.eclipse.rap.clientbuilder/META-INF/MANIFEST.MF
index 796d718..b4de757 100644
--- a/releng/org.eclipse.rap.clientbuilder/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.rap.clientbuilder/META-INF/MANIFEST.MF
@@ -2,9 +2,9 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RAP JavaScript WebClient Builder
 Bundle-SymbolicName: org.eclipse.rap.clientbuilder
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: Eclipse.org - RAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.mozilla.javascript;bundle-version="[1.7.5,1.7.10)",
  org.junit;bundle-version="4.11.0";resolution:=optional
-Export-Package: org.eclipse.rap.clientbuilder;version="3.17.0"
+Export-Package: org.eclipse.rap.clientbuilder;version="3.18.0"
diff --git a/releng/org.eclipse.rap.clientbuilder/pom.xml b/releng/org.eclipse.rap.clientbuilder/pom.xml
index 0bf4a4d..bf3f2e6 100644
--- a/releng/org.eclipse.rap.clientbuilder/pom.xml
+++ b/releng/org.eclipse.rap.clientbuilder/pom.xml
@@ -17,13 +17,13 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.clientbuilder</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
   <repositories>
     <repository>
diff --git a/releng/org.eclipse.rap.examples.build/controlsdemo/pom.xml b/releng/org.eclipse.rap.examples.build/controlsdemo/pom.xml
index 153d4ca..f98be44 100644
--- a/releng/org.eclipse.rap.examples.build/controlsdemo/pom.xml
+++ b/releng/org.eclipse.rap.examples.build/controlsdemo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.examples.parent.parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../parent/parent</relativePath>
   </parent>
 
diff --git a/releng/org.eclipse.rap.examples.build/parent/parent/pom.xml b/releng/org.eclipse.rap.examples.build/parent/parent/pom.xml
index e261e23..ebc993d 100644
--- a/releng/org.eclipse.rap.examples.build/parent/parent/pom.xml
+++ b/releng/org.eclipse.rap.examples.build/parent/parent/pom.xml
@@ -7,7 +7,7 @@
 
   <groupId>org.eclipse.rap</groupId>
   <artifactId>org.eclipse.rap.examples.parent.parent</artifactId>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
   <packaging>pom</packaging>
 
   <properties>
diff --git a/releng/org.eclipse.rap.examples.build/parent/pom.xml b/releng/org.eclipse.rap.examples.build/parent/pom.xml
index cde956f..38c9787 100644
--- a/releng/org.eclipse.rap.examples.build/parent/pom.xml
+++ b/releng/org.eclipse.rap.examples.build/parent/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.examples.parent.parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>parent</relativePath>
   </parent>
 
diff --git a/releng/org.eclipse.rap.examples.build/pom.xml b/releng/org.eclipse.rap.examples.build/pom.xml
index b79bf3c..d2b5e0b 100644
--- a/releng/org.eclipse.rap.examples.build/pom.xml
+++ b/releng/org.eclipse.rap.examples.build/pom.xml
@@ -8,13 +8,13 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.examples.parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>parent</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.examples.build</artifactId>
   <packaging>pom</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
   <name>RAP demo examples build</name>
 
diff --git a/releng/org.eclipse.rap.examples.build/rapdemo/pom.xml b/releng/org.eclipse.rap.examples.build/rapdemo/pom.xml
index 9ce9e48..386affc 100644
--- a/releng/org.eclipse.rap.examples.build/rapdemo/pom.xml
+++ b/releng/org.eclipse.rap.examples.build/rapdemo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.examples.parent.parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../parent/parent</relativePath>
   </parent>
 
diff --git a/releng/org.eclipse.rap.examples.build/workbenchdemo/pom.xml b/releng/org.eclipse.rap.examples.build/workbenchdemo/pom.xml
index 695edf6..34d925b 100644
--- a/releng/org.eclipse.rap.examples.build/workbenchdemo/pom.xml
+++ b/releng/org.eclipse.rap.examples.build/workbenchdemo/pom.xml
@@ -8,7 +8,7 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.examples.parent.parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../parent/parent</relativePath>
   </parent>
 
diff --git a/tests/org.eclipse.rap.filedialog.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.filedialog.test/META-INF/MANIFEST.MF
index f8b77b3..7d259d6 100644
--- a/tests/org.eclipse.rap.filedialog.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.filedialog.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.filedialog.test
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.filedialog;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.fileupload;bundle-version="[3.17.0,4.0.0)",
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.filedialog;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.fileupload;bundle-version="[3.18.0,4.0.0)",
  org.junit;bundle-version="[4.8.2,5.0.0)"
-Import-Package: org.eclipse.rap.rwt.testfixture;version="[3.17.0,4.0.0)",
+Import-Package: org.eclipse.rap.rwt.testfixture;version="[3.18.0,4.0.0)",
  org.mockito;version="[1.9.5,2.0.0)",
  org.mockito.invocation;version="[1.9.5,2.0.0)",
  org.mockito.stubbing;version="[1.9.5,2.0.0)",
diff --git a/tests/org.eclipse.rap.filedialog.test/pom.xml b/tests/org.eclipse.rap.filedialog.test/pom.xml
index 1727c88..9b3e33a 100644
--- a/tests/org.eclipse.rap.filedialog.test/pom.xml
+++ b/tests/org.eclipse.rap.filedialog.test/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.filedialog.test</artifactId>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/tests/org.eclipse.rap.fileupload.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.fileupload.test/META-INF/MANIFEST.MF
index 2b899b3..99dad85 100644
--- a/tests/org.eclipse.rap.fileupload.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.fileupload.test/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.rap.fileupload.test
-Bundle-Version: 3.17.0.qualifier
-Fragment-Host: org.eclipse.rap.fileupload;bundle-version="[3.17.0,4.0.0)"
+Bundle-Version: 3.18.0.qualifier
+Fragment-Host: org.eclipse.rap.fileupload;bundle-version="[3.18.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
@@ -11,14 +11,14 @@
  org.apache.commons.fileupload;version="1.3.1",
  org.apache.commons.fileupload.disk;version="1.3.1",
  org.apache.commons.fileupload.servlet;version="1.3.1",
- org.eclipse.rap.rwt.testfixture;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.testfixture.internal;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.testfixture.internal.engine;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.testfixture.internal.service;version="[3.17.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture.internal;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture.internal.engine;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture.internal.service;version="[3.18.0,4.0.0)",
  org.mockito;version="[1.9.5,2.0.0)",
  org.mockito.invocation;version="[1.9.5,2.0.0)",
  org.mockito.stubbing;version="[1.9.5,2.0.0)",
  org.objenesis;version="[1.0.0,2.0.0)"
 Require-Bundle: org.junit;bundle-version="[4.8.2,5.0.0)",
- org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)"
+ org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)"
 Bundle-Localization: plugin
diff --git a/tests/org.eclipse.rap.fileupload.test/pom.xml b/tests/org.eclipse.rap.fileupload.test/pom.xml
index 0e50f41..78bf03e 100644
--- a/tests/org.eclipse.rap.fileupload.test/pom.xml
+++ b/tests/org.eclipse.rap.fileupload.test/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.fileupload.test</artifactId>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/tests/org.eclipse.rap.nebula.widgets.grid.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.nebula.widgets.grid.test/META-INF/MANIFEST.MF
index 015c514..0a18df0 100644
--- a/tests/org.eclipse.rap.nebula.widgets.grid.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.nebula.widgets.grid.test/META-INF/MANIFEST.MF
@@ -3,14 +3,14 @@
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.rap.nebula.widgets.grid.test
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Require-Bundle: org.junit;bundle-version="4.8.2"
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Import-Package: org.eclipse.rap.rwt.testfixture;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.testfixture.internal;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.testfixture.internal.engine;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.testfixture.internal.service;version="[3.17.0,4.0.0)",
+Import-Package: org.eclipse.rap.rwt.testfixture;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture.internal;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture.internal.engine;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture.internal.service;version="[3.18.0,4.0.0)",
  org.mockito;version="[1.9.5,2.0.0)",
  org.mockito.invocation;version="[1.9.5,2.0.0)",
  org.mockito.stubbing;version="[1.9.5,2.0.0)",
@@ -21,4 +21,4 @@
  org.eclipse.nebula.widgets.grid.internal.gridcolumnkit;x-internal:=true,
  org.eclipse.nebula.widgets.grid.internal.griditemkit;x-internal:=true,
  org.eclipse.nebula.widgets.grid.internal.gridkit;x-internal:=true
-Fragment-Host: org.eclipse.rap.nebula.widgets.grid;bundle-version="[3.17.0,4.0.0)"
+Fragment-Host: org.eclipse.rap.nebula.widgets.grid;bundle-version="[3.18.0,4.0.0)"
diff --git a/tests/org.eclipse.rap.nebula.widgets.grid.test/pom.xml b/tests/org.eclipse.rap.nebula.widgets.grid.test/pom.xml
index eb4d7ee..6fc0cd0 100644
--- a/tests/org.eclipse.rap.nebula.widgets.grid.test/pom.xml
+++ b/tests/org.eclipse.rap.nebula.widgets.grid.test/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.nebula.widgets.grid.test</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/tests/org.eclipse.rap.nebula.widgets.richtext.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.nebula.widgets.richtext.test/META-INF/MANIFEST.MF
index 401fbaa..cbebb03 100644
--- a/tests/org.eclipse.rap.nebula.widgets.richtext.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.nebula.widgets.richtext.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.nebula.widgets.richtext.test
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Fragment-Host: org.eclipse.rap.nebula.widgets.richtext;bundle-version="3.17.0"
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)",
+Fragment-Host: org.eclipse.rap.nebula.widgets.richtext;bundle-version="3.18.0"
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)",
  org.junit;bundle-version="4.8.1",
  org.mockito.mockito-all;bundle-version="1.9.5"
-Import-Package: org.eclipse.rap.rwt.testfixture;version="[3.17.0,4.0.0)"
+Import-Package: org.eclipse.rap.rwt.testfixture;version="[3.18.0,4.0.0)"
diff --git a/tests/org.eclipse.rap.nebula.widgets.richtext.test/pom.xml b/tests/org.eclipse.rap.nebula.widgets.richtext.test/pom.xml
index 2a9644b..b792925 100644
--- a/tests/org.eclipse.rap.nebula.widgets.richtext.test/pom.xml
+++ b/tests/org.eclipse.rap.nebula.widgets.richtext.test/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.nebula.widgets.richtext.test</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/tests/org.eclipse.rap.rwt.cluster.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.rwt.cluster.test/META-INF/MANIFEST.MF
index db8cbcb..106c085 100644
--- a/tests/org.eclipse.rap.rwt.cluster.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.rwt.cluster.test/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: RWT Cluster Tests
 Bundle-SymbolicName: org.eclipse.rap.rwt.cluster.test
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: Eclipse.org - RAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.cluster.testfixture;bundle-version="[3.17.0,4.0.0)",
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.cluster.testfixture;bundle-version="[3.18.0,4.0.0)",
  org.junit;bundle-version="4.8.2"
 Import-Package: javax.servlet;version="[2.5.0,5.0.0)",
  javax.servlet.http;version="[2.5.0,5.0.0)"
diff --git a/tests/org.eclipse.rap.rwt.cluster.test/pom.xml b/tests/org.eclipse.rap.rwt.cluster.test/pom.xml
index b1edfeb..034395b 100644
--- a/tests/org.eclipse.rap.rwt.cluster.test/pom.xml
+++ b/tests/org.eclipse.rap.rwt.cluster.test/pom.xml
@@ -17,13 +17,13 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.cluster.test</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
   <build>
     <plugins>
diff --git a/tests/org.eclipse.rap.rwt.cluster.testfixture.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.rwt.cluster.testfixture.test/META-INF/MANIFEST.MF
index 749c677..57a2812 100644
--- a/tests/org.eclipse.rap.rwt.cluster.testfixture.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.rwt.cluster.testfixture.test/META-INF/MANIFEST.MF
@@ -2,8 +2,8 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Cluster Testfixture tests
 Bundle-SymbolicName: org.eclipse.rap.rwt.cluster.testfixture.test
-Bundle-Version: 3.17.0.qualifier
-Fragment-Host: org.eclipse.rap.rwt.cluster.testfixture;bundle-version="[3.17.0,4.0.0)"
+Bundle-Version: 3.18.0.qualifier
+Fragment-Host: org.eclipse.rap.rwt.cluster.testfixture;bundle-version="[3.18.0,4.0.0)"
 Bundle-Vendor: Eclipse.org - RAP
 Require-Bundle: org.junit;bundle-version="4.8.2"
 Import-Package: org.junit.runner;version="4.8.2",
diff --git a/tests/org.eclipse.rap.rwt.cluster.testfixture.test/pom.xml b/tests/org.eclipse.rap.rwt.cluster.testfixture.test/pom.xml
index b977417..b37edb4 100644
--- a/tests/org.eclipse.rap.rwt.cluster.testfixture.test/pom.xml
+++ b/tests/org.eclipse.rap.rwt.cluster.testfixture.test/pom.xml
@@ -17,13 +17,13 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.cluster.testfixture.test</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
   <build>
     <plugins>
diff --git a/tests/org.eclipse.rap.rwt.cluster.testfixture/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.rwt.cluster.testfixture/META-INF/MANIFEST.MF
index f88f95c..c6cfe42 100644
--- a/tests/org.eclipse.rap.rwt.cluster.testfixture/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.rwt.cluster.testfixture/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Cluster Testfixture
 Bundle-SymbolicName: org.eclipse.rap.rwt.cluster.testfixture
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: Eclipse.org - RAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
@@ -33,19 +33,19 @@
  org.eclipse.jetty.util.component;version="[10.0.0,11.0.0)",
  org.eclipse.jetty.util.log;version="[10.0.0,11.0.0)",
  org.eclipse.jetty.util.resource;version="[10.0.0,11.0.0)",
- org.eclipse.rap.rwt.application;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.engine;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.internal.application;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.internal.lifecycle;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.internal.serverpush;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.internal.service;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.service;version="[3.17.0,4.0.0)",
+ org.eclipse.rap.rwt.application;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.engine;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.internal.application;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.internal.lifecycle;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.internal.serverpush;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.internal.service;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.service;version="[3.18.0,4.0.0)",
  org.eclipse.swt.dnd,
  org.eclipse.swt.widgets,
  org.h2;version="[1.1.0,2.0.0)",
  org.h2.tools;version="[1.1.0,2.0.0)"
-Export-Package: org.eclipse.rap.rwt.cluster.testfixture;version="3.17.0",
- org.eclipse.rap.rwt.cluster.testfixture.client;version="3.17.0",
- org.eclipse.rap.rwt.cluster.testfixture.internal.jetty;version="3.17.0";x-internal:=true,
- org.eclipse.rap.rwt.cluster.testfixture.internal.util;version="3.17.0";x-internal:=true,
- org.eclipse.rap.rwt.cluster.testfixture.server;version="3.17.0"
+Export-Package: org.eclipse.rap.rwt.cluster.testfixture;version="3.18.0",
+ org.eclipse.rap.rwt.cluster.testfixture.client;version="3.18.0",
+ org.eclipse.rap.rwt.cluster.testfixture.internal.jetty;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.rwt.cluster.testfixture.internal.util;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.rwt.cluster.testfixture.server;version="3.18.0"
diff --git a/tests/org.eclipse.rap.rwt.cluster.testfixture/pom.xml b/tests/org.eclipse.rap.rwt.cluster.testfixture/pom.xml
index 647ef4c..260925a 100644
--- a/tests/org.eclipse.rap.rwt.cluster.testfixture/pom.xml
+++ b/tests/org.eclipse.rap.rwt.cluster.testfixture/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.cluster.testfixture</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/tests/org.eclipse.rap.rwt.jstest/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.rwt.jstest/META-INF/MANIFEST.MF
index a1ed141..af40f01 100644
--- a/tests/org.eclipse.rap.rwt.jstest/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.rwt.jstest/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Javascript test suite
 Bundle-SymbolicName: org.eclipse.rap.rwt.jstest
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Export-Package: org.eclipse.rap.rwt.jstest,
  org.eclipse.rwt.test,
  org.eclipse.rwt.test.fixture,
@@ -10,7 +10,7 @@
  resource
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.equinox.http.jetty;bundle-version="[2.0.0,4.0.0)",
- org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)"
+ org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)"
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  javax.servlet.http;version="[3.1.0,5.0.0)",
  org.osgi.framework;version="1.6.0",
diff --git a/tests/org.eclipse.rap.rwt.osgi.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.rwt.osgi.test/META-INF/MANIFEST.MF
index 8e1a2b5..00d1807 100644
--- a/tests/org.eclipse.rap.rwt.osgi.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.rwt.osgi.test/META-INF/MANIFEST.MF
@@ -2,12 +2,12 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: Tests for RWT-OSGi Integration Bundle
 Bundle-SymbolicName: org.eclipse.rap.rwt.osgi.test
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-Vendor: Eclipse.org - RAP
-Fragment-Host: org.eclipse.rap.rwt.osgi;bundle-version="3.17.0"
+Fragment-Host: org.eclipse.rap.rwt.osgi;bundle-version="3.18.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.junit;bundle-version="4.8.2"
-Import-Package: org.eclipse.rap.rwt.testfixture.internal;version="[3.17.0,4.0.0)",
+Import-Package: org.eclipse.rap.rwt.testfixture.internal;version="[3.18.0,4.0.0)",
  org.mockito;version="[1.9.5,2.0.0)",
  org.mockito.invocation;version="[1.9.5,2.0.0)",
  org.mockito.stubbing;version="[1.9.5,2.0.0)",
diff --git a/tests/org.eclipse.rap.rwt.osgi.test/pom.xml b/tests/org.eclipse.rap.rwt.osgi.test/pom.xml
index 6852fc5..5a4c201 100644
--- a/tests/org.eclipse.rap.rwt.osgi.test/pom.xml
+++ b/tests/org.eclipse.rap.rwt.osgi.test/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.osgi.test</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/tests/org.eclipse.rap.rwt.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.rwt.test/META-INF/MANIFEST.MF
index fdbbb97..bed16e2 100644
--- a/tests/org.eclipse.rap.rwt.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.rwt.test/META-INF/MANIFEST.MF
@@ -3,18 +3,18 @@
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.rap.rwt.test
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-ClassPath: .
 Require-Bundle: org.junit;bundle-version="4.8.2",
- org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)"
+ org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)"
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
  javax.servlet.http;version="[3.1.0,5.0.0)",
- org.eclipse.rap.rwt.testfixture;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.testfixture.internal;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.testfixture.internal.engine;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.testfixture.internal.service;version="[3.17.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture.internal;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture.internal.engine;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture.internal.service;version="[3.18.0,4.0.0)",
  org.mockito;version="[1.9.5,2.0.0)",
  org.mockito.invocation;version="[1.9.5,2.0.0)",
  org.mockito.stubbing;version="[1.9.5,2.0.0)",
diff --git a/tests/org.eclipse.rap.rwt.test/pom.xml b/tests/org.eclipse.rap.rwt.test/pom.xml
index 842bfcd..7c87406 100644
--- a/tests/org.eclipse.rap.rwt.test/pom.xml
+++ b/tests/org.eclipse.rap.rwt.test/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.test</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/tests/org.eclipse.rap.rwt.testfixture/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.rwt.testfixture/META-INF/MANIFEST.MF
index 039c6f7..878fcb8 100644
--- a/tests/org.eclipse.rap.rwt.testfixture/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.rwt.testfixture/META-INF/MANIFEST.MF
@@ -3,8 +3,8 @@
 Bundle-Name: %Bundle-Name
 Bundle-Vendor: %Bundle-Vendor
 Bundle-SymbolicName: org.eclipse.rap.rwt.testfixture
-Bundle-Version: 3.17.0.qualifier
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)"
+Bundle-Version: 3.18.0.qualifier
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)"
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Import-Package: javax.servlet;version="[4.0.0,5.0.0)",
@@ -13,8 +13,8 @@
  org.junit.rules;version="4.11.0",
  org.junit.runner;version="4.11.0",
  org.junit.runners.model;version="4.11.0"
-Export-Package: org.eclipse.rap.rwt.internal.application;version="3.17.0";x-internal:=true,
- org.eclipse.rap.rwt.testfixture;version="3.17.0",
- org.eclipse.rap.rwt.testfixture.internal;version="3.17.0";x-internal:=true,
- org.eclipse.rap.rwt.testfixture.internal.engine;version="3.17.0";x-internal:=true,
- org.eclipse.rap.rwt.testfixture.internal.service;version="3.17.0";x-internal:=true
+Export-Package: org.eclipse.rap.rwt.internal.application;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.rwt.testfixture;version="3.18.0",
+ org.eclipse.rap.rwt.testfixture.internal;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.rwt.testfixture.internal.engine;version="3.18.0";x-internal:=true,
+ org.eclipse.rap.rwt.testfixture.internal.service;version="3.18.0";x-internal:=true
diff --git a/tests/org.eclipse.rap.rwt.testfixture/pom.xml b/tests/org.eclipse.rap.rwt.testfixture/pom.xml
index f6e0868..d458458 100644
--- a/tests/org.eclipse.rap.rwt.testfixture/pom.xml
+++ b/tests/org.eclipse.rap.rwt.testfixture/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.testfixture</artifactId>
   <packaging>eclipse-plugin</packaging>
-   <version>3.17.0-SNAPSHOT</version>
+   <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/tests/org.eclipse.rap.rwt.themes.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.rwt.themes.test/META-INF/MANIFEST.MF
index 1d2b4c0..d01e1b3 100644
--- a/tests/org.eclipse.rap.rwt.themes.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.rwt.themes.test/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.rwt.themes.test
-Bundle-Version: 3.17.0.qualifier
+Bundle-Version: 3.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Require-Bundle: org.eclipse.rap.design.example;bundle-version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)"
+Require-Bundle: org.eclipse.rap.design.example;bundle-version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Export-Package: org.eclipse.rap.rwt.themes.test;x-internal:=true,
  org.eclipse.rap.rwt.themes.test.business;x-internal:=true
-Import-Package: org.eclipse.rap.rwt.testfixture;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.testfixture.internal;version="3.17.0",
- org.eclipse.rap.rwt.testfixture.internal.engine;version="[3.17.0,4.0.0)",
+Import-Package: org.eclipse.rap.rwt.testfixture;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture.internal;version="3.18.0",
+ org.eclipse.rap.rwt.testfixture.internal.engine;version="[3.18.0,4.0.0)",
  org.junit;version="4.8.2"
diff --git a/tests/org.eclipse.rap.rwt.themes.test/pom.xml b/tests/org.eclipse.rap.rwt.themes.test/pom.xml
index 9aa539d..bd24ddf 100644
--- a/tests/org.eclipse.rap.rwt.themes.test/pom.xml
+++ b/tests/org.eclipse.rap.rwt.themes.test/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.rwt.themes.test</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>
diff --git a/tests/org.eclipse.rap.test.all/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.test.all/META-INF/MANIFEST.MF
index 2fa637f..915061b 100644
--- a/tests/org.eclipse.rap.test.all/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.test.all/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.test.all
-Bundle-Version: 3.17.0.qualifier
-Export-Package: org.eclipse.rap.test;version="3.17.0"
+Bundle-Version: 3.18.0.qualifier
+Export-Package: org.eclipse.rap.test;version="3.18.0"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Localization: plugin
-Import-Package: org.eclipse.rap.rwt.testfixture.internal;version="[3.17.0,4.0.0)",
+Import-Package: org.eclipse.rap.rwt.testfixture.internal;version="[3.18.0,4.0.0)",
  org.junit;version="4.8.2",
  org.junit.runner;version="4.8.2",
  org.junit.runners;version="4.8.2"
-Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.17.0,4.0.0)"
+Require-Bundle: org.eclipse.rap.rwt;bundle-version="[3.18.0,4.0.0)"
diff --git a/tests/org.eclipse.rap.ui.forms.test/META-INF/MANIFEST.MF b/tests/org.eclipse.rap.ui.forms.test/META-INF/MANIFEST.MF
index 00fed4f..cc23467 100644
--- a/tests/org.eclipse.rap.ui.forms.test/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.rap.ui.forms.test/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.rap.ui.forms.test
-Bundle-Version: 3.17.0.qualifier
-Fragment-Host: org.eclipse.rap.ui.forms;bundle-version="[3.17.0,4.0.0)"
+Bundle-Version: 3.18.0.qualifier
+Fragment-Host: org.eclipse.rap.ui.forms;bundle-version="[3.18.0,4.0.0)"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.junit;bundle-version="4.8.2"
-Import-Package: org.eclipse.rap.rwt.testfixture;version="[3.17.0,4.0.0)",
- org.eclipse.rap.rwt.testfixture.internal;version="[3.17.0,4.0.0)",
+Import-Package: org.eclipse.rap.rwt.testfixture;version="[3.18.0,4.0.0)",
+ org.eclipse.rap.rwt.testfixture.internal;version="[3.18.0,4.0.0)",
  org.mockito;version="[1.9.5,2.0.0)",
  org.mockito.invocation;version="[1.9.5,2.0.0)",
  org.mockito.stubbing;version="[1.9.5,2.0.0)",
diff --git a/tests/org.eclipse.rap.ui.forms.test/pom.xml b/tests/org.eclipse.rap.ui.forms.test/pom.xml
index 115cf12..6e2bed4 100644
--- a/tests/org.eclipse.rap.ui.forms.test/pom.xml
+++ b/tests/org.eclipse.rap.ui.forms.test/pom.xml
@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.eclipse.rap</groupId>
     <artifactId>org.eclipse.rap.runtime-parent</artifactId>
-    <version>3.17.0-SNAPSHOT</version>
+    <version>3.18.0-SNAPSHOT</version>
     <relativePath>../../releng/org.eclipse.rap.build/pom.xml</relativePath>
   </parent>
 
   <artifactId>org.eclipse.rap.ui.forms.test</artifactId>
   <packaging>eclipse-plugin</packaging>
-  <version>3.17.0-SNAPSHOT</version>
+  <version>3.18.0-SNAPSHOT</version>
 
 </project>