diff --git a/README.md b/README.md
index 7d08ab3621..8f8d8ebadb 100644
--- a/README.md
+++ b/README.md
@@ -23,12 +23,12 @@ To build BIRT with the latest Eclipse platform, run:
 ## Eclipse Version
 If you want to install BIRT as a plug-in, please be aware that BIRT 4.14 requires Eclipse 4.30 or higher, and Java 17 or higher.
 
-## Latest Version 4.16.0
+## Latest Version 4.17.0
 * https://download.eclipse.org/birt/updates/release/latest
 
-## Current Version 4.16.0
-* https://download.eclipse.org/birt/updates/release/4.16.0
+## Current Version 4.17.0
+* https://download.eclipse.org/birt/updates/release/4.17.0
 
-## Latest Snapshots Towards 4.17.0
+## Latest Snapshots Towards 4.18.0
 * https://download.eclipse.org/birt/updates/nightly/latest
 
diff --git a/UI/org.eclipse.birt.report.debug.core/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.debug.core/META-INF/MANIFEST.MF
index 0dde52329b..3aa9797a31 100644
--- a/UI/org.eclipse.birt.report.debug.core/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.debug.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.debug.core;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.core;bundle-version="4.13.0",
  org.eclipse.birt.report.engine;bundle-version="[2.3.0,5.0.0)"
 Export-Package: org.eclipse.birt.report.debug.core.i18n,
diff --git a/UI/org.eclipse.birt.report.debug.core/pom.xml b/UI/org.eclipse.birt.report.debug.core/pom.xml
index 4bdf0dbf22..e937444344 100644
--- a/UI/org.eclipse.birt.report.debug.core/pom.xml
+++ b/UI/org.eclipse.birt.report.debug.core/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.debug.core</artifactId>
diff --git a/UI/org.eclipse.birt.report.debug.ui/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.debug.ui/META-INF/MANIFEST.MF
index e1bd364073..58a45e40ae 100644
--- a/UI/org.eclipse.birt.report.debug.ui/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.debug.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.debug.ui; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Export-Package: org.eclipse.birt.report.debug.internal.script.model,
diff --git a/UI/org.eclipse.birt.report.debug.ui/pom.xml b/UI/org.eclipse.birt.report.debug.ui/pom.xml
index 5b2286e57b..250d03c570 100644
--- a/UI/org.eclipse.birt.report.debug.ui/pom.xml
+++ b/UI/org.eclipse.birt.report.debug.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.debug.ui</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.core/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.core/META-INF/MANIFEST.MF
index 44cc516372..5950f76f09 100644
--- a/UI/org.eclipse.birt.report.designer.core/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.core;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.designer.core.CorePlugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.birt.report.designer.core,
diff --git a/UI/org.eclipse.birt.report.designer.core/pom.xml b/UI/org.eclipse.birt.report.designer.core/pom.xml
index a4f208bfc7..99539736f6 100644
--- a/UI/org.eclipse.birt.report.designer.core/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.core/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.core</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.samplereports/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.samplereports/META-INF/MANIFEST.MF
index 9912756af3..baf77a4591 100644
--- a/UI/org.eclipse.birt.report.designer.samplereports/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.samplereports/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.samplereports;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/UI/org.eclipse.birt.report.designer.samplereports/pom.xml b/UI/org.eclipse.birt.report.designer.samplereports/pom.xml
index d67a292dd7..0a31c4b4ea 100644
--- a/UI/org.eclipse.birt.report.designer.samplereports/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.samplereports/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.samplereports</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.tests/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.tests/META-INF/MANIFEST.MF
index 1b32884eb1..c58c7e1abc 100644
--- a/UI/org.eclipse.birt.report.designer.tests/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.tests; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.designer.tests.TestsPlugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.birt.report.designer.core,
diff --git a/UI/org.eclipse.birt.report.designer.tests/pom.xml b/UI/org.eclipse.birt.report.designer.tests/pom.xml
index 238846f2be..f3b3375179 100644
--- a/UI/org.eclipse.birt.report.designer.tests/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.tests</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.cubebuilder/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.cubebuilder/META-INF/MANIFEST.MF
index b1439b0afe..50eb97e87b 100644
--- a/UI/org.eclipse.birt.report.designer.ui.cubebuilder/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.cubebuilder/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.cubebuilder;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.designer.ui.cubebuilder.BuilderPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.ui;bundle-version="[3.2.1,4.0.0)",
diff --git a/UI/org.eclipse.birt.report.designer.ui.cubebuilder/pom.xml b/UI/org.eclipse.birt.report.designer.ui.cubebuilder/pom.xml
index cc9489732b..b922fa6619 100644
--- a/UI/org.eclipse.birt.report.designer.ui.cubebuilder/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.cubebuilder/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.cubebuilder</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.data/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.data/META-INF/MANIFEST.MF
index 95a317d0d6..ecd08977e6 100644
--- a/UI/org.eclipse.birt.report.designer.ui.data/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.data/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.data;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/UI/org.eclipse.birt.report.designer.ui.data/pom.xml b/UI/org.eclipse.birt.report.designer.ui.data/pom.xml
index 736d0be5a8..510b72db27 100644
--- a/UI/org.eclipse.birt.report.designer.ui.data/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.data/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.data</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.editor.script/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.editor.script/META-INF/MANIFEST.MF
index 5cf6ecbc77..af670971eb 100644
--- a/UI/org.eclipse.birt.report.designer.ui.editor.script/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.editor.script/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.editor.script;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.gef;bundle-version="[3.2.1,4.0.0)",
diff --git a/UI/org.eclipse.birt.report.designer.ui.editor.script/pom.xml b/UI/org.eclipse.birt.report.designer.ui.editor.script/pom.xml
index cb615d1a38..1645a4121e 100644
--- a/UI/org.eclipse.birt.report.designer.ui.editor.script/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.editor.script/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.editor.script</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.editor.xml.wtp/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.editor.xml.wtp/META-INF/MANIFEST.MF
index 5230229171..9e10236dee 100644
--- a/UI/org.eclipse.birt.report.designer.ui.editor.xml.wtp/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.editor.xml.wtp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.editor.xml.wtp;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.wst.sse.core;bundle-version="[1.0.100,2.0.0)",
  org.eclipse.wst.sse.ui;bundle-version="[1.0.201,2.0.0)",
diff --git a/UI/org.eclipse.birt.report.designer.ui.editor.xml.wtp/pom.xml b/UI/org.eclipse.birt.report.designer.ui.editor.xml.wtp/pom.xml
index a356e028fb..c95c9e985d 100644
--- a/UI/org.eclipse.birt.report.designer.ui.editor.xml.wtp/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.editor.xml.wtp/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.editor.xml.wtp</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.editors.schematic/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.editors.schematic/META-INF/MANIFEST.MF
index 9962669569..45394b09fd 100644
--- a/UI/org.eclipse.birt.report.designer.ui.editors.schematic/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.editors.schematic/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.editors.schematic;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
diff --git a/UI/org.eclipse.birt.report.designer.ui.editors.schematic/pom.xml b/UI/org.eclipse.birt.report.designer.ui.editors.schematic/pom.xml
index f5e28a970a..1146bf6279 100644
--- a/UI/org.eclipse.birt.report.designer.ui.editors.schematic/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.editors.schematic/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.editors.schematic</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.editors/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.editors/META-INF/MANIFEST.MF
index abd20ee993..d01ea35ef9 100644
--- a/UI/org.eclipse.birt.report.designer.ui.editors/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.editors/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.editors;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.designer.ui.editors.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
diff --git a/UI/org.eclipse.birt.report.designer.ui.editors/pom.xml b/UI/org.eclipse.birt.report.designer.ui.editors/pom.xml
index ce4a754dcb..084a25fee8 100644
--- a/UI/org.eclipse.birt.report.designer.ui.editors/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.editors/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.editors</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.ide/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.ide/META-INF/MANIFEST.MF
index 31e35f3908..0f5ad2eeb0 100644
--- a/UI/org.eclipse.birt.report.designer.ui.ide/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.ide; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.designer.ui.IDEReportPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/UI/org.eclipse.birt.report.designer.ui.ide/pom.xml b/UI/org.eclipse.birt.report.designer.ui.ide/pom.xml
index d333261808..a127d90ee1 100644
--- a/UI/org.eclipse.birt.report.designer.ui.ide/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.ide/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.ide</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.lib.explorer/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.lib.explorer/META-INF/MANIFEST.MF
index c80ae40e72..13fc968623 100644
--- a/UI/org.eclipse.birt.report.designer.ui.lib.explorer/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.lib.explorer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.lib.explorer; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.designer.ui.lib.explorer.LibraryExplorerPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/UI/org.eclipse.birt.report.designer.ui.lib.explorer/pom.xml b/UI/org.eclipse.birt.report.designer.ui.lib.explorer/pom.xml
index 3e2f87e0a3..4350a69bbb 100644
--- a/UI/org.eclipse.birt.report.designer.ui.lib.explorer/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.lib.explorer/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.lib.explorer</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.lib/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.lib/META-INF/MANIFEST.MF
index 194cc834d8..3c6a741ac6 100644
--- a/UI/org.eclipse.birt.report.designer.ui.lib/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.lib/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.lib; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.designer.ui.LibraryPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/UI/org.eclipse.birt.report.designer.ui.lib/pom.xml b/UI/org.eclipse.birt.report.designer.ui.lib/pom.xml
index fdd9fad3ab..201ccc7695 100644
--- a/UI/org.eclipse.birt.report.designer.ui.lib/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.lib/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.lib</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.static_html/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.preview.static_html/META-INF/MANIFEST.MF
index 61704d6334..0c60425100 100644
--- a/UI/org.eclipse.birt.report.designer.ui.preview.static_html/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.preview.static_html/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.preview.static_html;singleton:=true
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.designer.ui.preview.static_html.StaticHTMLPrviewPlugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.static_html/pom.xml b/UI/org.eclipse.birt.report.designer.ui.preview.static_html/pom.xml
index 698ac3c887..49e139cc70 100644
--- a/UI/org.eclipse.birt.report.designer.ui.preview.static_html/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.preview.static_html/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.preview.static_html</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.test/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.preview.test/META-INF/MANIFEST.MF
index fd315e349f..0f915dec4e 100644
--- a/UI/org.eclipse.birt.report.designer.ui.preview.test/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.preview.test/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.preview.test
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.birt.report.designer.ui.preview;bundle-version="4.13.0",
  org.eclipse.birt.report.engine;bundle-version="4.13.0",
diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.test/pom.xml b/UI/org.eclipse.birt.report.designer.ui.preview.test/pom.xml
index 182e18568b..516278a6d7 100644
--- a/UI/org.eclipse.birt.report.designer.ui.preview.test/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.preview.test/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.preview.test</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.web/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.preview.web/META-INF/MANIFEST.MF
index 77e0b8c1b3..8a9569d8b8 100644
--- a/UI/org.eclipse.birt.report.designer.ui.preview.web/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.preview.web/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.preview.web;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.designer.ui.preview.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
diff --git a/UI/org.eclipse.birt.report.designer.ui.preview.web/pom.xml b/UI/org.eclipse.birt.report.designer.ui.preview.web/pom.xml
index ec43f4ed5c..cf0efef680 100644
--- a/UI/org.eclipse.birt.report.designer.ui.preview.web/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.preview.web/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.preview.web</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.preview/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.preview/META-INF/MANIFEST.MF
index fea1124432..023bdc8a62 100644
--- a/UI/org.eclipse.birt.report.designer.ui.preview/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.preview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.preview;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.designer.ui.preview.Activator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
diff --git a/UI/org.eclipse.birt.report.designer.ui.preview/pom.xml b/UI/org.eclipse.birt.report.designer.ui.preview/pom.xml
index 990e1b4ac9..b1fa4aacd6 100644
--- a/UI/org.eclipse.birt.report.designer.ui.preview/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.preview/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.preview</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.rcp/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.rcp/META-INF/MANIFEST.MF
index a309586de9..e85d9772d3 100644
--- a/UI/org.eclipse.birt.report.designer.ui.rcp/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %ApplicationName
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.rcp; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Export-Package: org.eclipse.birt.report.designer.ui,
diff --git a/UI/org.eclipse.birt.report.designer.ui.rcp/pom.xml b/UI/org.eclipse.birt.report.designer.ui.rcp/pom.xml
index c5f8981dc9..bb62531091 100644
--- a/UI/org.eclipse.birt.report.designer.ui.rcp/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.rcp/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.rcp</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.samples.ide/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.samples.ide/META-INF/MANIFEST.MF
index 3ddc3938e3..942e46e005 100644
--- a/UI/org.eclipse.birt.report.designer.ui.samples.ide/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.samples.ide/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.samples.ide;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.report.designer.ui.samplesview;bundle-version="4.13.0",
  org.eclipse.core.runtime;bundle-version="3.23.0",
  org.eclipse.birt.report.designer.ui;bundle-version="4.13.0",
diff --git a/UI/org.eclipse.birt.report.designer.ui.samples.ide/pom.xml b/UI/org.eclipse.birt.report.designer.ui.samples.ide/pom.xml
index 605258dbc6..2a790fa9d6 100644
--- a/UI/org.eclipse.birt.report.designer.ui.samples.ide/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.samples.ide/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.samples.ide</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.samples.rcp/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.samples.rcp/META-INF/MANIFEST.MF
index 4b467a0bd6..38433bb8f2 100644
--- a/UI/org.eclipse.birt.report.designer.ui.samples.rcp/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.samples.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.samples.rcp;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.23.0",
  org.eclipse.birt.report.designer.ui.samplesview;bundle-version="4.13.0",
  org.eclipse.birt.report.designer.ui;bundle-version="4.13.0",
diff --git a/UI/org.eclipse.birt.report.designer.ui.samples.rcp/pom.xml b/UI/org.eclipse.birt.report.designer.ui.samples.rcp/pom.xml
index 116fd78328..71005b624e 100644
--- a/UI/org.eclipse.birt.report.designer.ui.samples.rcp/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.samples.rcp/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.samples.rcp</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.samplesview/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.samplesview/META-INF/MANIFEST.MF
index dda88ec866..469296d220 100644
--- a/UI/org.eclipse.birt.report.designer.ui.samplesview/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.samplesview/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.samplesview;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/UI/org.eclipse.birt.report.designer.ui.samplesview/pom.xml b/UI/org.eclipse.birt.report.designer.ui.samplesview/pom.xml
index 748f048d3d..3ba89c8acf 100644
--- a/UI/org.eclipse.birt.report.designer.ui.samplesview/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.samplesview/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.samplesview</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui.views/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui.views/META-INF/MANIFEST.MF
index 9657cdf9da..c90c2692e1 100644
--- a/UI/org.eclipse.birt.report.designer.ui.views/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui.views/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.views;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.designer.ui.views.ReportViewsPlugin
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
diff --git a/UI/org.eclipse.birt.report.designer.ui.views/pom.xml b/UI/org.eclipse.birt.report.designer.ui.views/pom.xml
index 27fdecf305..430ead5976 100644
--- a/UI/org.eclipse.birt.report.designer.ui.views/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui.views/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.views</artifactId>
diff --git a/UI/org.eclipse.birt.report.designer.ui/META-INF/MANIFEST.MF b/UI/org.eclipse.birt.report.designer.ui/META-INF/MANIFEST.MF
index ececb8447e..20811f5cb7 100644
--- a/UI/org.eclipse.birt.report.designer.ui/META-INF/MANIFEST.MF
+++ b/UI/org.eclipse.birt.report.designer.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.designer.ui.ReportPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/UI/org.eclipse.birt.report.designer.ui/pom.xml b/UI/org.eclipse.birt.report.designer.ui/pom.xml
index 0069b3acde..7b4d99b916 100644
--- a/UI/org.eclipse.birt.report.designer.ui/pom.xml
+++ b/UI/org.eclipse.birt.report.designer.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui</artifactId>
diff --git a/UI/pom.xml b/UI/pom.xml
index 278b4c244b..79cbaedd61 100644
--- a/UI/pom.xml
+++ b/UI/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/build/birt-packages/birt-charts/ChartRuntime/pom.xml b/build/birt-packages/birt-charts/ChartRuntime/pom.xml
index 8680ca9558..59f5355107 100644
--- a/build/birt-packages/birt-charts/ChartRuntime/pom.xml
+++ b/build/birt-packages/birt-charts/ChartRuntime/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
diff --git a/build/birt-packages/birt-charts/ChartSDK/pom.xml b/build/birt-packages/birt-charts/ChartSDK/pom.xml
index dbf3c6f2d7..0cec445ee7 100644
--- a/build/birt-packages/birt-charts/ChartSDK/pom.xml
+++ b/build/birt-packages/birt-charts/ChartSDK/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
diff --git a/build/birt-packages/birt-charts/DeploymentRuntime/pom.xml b/build/birt-packages/birt-charts/DeploymentRuntime/pom.xml
index d9671b76af..195fa82d83 100644
--- a/build/birt-packages/birt-charts/DeploymentRuntime/pom.xml
+++ b/build/birt-packages/birt-charts/DeploymentRuntime/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../..</relativePath>
 	</parent>
 
diff --git a/build/birt-packages/birt-charts/pom.xml b/build/birt-packages/birt-charts/pom.xml
index fd48ef264f..98948db49c 100644
--- a/build/birt-packages/birt-charts/pom.xml
+++ b/build/birt-packages/birt-charts/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.birt-packages.birt-charts</groupId>
diff --git a/build/birt-packages/birt-nl/birt-charts/pom.xml b/build/birt-packages/birt-nl/birt-charts/pom.xml
index 7a52b53dea..eaf0ce8c43 100644
--- a/build/birt-packages/birt-nl/birt-charts/pom.xml
+++ b/build/birt-packages/birt-nl/birt-charts/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package.nl</groupId>
 		<artifactId>org.eclipse.birt.build.package.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.nl</groupId>
diff --git a/build/birt-packages/birt-nl/birt-rcp-report-designer/pom.xml b/build/birt-packages/birt-nl/birt-rcp-report-designer/pom.xml
index f1d6d2c8b6..9c70bf7a49 100644
--- a/build/birt-packages/birt-nl/birt-rcp-report-designer/pom.xml
+++ b/build/birt-packages/birt-nl/birt-rcp-report-designer/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package.nl</groupId>
 		<artifactId>org.eclipse.birt.build.package.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.nl</groupId>
diff --git a/build/birt-packages/birt-nl/birt-report-designer-all-in-one/pom.xml b/build/birt-packages/birt-nl/birt-report-designer-all-in-one/pom.xml
index 12a881653c..857e23d3bd 100644
--- a/build/birt-packages/birt-nl/birt-report-designer-all-in-one/pom.xml
+++ b/build/birt-packages/birt-nl/birt-report-designer-all-in-one/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package.nl</groupId>
 		<artifactId>org.eclipse.birt.build.package.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.nl</groupId>
diff --git a/build/birt-packages/birt-nl/birt-report-framework/pom.xml b/build/birt-packages/birt-nl/birt-report-framework/pom.xml
index ad01eee006..d1a10ecb59 100644
--- a/build/birt-packages/birt-nl/birt-report-framework/pom.xml
+++ b/build/birt-packages/birt-nl/birt-report-framework/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package.nl</groupId>
 		<artifactId>org.eclipse.birt.build.package.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.nl</groupId>
diff --git a/build/birt-packages/birt-nl/birt-runtime/pom.xml b/build/birt-packages/birt-nl/birt-runtime/pom.xml
index 30c9bf9524..76b7365808 100644
--- a/build/birt-packages/birt-nl/birt-runtime/pom.xml
+++ b/build/birt-packages/birt-nl/birt-runtime/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package.nl</groupId>
 		<artifactId>org.eclipse.birt.build.package.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.nl</groupId>
diff --git a/build/birt-packages/birt-nl/pom.xml b/build/birt-packages/birt-nl/pom.xml
index 3243074850..ee9090739b 100644
--- a/build/birt-packages/birt-nl/pom.xml
+++ b/build/birt-packages/birt-nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/build/birt-packages/birt-report-all-in-one/BIRT.product b/build/birt-packages/birt-report-all-in-one/BIRT.product
index 790637dd58..4cb5faa98b 100644
--- a/build/birt-packages/birt-report-all-in-one/BIRT.product
+++ b/build/birt-packages/birt-report-all-in-one/BIRT.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="BIRT Report Designer All-In-One" uid="org.eclipse.birt.report.designer.all" id="org.eclipse.birt.branding.birt_all_in_one" application="org.eclipse.ui.ide.workbench" version="4.17.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
+<product name="BIRT Report Designer All-In-One" uid="org.eclipse.birt.report.designer.all" id="org.eclipse.birt.branding.birt_all_in_one" application="org.eclipse.ui.ide.workbench" version="4.18.0.qualifier" type="features" includeLaunchers="true" autoIncludeRequirements="true">
 
    <aboutInfo>
       <image path="/org.eclipse.birt.branding/images/about.png"/>
diff --git a/build/birt-packages/birt-report-all-in-one/pom.xml b/build/birt-packages/birt-report-all-in-one/pom.xml
index 90a9ebad8c..e3ca195225 100644
--- a/build/birt-packages/birt-report-all-in-one/pom.xml
+++ b/build/birt-packages/birt-report-all-in-one/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/build/birt-packages/birt-report-framework-sdk/pom.xml b/build/birt-packages/birt-report-framework-sdk/pom.xml
index bad66653f3..5931b90797 100644
--- a/build/birt-packages/birt-report-framework-sdk/pom.xml
+++ b/build/birt-packages/birt-report-framework-sdk/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/build/birt-packages/birt-report-framework/pom.xml b/build/birt-packages/birt-report-framework/pom.xml
index 983aa91913..6473e47f3f 100644
--- a/build/birt-packages/birt-report-framework/pom.xml
+++ b/build/birt-packages/birt-report-framework/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/build/birt-packages/birt-runtime-osgi/pom.xml b/build/birt-packages/birt-runtime-osgi/pom.xml
index 0c166752ff..ffadc9e63c 100644
--- a/build/birt-packages/birt-runtime-osgi/pom.xml
+++ b/build/birt-packages/birt-runtime-osgi/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/build/birt-packages/birt-runtime-osgi/reportengine.product b/build/birt-packages/birt-runtime-osgi/reportengine.product
index efbbdf709b..9748c0d432 100644
--- a/build/birt-packages/birt-runtime-osgi/reportengine.product
+++ b/build/birt-packages/birt-runtime-osgi/reportengine.product
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?pde version="3.5"?>
 
-<product name="BIRT Engine Runtime" uid="org.eclipse.birt.engine.runtime" version="4.17.0.qualifier" type="mixed" includeLaunchers="false" autoIncludeRequirements="true">
+<product name="BIRT Engine Runtime" uid="org.eclipse.birt.engine.runtime" version="4.18.0.qualifier" type="mixed" includeLaunchers="false" autoIncludeRequirements="true">
 
    <configIni use="default">
    </configIni>
diff --git a/build/birt-packages/birt-runtime-test/pom.xml b/build/birt-packages/birt-runtime-test/pom.xml
index 60301982c1..ca69c67da0 100644
--- a/build/birt-packages/birt-runtime-test/pom.xml
+++ b/build/birt-packages/birt-runtime-test/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/build/birt-packages/birt-runtime/pom.xml b/build/birt-packages/birt-runtime/pom.xml
index 752c73af5b..a0ddb5c266 100644
--- a/build/birt-packages/birt-runtime/pom.xml
+++ b/build/birt-packages/birt-runtime/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/build/birt-packages/birt-sample-plugins/pom.xml b/build/birt-packages/birt-sample-plugins/pom.xml
index 93ee229526..79763c93e0 100644
--- a/build/birt-packages/birt-sample-plugins/pom.xml
+++ b/build/birt-packages/birt-sample-plugins/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/build/birt-packages/birt-source/pom.xml b/build/birt-packages/birt-source/pom.xml
index 1e1e6dd3d4..6345e42a6a 100644
--- a/build/birt-packages/birt-source/pom.xml
+++ b/build/birt-packages/birt-source/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/build/birt-packages/birt-tests-suite/pom.xml b/build/birt-packages/birt-tests-suite/pom.xml
index 59a6707938..dfecb62e29 100644
--- a/build/birt-packages/birt-tests-suite/pom.xml
+++ b/build/birt-packages/birt-tests-suite/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build.package</groupId>
 		<artifactId>org.eclipse.birt.build.package-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/build/birt-packages/pom.xml b/build/birt-packages/pom.xml
index 2a42ee882d..00ff600ea1 100644
--- a/build/birt-packages/pom.xml
+++ b/build/birt-packages/pom.xml
@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build</groupId>
 		<artifactId>org.eclipse.birt.build-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/build/org.eclipse.birt.api/pom.xml b/build/org.eclipse.birt.api/pom.xml
index 21f56a8535..1873cf706d 100644
--- a/build/org.eclipse.birt.api/pom.xml
+++ b/build/org.eclipse.birt.api/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build</groupId>
 		<artifactId>org.eclipse.birt.build-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/build/org.eclipse.birt.build/META-INF/MANIFEST.MF b/build/org.eclipse.birt.build/META-INF/MANIFEST.MF
index 1dd4eafebc..5c0ecd87f6 100644
--- a/build/org.eclipse.birt.build/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.birt.build/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.build
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Export-Package: org.eclipse.birt.build.ant;x-internal:=true,
  org.eclipse.birt.build.framework;x-internal:=true,
  org.eclipse.birt.build.pack;x-internal:=true
diff --git a/build/org.eclipse.birt.build/pom.xml b/build/org.eclipse.birt.build/pom.xml
index 78f4d68182..da481d2305 100644
--- a/build/org.eclipse.birt.build/pom.xml
+++ b/build/org.eclipse.birt.build/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.build</artifactId>
diff --git a/build/org.eclipse.birt.chart/META-INF/MANIFEST.MF b/build/org.eclipse.birt.chart/META-INF/MANIFEST.MF
index 545bcc102e..370a166882 100644
--- a/build/org.eclipse.birt.chart/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.birt.chart/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/build/org.eclipse.birt.chart/pom.xml b/build/org.eclipse.birt.chart/pom.xml
index 1ecc512539..817aef9b00 100644
--- a/build/org.eclipse.birt.chart/pom.xml
+++ b/build/org.eclipse.birt.chart/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/build/org.eclipse.birt.example/META-INF/MANIFEST.MF b/build/org.eclipse.birt.example/META-INF/MANIFEST.MF
index 68e6372aec..6716b45e68 100644
--- a/build/org.eclipse.birt.example/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.birt.example/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.example
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Automatic-Module-Name: org.eclipse.birt.example
diff --git a/build/org.eclipse.birt.example/pom.xml b/build/org.eclipse.birt.example/pom.xml
index afd1c36183..07dc028eed 100644
--- a/build/org.eclipse.birt.example/pom.xml
+++ b/build/org.eclipse.birt.example/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.example</artifactId>
diff --git a/build/org.eclipse.birt.p2updatesite/pom.xml b/build/org.eclipse.birt.p2updatesite/pom.xml
index 169a82bff0..c33c6dff07 100644
--- a/build/org.eclipse.birt.p2updatesite/pom.xml
+++ b/build/org.eclipse.birt.p2updatesite/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build</groupId>
 		<artifactId>org.eclipse.birt.build-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 
diff --git a/build/org.eclipse.birt.releng/BIRT.setup b/build/org.eclipse.birt.releng/BIRT.setup
index d609ed482b..5a4b33dd43 100644
--- a/build/org.eclipse.birt.releng/BIRT.setup
+++ b/build/org.eclipse.birt.releng/BIRT.setup
@@ -420,8 +420,8 @@
         value="latest"
         label="BIRT Latest"/>
     <choice
-        value="4.15"
-        label="BIRT 4.15"/>
+        value="4.17"
+        label="BIRT 4.17"/>
   </setupTask>
   <setupTask
       xsi:type="setup:RedirectionTask"
@@ -559,21 +559,19 @@
             url="https://download.eclipse.org/justj/jres/21/updates/release/latest"/>
       </repositoryList>
       <repositoryList
-          name="4.16">
+          name="4.17">
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
         <repository
-            url="https://download.eclipse.org/releases/2024-06/202406121000"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.33.0"/>
         <repository
-            url="https://download.eclipse.org/justj/epp/release/21.0.0"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12"/>
         <repository
-            url="https://download.eclipse.org/justj/jres/21/updates/release/latest"/>
-        <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.9"/>
+            url="https://download.eclipse.org/releases/2024-09/202409111000"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.32.0"/>
+            url="https://download.eclipse.org/justj/epp/release/21.0.0.v20240807-1553"/>
         <repository
-            url="https://download.eclipse.org/oomph/simrel-orbit-legacy/milestone/latest"/>
+            url="https://download.eclipse.org/justj/jres/21/updates/release/latest"/>
       </repositoryList>
     </targlet>
   </setupTask>
diff --git a/build/org.eclipse.birt.sdk/META-INF/MANIFEST.MF b/build/org.eclipse.birt.sdk/META-INF/MANIFEST.MF
index 9380748b85..743cb7e430 100644
--- a/build/org.eclipse.birt.sdk/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.birt.sdk/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.sdk
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/build/org.eclipse.birt.sdk/pom.xml b/build/org.eclipse.birt.sdk/pom.xml
index 7485d75408..005fb5f53b 100644
--- a/build/org.eclipse.birt.sdk/pom.xml
+++ b/build/org.eclipse.birt.sdk/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.build</groupId>
 		<artifactId>org.eclipse.birt.build-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/build/org.eclipse.birt.target/org.eclipse.birt.target.target b/build/org.eclipse.birt.target/org.eclipse.birt.target.target
index b9455ea17c..53f858eaa3 100644
--- a/build/org.eclipse.birt.target/org.eclipse.birt.target.target
+++ b/build/org.eclipse.birt.target/org.eclipse.birt.target.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated from BIRT" sequenceNumber="51">
+<target name="Generated from BIRT" sequenceNumber="52">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="bcpg" version="0.0.0"/>
@@ -106,6 +106,7 @@
       <unit id="org.eclipse.jetty.ee8.webapp" version="0.0.0"/>
       <unit id="org.eclipse.jetty.http" version="0.0.0"/>
       <unit id="org.eclipse.jetty.io" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.jndi" version="0.0.0"/>
       <unit id="org.eclipse.jetty.osgi" version="0.0.0"/>
       <unit id="org.eclipse.jetty.plus" version="0.0.0"/>
       <unit id="org.eclipse.jetty.security" version="0.0.0"/>
@@ -138,11 +139,15 @@
       <unit id="org.osgi.service.repository" version="0.0.0"/>
       <unit id="slf4j.api" version="0.0.0"/>
       <unit id="slf4j.simple" version="0.0.0"/>
+      <repository location="https://download.eclipse.org/eclipse/updates/4.34-I-builds"/>
       <repository location="https://download.eclipse.org/cbi/updates/license"/>
-      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.33.0"/>
-      <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/12.0.12"/>
-      <repository location="https://download.eclipse.org/releases/2024-09/202409111000"/>
-      <repository location="https://download.eclipse.org/justj/epp/release/21.0.0.v20240807-1553"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/nightly/latest"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-jetty/release/latest"/>
+      <repository location="https://download.eclipse.org/datatools/updates/milestone/latest"/>
+      <repository location="https://download.eclipse.org/modeling/emf/emf/builds/milestone/latest"/>
+      <repository location="https://download.eclipse.org/tools/gef/classic/nightly/latest"/>
+      <repository location="https://download.eclipse.org/webtools/CI/latest"/>
+      <repository location="https://download.eclipse.org/justj/epp/milestone/latest"/>
       <repository location="https://download.eclipse.org/justj/jres/21/updates/release/latest"/>
     </location>
   </locations>
diff --git a/build/org.eclipse.birt.target/pom.xml b/build/org.eclipse.birt.target/pom.xml
index 848b39a848..eb3b3b87d6 100644
--- a/build/org.eclipse.birt.target/pom.xml
+++ b/build/org.eclipse.birt.target/pom.xml
@@ -27,7 +27,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.target</artifactId>
diff --git a/build/org.eclipse.birt/META-INF/MANIFEST.MF b/build/org.eclipse.birt/META-INF/MANIFEST.MF
index ded0710bb4..9434257b01 100644
--- a/build/org.eclipse.birt/META-INF/MANIFEST.MF
+++ b/build/org.eclipse.birt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/build/org.eclipse.birt/pom.xml b/build/org.eclipse.birt/pom.xml
index 865a49fd6f..3b6867b958 100644
--- a/build/org.eclipse.birt/pom.xml
+++ b/build/org.eclipse.birt/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt</artifactId>
diff --git a/build/pom.xml b/build/pom.xml
index d7ea9307b1..e6313c6517 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/chart/org.eclipse.birt.chart.device.extension/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.device.extension/META-INF/MANIFEST.MF
index 6b91aab6cd..38be6611ec 100644
--- a/chart/org.eclipse.birt.chart.device.extension/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.device.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.device.extension; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.chart.device.plugin.ChartDeviceExtensionPlugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.birt.chart.device.extension.i18n,
diff --git a/chart/org.eclipse.birt.chart.device.extension/pom.xml b/chart/org.eclipse.birt.chart.device.extension/pom.xml
index 1a081e180c..3453ba653b 100644
--- a/chart/org.eclipse.birt.chart.device.extension/pom.xml
+++ b/chart/org.eclipse.birt.chart.device.extension/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.device.extension</artifactId>
diff --git a/chart/org.eclipse.birt.chart.device.pdf/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.device.pdf/META-INF/MANIFEST.MF
index 0e47d9b7ab..99ab1d3e37 100644
--- a/chart/org.eclipse.birt.chart.device.pdf/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.device.pdf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.device.pdf; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.chart.device.pdf.plugin.ChartDevicePDFPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.birt.chart.device.svg;bundle-version="4.7.0",
diff --git a/chart/org.eclipse.birt.chart.device.pdf/pom.xml b/chart/org.eclipse.birt.chart.device.pdf/pom.xml
index a3b19bd570..4c66d40f58 100644
--- a/chart/org.eclipse.birt.chart.device.pdf/pom.xml
+++ b/chart/org.eclipse.birt.chart.device.pdf/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.device.pdf</artifactId>
diff --git a/chart/org.eclipse.birt.chart.device.svg/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.device.svg/META-INF/MANIFEST.MF
index 177d99ea18..fc4e76d67b 100644
--- a/chart/org.eclipse.birt.chart.device.svg/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.device.svg/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.device.svg;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.chart.device.svg.plugin.ChartDeviceSVGPlugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.birt.chart.device.svg,
diff --git a/chart/org.eclipse.birt.chart.device.svg/pom.xml b/chart/org.eclipse.birt.chart.device.svg/pom.xml
index ab50af0c2b..c5116e1f34 100644
--- a/chart/org.eclipse.birt.chart.device.svg/pom.xml
+++ b/chart/org.eclipse.birt.chart.device.svg/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.device.svg</artifactId>
diff --git a/chart/org.eclipse.birt.chart.device.swt/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.device.swt/META-INF/MANIFEST.MF
index defbd12b22..bcaf018432 100644
--- a/chart/org.eclipse.birt.chart.device.swt/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.device.swt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.device.swt; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.chart.device.swt.ChartDeviceSwtActivator
 Require-Bundle: org.eclipse.swt;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.birt.chart.engine;bundle-version="[2.1.0,5.0.0)"
diff --git a/chart/org.eclipse.birt.chart.device.swt/pom.xml b/chart/org.eclipse.birt.chart.device.swt/pom.xml
index 3b4d1b2afc..09ededa6ed 100644
--- a/chart/org.eclipse.birt.chart.device.swt/pom.xml
+++ b/chart/org.eclipse.birt.chart.device.swt/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.device.swt</artifactId>
diff --git a/chart/org.eclipse.birt.chart.engine.extension/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.engine.extension/META-INF/MANIFEST.MF
index eb96ecaf8c..ee353e5366 100644
--- a/chart/org.eclipse.birt.chart.engine.extension/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.engine.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.engine.extension; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.chart.plugin.ChartEngineExtensionPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/chart/org.eclipse.birt.chart.engine.extension/pom.xml b/chart/org.eclipse.birt.chart.engine.extension/pom.xml
index a03f181ec6..81ebbf5126 100644
--- a/chart/org.eclipse.birt.chart.engine.extension/pom.xml
+++ b/chart/org.eclipse.birt.chart.engine.extension/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.engine.extension</artifactId>
diff --git a/chart/org.eclipse.birt.chart.engine/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.engine/META-INF/MANIFEST.MF
index 328c599ab2..952f4cf781 100644
--- a/chart/org.eclipse.birt.chart.engine/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.engine/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.engine;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Export-Package: org.eclipse.birt.chart.aggregate,
diff --git a/chart/org.eclipse.birt.chart.engine/api/MANIFEST.MF b/chart/org.eclipse.birt.chart.engine/api/MANIFEST.MF
index da001ae458..efcfc3f855 100644
--- a/chart/org.eclipse.birt.chart.engine/api/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.engine/api/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Chart Engine API
 Bundle-SymbolicName: org.eclipse.birt.chart.engine.api; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse BIRT Project
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
diff --git a/chart/org.eclipse.birt.chart.engine/pom.xml b/chart/org.eclipse.birt.chart.engine/pom.xml
index 7dd87bf785..0d6612792d 100644
--- a/chart/org.eclipse.birt.chart.engine/pom.xml
+++ b/chart/org.eclipse.birt.chart.engine/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.engine</artifactId>
diff --git a/chart/org.eclipse.birt.chart.examples.core/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.examples.core/META-INF/MANIFEST.MF
index 79dd99ee4b..17dda9e4cd 100644
--- a/chart/org.eclipse.birt.chart.examples.core/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.examples.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.examples.core;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.chart.examples.ChartExamplesCorePlugin
 Require-Bundle: org.eclipse.birt.chart.engine;bundle-version="[2.6.0,5.0.0)",
  org.eclipse.birt.chart.engine.extension;bundle-version="[2.6.0,5.0.0)"
diff --git a/chart/org.eclipse.birt.chart.examples.core/api/MANIFEST.MF b/chart/org.eclipse.birt.chart.examples.core/api/MANIFEST.MF
index 06d269587a..d862c963e2 100644
--- a/chart/org.eclipse.birt.chart.examples.core/api/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.examples.core/api/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Chart Examples Core Plug-in
 Bundle-SymbolicName: org.eclipse.birt.chart.examples.core.api;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: Eclipse BIRT Project
diff --git a/chart/org.eclipse.birt.chart.examples.core/pom.xml b/chart/org.eclipse.birt.chart.examples.core/pom.xml
index a5c115850c..ffa692e244 100644
--- a/chart/org.eclipse.birt.chart.examples.core/pom.xml
+++ b/chart/org.eclipse.birt.chart.examples.core/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.examples.core</artifactId>
diff --git a/chart/org.eclipse.birt.chart.examples/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.examples/META-INF/MANIFEST.MF
index e8abe94eb7..d001995764 100644
--- a/chart/org.eclipse.birt.chart.examples/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.examples/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.examples; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Activator: org.eclipse.birt.chart.examples.ChartExamplesPlugin
 Bundle-Localization: plugin
diff --git a/chart/org.eclipse.birt.chart.examples/pom.xml b/chart/org.eclipse.birt.chart.examples/pom.xml
index 0b4dd7b2dd..12c35669c7 100644
--- a/chart/org.eclipse.birt.chart.examples/pom.xml
+++ b/chart/org.eclipse.birt.chart.examples/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.examples</artifactId>
diff --git a/chart/org.eclipse.birt.chart.integration.wtp.ui/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.integration.wtp.ui/META-INF/MANIFEST.MF
index da14ce377c..4e8768dd6b 100644
--- a/chart/org.eclipse.birt.chart.integration.wtp.ui/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.integration.wtp.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.integration.wtp.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.chart.integration.wtp.ui.ChartWTPUIPlugin
 Bundle-Localization: plugin
diff --git a/chart/org.eclipse.birt.chart.integration.wtp.ui/pom.xml b/chart/org.eclipse.birt.chart.integration.wtp.ui/pom.xml
index b1aac2a340..95b80b059c 100644
--- a/chart/org.eclipse.birt.chart.integration.wtp.ui/pom.xml
+++ b/chart/org.eclipse.birt.chart.integration.wtp.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.integration.wtp.ui</artifactId>
diff --git a/chart/org.eclipse.birt.chart.reportitem.ui/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.reportitem.ui/META-INF/MANIFEST.MF
index fad405fdb6..0f324ea59e 100644
--- a/chart/org.eclipse.birt.chart.reportitem.ui/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.reportitem.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.reportitem.ui; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.chart.reportitem.ui.ChartReportItemUIActivator
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.draw2d;bundle-version="[3.2.0,4.0.0)",
diff --git a/chart/org.eclipse.birt.chart.reportitem.ui/pom.xml b/chart/org.eclipse.birt.chart.reportitem.ui/pom.xml
index 92e7d7111b..a1344886ae 100644
--- a/chart/org.eclipse.birt.chart.reportitem.ui/pom.xml
+++ b/chart/org.eclipse.birt.chart.reportitem.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.reportitem.ui</artifactId>
diff --git a/chart/org.eclipse.birt.chart.reportitem/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.reportitem/META-INF/MANIFEST.MF
index d4b983b385..7ec624c0a2 100644
--- a/chart/org.eclipse.birt.chart.reportitem/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.reportitem/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.reportitem; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.chart.reportitem.plugin.ChartReportItemPlugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.birt.chart.reportitem,
diff --git a/chart/org.eclipse.birt.chart.reportitem/api/MANIFEST.MF b/chart/org.eclipse.birt.chart.reportitem/api/MANIFEST.MF
index 436fff6dc1..cb6e023d6e 100644
--- a/chart/org.eclipse.birt.chart.reportitem/api/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.reportitem/api/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Chart-Report Integration API
 Bundle-SymbolicName: org.eclipse.birt.chart.reportitem.api; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: Eclipse BIRT Project
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 
diff --git a/chart/org.eclipse.birt.chart.reportitem/pom.xml b/chart/org.eclipse.birt.chart.reportitem/pom.xml
index f35a398e3d..fb6d12f4b6 100644
--- a/chart/org.eclipse.birt.chart.reportitem/pom.xml
+++ b/chart/org.eclipse.birt.chart.reportitem/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.reportitem</artifactId>
diff --git a/chart/org.eclipse.birt.chart.tests/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.tests/META-INF/MANIFEST.MF
index d9edb047e4..edada61026 100644
--- a/chart/org.eclipse.birt.chart.tests/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.tests;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.chart.tests.TestsPlugin
 Bundle-Vendor: %Bundle-Vendor
diff --git a/chart/org.eclipse.birt.chart.tests/pom.xml b/chart/org.eclipse.birt.chart.tests/pom.xml
index d854e592fe..c14534f505 100644
--- a/chart/org.eclipse.birt.chart.tests/pom.xml
+++ b/chart/org.eclipse.birt.chart.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.tests</artifactId>
diff --git a/chart/org.eclipse.birt.chart.ui.extension/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.ui.extension/META-INF/MANIFEST.MF
index f8f5083ae7..820f7f7629 100644
--- a/chart/org.eclipse.birt.chart.ui.extension/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.ui.extension/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.ui.extension; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.chart.ui.plugin.ChartUIExtensionPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/chart/org.eclipse.birt.chart.ui.extension/pom.xml b/chart/org.eclipse.birt.chart.ui.extension/pom.xml
index 251af3d881..6b9ea299df 100644
--- a/chart/org.eclipse.birt.chart.ui.extension/pom.xml
+++ b/chart/org.eclipse.birt.chart.ui.extension/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.ui.extension</artifactId>
diff --git a/chart/org.eclipse.birt.chart.ui/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.ui/META-INF/MANIFEST.MF
index a35817294a..a79b0f92c5 100644
--- a/chart/org.eclipse.birt.chart.ui/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.ui; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.chart.ui.plugin.ChartUIPlugin
 Bundle-Vendor: %Bundle-Vendor
 Export-Package: org.eclipse.birt.chart.ui.i18n,
diff --git a/chart/org.eclipse.birt.chart.ui/pom.xml b/chart/org.eclipse.birt.chart.ui/pom.xml
index 108ba4b3a5..21dc65c2e2 100644
--- a/chart/org.eclipse.birt.chart.ui/pom.xml
+++ b/chart/org.eclipse.birt.chart.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.ui</artifactId>
diff --git a/chart/org.eclipse.birt.chart.viewer/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.viewer/META-INF/MANIFEST.MF
index 5393e21e58..447f3a510a 100644
--- a/chart/org.eclipse.birt.chart.viewer/META-INF/MANIFEST.MF
+++ b/chart/org.eclipse.birt.chart.viewer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.viewer;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .,
  WebContent/WEB-INF/lib/
 Bundle-Vendor: %Bundle-Vendor
diff --git a/chart/org.eclipse.birt.chart.viewer/pom.xml b/chart/org.eclipse.birt.chart.viewer/pom.xml
index 9ffdb8099b..7273be785b 100644
--- a/chart/org.eclipse.birt.chart.viewer/pom.xml
+++ b/chart/org.eclipse.birt.chart.viewer/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.viewer</artifactId>
diff --git a/chart/pom.xml b/chart/pom.xml
index 8cdbfdd889..e7434066f3 100644
--- a/chart/pom.xml
+++ b/chart/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/core/org.eclipse.birt.branding/META-INF/MANIFEST.MF b/core/org.eclipse.birt.branding/META-INF/MANIFEST.MF
index ec18b25ab8..856bb038f0 100644
--- a/core/org.eclipse.birt.branding/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.birt.branding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Branding
 Bundle-SymbolicName: org.eclipse.birt.branding;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: Eclipse BIRT Project
 Automatic-Module-Name: org.eclipse.birt.branding
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/core/org.eclipse.birt.branding/pom.xml b/core/org.eclipse.birt.branding/pom.xml
index 507fd19c30..9db13a8816 100644
--- a/core/org.eclipse.birt.branding/pom.xml
+++ b/core/org.eclipse.birt.branding/pom.xml
@@ -18,11 +18,11 @@
 	<parent>
 		<groupId>org.eclipse.birt.core</groupId>
 		<artifactId>org.eclipse.birt.core-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
 	<artifactId>org.eclipse.birt.branding</artifactId>
-    <version>4.17.0-SNAPSHOT</version>
+    <version>4.18.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 </project>
diff --git a/core/org.eclipse.birt.core.testhelper/META-INF/MANIFEST.MF b/core/org.eclipse.birt.core.testhelper/META-INF/MANIFEST.MF
index 4d1948fb45..81deda310f 100644
--- a/core/org.eclipse.birt.core.testhelper/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.birt.core.testhelper/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.core.testhelper
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.core;bundle-version="2.2.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit
diff --git a/core/org.eclipse.birt.core.testhelper/pom.xml b/core/org.eclipse.birt.core.testhelper/pom.xml
index e986d6e5ed..ac361a5706 100644
--- a/core/org.eclipse.birt.core.testhelper/pom.xml
+++ b/core/org.eclipse.birt.core.testhelper/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.core.testhelper</artifactId>
diff --git a/core/org.eclipse.birt.core.tests/META-INF/MANIFEST.MF b/core/org.eclipse.birt.core.tests/META-INF/MANIFEST.MF
index 9a4e64c7e0..7286827211 100644
--- a/core/org.eclipse.birt.core.tests/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.birt.core.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.core.tests;singleton:=true
 Bundle-ClassPath: .
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.core.Activator
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
diff --git a/core/org.eclipse.birt.core.tests/pom.xml b/core/org.eclipse.birt.core.tests/pom.xml
index fdaee05ab4..c0a127089f 100644
--- a/core/org.eclipse.birt.core.tests/pom.xml
+++ b/core/org.eclipse.birt.core.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.core.tests</artifactId>
diff --git a/core/org.eclipse.birt.core.ui/META-INF/MANIFEST.MF b/core/org.eclipse.birt.core.ui/META-INF/MANIFEST.MF
index a6c7ea3e6d..08391ce3b5 100644
--- a/core/org.eclipse.birt.core.ui/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.birt.core.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.core.ui; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.core.ui.plugin.CoreUIPlugin
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/core/org.eclipse.birt.core.ui/pom.xml b/core/org.eclipse.birt.core.ui/pom.xml
index 18457e6825..020cffd743 100644
--- a/core/org.eclipse.birt.core.ui/pom.xml
+++ b/core/org.eclipse.birt.core.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.core.ui</artifactId>
diff --git a/core/org.eclipse.birt.core/META-INF/MANIFEST.MF b/core/org.eclipse.birt.core/META-INF/MANIFEST.MF
index ca58b483a8..baa5ae13f3 100644
--- a/core/org.eclipse.birt.core/META-INF/MANIFEST.MF
+++ b/core/org.eclipse.birt.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.core; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.core.internal.plugin.CorePlugin
 Bundle-Vendor: %Bundle-Vendor
diff --git a/core/org.eclipse.birt.core/api/MANIFEST.MF b/core/org.eclipse.birt.core/api/MANIFEST.MF
index 45c5695155..e1692770f4 100644
--- a/core/org.eclipse.birt.core/api/MANIFEST.MF
+++ b/core/org.eclipse.birt.core/api/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Core API
 Bundle-SymbolicName: org.eclipse.birt.core.api; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse BIRT Project
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/core/org.eclipse.birt.core/pom.xml b/core/org.eclipse.birt.core/pom.xml
index f16508fcc6..3397000635 100644
--- a/core/org.eclipse.birt.core/pom.xml
+++ b/core/org.eclipse.birt.core/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.core</groupId>
 		<artifactId>org.eclipse.birt.core-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/core/pom.xml b/core/pom.xml
index 635b9d1a46..15f8d39fb9 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/data/org.eclipse.birt.core.script.function/META-INF/MANIFEST.MF b/data/org.eclipse.birt.core.script.function/META-INF/MANIFEST.MF
index 21c76bad16..990abbfcdc 100644
--- a/data/org.eclipse.birt.core.script.function/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.core.script.function/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name.0
 Bundle-SymbolicName: org.eclipse.birt.core.script.function;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.core;bundle-version="[2.3.0,5.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/data/org.eclipse.birt.core.script.function/pom.xml b/data/org.eclipse.birt.core.script.function/pom.xml
index b29018587b..1bc8fb93c7 100644
--- a/data/org.eclipse.birt.core.script.function/pom.xml
+++ b/data/org.eclipse.birt.core.script.function/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.core.script.function</artifactId>
diff --git a/data/org.eclipse.birt.data.aggregation/META-INF/MANIFEST.MF b/data/org.eclipse.birt.data.aggregation/META-INF/MANIFEST.MF
index 8fd469927e..69e436f751 100644
--- a/data/org.eclipse.birt.data.aggregation/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.data.aggregation/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.data.aggregation;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Activator: org.eclipse.birt.data.aggregation.plugin.AggregationPlugin
 Bundle-ActivationPolicy: lazy
diff --git a/data/org.eclipse.birt.data.aggregation/api/MANIFEST.MF b/data/org.eclipse.birt.data.aggregation/api/MANIFEST.MF
index 87f59c2e53..0806879f15 100644
--- a/data/org.eclipse.birt.data.aggregation/api/MANIFEST.MF
+++ b/data/org.eclipse.birt.data.aggregation/api/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Build-in Aggregation API
 Bundle-SymbolicName: org.eclipse.birt.data.aggregation.api;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: Eclipse BIRT Project
 Bundle-ClassPath: .
diff --git a/data/org.eclipse.birt.data.aggregation/pom.xml b/data/org.eclipse.birt.data.aggregation/pom.xml
index 593db82258..bac3edaeec 100644
--- a/data/org.eclipse.birt.data.aggregation/pom.xml
+++ b/data/org.eclipse.birt.data.aggregation/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.aggregation</artifactId>
diff --git a/data/org.eclipse.birt.data.oda.mongodb.ui/META-INF/MANIFEST.MF b/data/org.eclipse.birt.data.oda.mongodb.ui/META-INF/MANIFEST.MF
index 13d5a3acf8..6beb7fa61d 100644
--- a/data/org.eclipse.birt.data.oda.mongodb.ui/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.data.oda.mongodb.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.birt.data.oda.mongodb.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.ui;bundle-version="3.119.100",
diff --git a/data/org.eclipse.birt.data.oda.mongodb.ui/pom.xml b/data/org.eclipse.birt.data.oda.mongodb.ui/pom.xml
index 4c16e41801..de581b76b9 100644
--- a/data/org.eclipse.birt.data.oda.mongodb.ui/pom.xml
+++ b/data/org.eclipse.birt.data.oda.mongodb.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.oda.mongodb.ui</artifactId>
diff --git a/data/org.eclipse.birt.data.oda.mongodb/META-INF/MANIFEST.MF b/data/org.eclipse.birt.data.oda.mongodb/META-INF/MANIFEST.MF
index 9d30fe856a..1d2d200d71 100644
--- a/data/org.eclipse.birt.data.oda.mongodb/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.data.oda.mongodb/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.birt.data.oda.mongodb;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.data.oda.mongodb.Activator
 Bundle-Vendor: %Bundle-Vendor
diff --git a/data/org.eclipse.birt.data.oda.mongodb/pom.xml b/data/org.eclipse.birt.data.oda.mongodb/pom.xml
index 01e063fa6d..734fed4915 100644
--- a/data/org.eclipse.birt.data.oda.mongodb/pom.xml
+++ b/data/org.eclipse.birt.data.oda.mongodb/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.oda.mongodb</artifactId>
diff --git a/data/org.eclipse.birt.data.oda.pojo.tests/META-INF/MANIFEST.MF b/data/org.eclipse.birt.data.oda.pojo.tests/META-INF/MANIFEST.MF
index e42db46ff4..73121f747c 100644
--- a/data/org.eclipse.birt.data.oda.pojo.tests/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.data.oda.pojo.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.data.oda.pojo.tests
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.data.oda.pojo.tests.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
diff --git a/data/org.eclipse.birt.data.oda.pojo.tests/pom.xml b/data/org.eclipse.birt.data.oda.pojo.tests/pom.xml
index ed7d585cd6..531722568c 100644
--- a/data/org.eclipse.birt.data.oda.pojo.tests/pom.xml
+++ b/data/org.eclipse.birt.data.oda.pojo.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.oda.pojo.tests</artifactId>
diff --git a/data/org.eclipse.birt.data.oda.pojo.ui/META-INF/MANIFEST.MF b/data/org.eclipse.birt.data.oda.pojo.ui/META-INF/MANIFEST.MF
index 3f92305c7a..3caf96d461 100644
--- a/data/org.eclipse.birt.data.oda.pojo.ui/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.data.oda.pojo.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.birt.data.oda.pojo.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.data.oda.pojo.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/data/org.eclipse.birt.data.oda.pojo.ui/pom.xml b/data/org.eclipse.birt.data.oda.pojo.ui/pom.xml
index dff873924c..5f918581c6 100644
--- a/data/org.eclipse.birt.data.oda.pojo.ui/pom.xml
+++ b/data/org.eclipse.birt.data.oda.pojo.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.oda.pojo.ui</artifactId>
diff --git a/data/org.eclipse.birt.data.oda.pojo/META-INF/MANIFEST.MF b/data/org.eclipse.birt.data.oda.pojo/META-INF/MANIFEST.MF
index 66864ae15d..9794149378 100644
--- a/data/org.eclipse.birt.data.oda.pojo/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.data.oda.pojo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.birt.data.oda.pojo;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.data.oda.pojo.Activator
 Bundle-Vendor: %Bundle-Vendor
diff --git a/data/org.eclipse.birt.data.oda.pojo/pom.xml b/data/org.eclipse.birt.data.oda.pojo/pom.xml
index 6aa551b73e..308302a275 100644
--- a/data/org.eclipse.birt.data.oda.pojo/pom.xml
+++ b/data/org.eclipse.birt.data.oda.pojo/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.oda.pojo</artifactId>
diff --git a/data/org.eclipse.birt.data.tests/META-INF/MANIFEST.MF b/data/org.eclipse.birt.data.tests/META-INF/MANIFEST.MF
index d7fb0132f4..8a35fb4e70 100644
--- a/data/org.eclipse.birt.data.tests/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.data.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.data.tests;singleton:=true
 Bundle-ClassPath: .
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.data.tests.plugin.Activator
 Require-Bundle: org.eclipse.birt.data;bundle-version="4.13.0",
  org.apache.derby;bundle-version="10.11.1",
diff --git a/data/org.eclipse.birt.data.tests/pom.xml b/data/org.eclipse.birt.data.tests/pom.xml
index b935888549..1fb19dea29 100644
--- a/data/org.eclipse.birt.data.tests/pom.xml
+++ b/data/org.eclipse.birt.data.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.tests</artifactId>
diff --git a/data/org.eclipse.birt.data/META-INF/MANIFEST.MF b/data/org.eclipse.birt.data/META-INF/MANIFEST.MF
index b22015e598..e051490351 100644
--- a/data/org.eclipse.birt.data/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.data/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.data; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.data.engine.plugin.DataEnginePlugin
 Bundle-Vendor: %Bundle-Vendor
diff --git a/data/org.eclipse.birt.data/api/MANIFEST.MF b/data/org.eclipse.birt.data/api/MANIFEST.MF
index b87f11093f..101e9e8bc9 100644
--- a/data/org.eclipse.birt.data/api/MANIFEST.MF
+++ b/data/org.eclipse.birt.data/api/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Data Engine API
 Bundle-SymbolicName: org.eclipse.birt.data.api; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse BIRT Project
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/data/org.eclipse.birt.data/pom.xml b/data/org.eclipse.birt.data/pom.xml
index e85e52f52c..0a003456f5 100644
--- a/data/org.eclipse.birt.data/pom.xml
+++ b/data/org.eclipse.birt.data/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data</artifactId>
diff --git a/data/org.eclipse.birt.report.data.adapter/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.adapter/META-INF/MANIFEST.MF
index 5cff8ff2c8..85a354f8d7 100644
--- a/data/org.eclipse.birt.report.data.adapter/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.adapter/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.adapter;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.data.adapter.Activator
 Require-Bundle: org.eclipse.birt.core;bundle-version="[2.1.0,5.0.0)",
  org.eclipse.birt.data;bundle-version="[2.1.0,5.0.0)",
diff --git a/data/org.eclipse.birt.report.data.adapter/api/MANIFEST.MF b/data/org.eclipse.birt.report.data.adapter/api/MANIFEST.MF
index c4742f74c7..8c8618d129 100644
--- a/data/org.eclipse.birt.report.data.adapter/api/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.adapter/api/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Data Adapter API
 Bundle-SymbolicName: org.eclipse.birt.report.data.adapter.api;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: Eclipse BIRT Project
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/data/org.eclipse.birt.report.data.adapter/pom.xml b/data/org.eclipse.birt.report.data.adapter/pom.xml
index 0111e9b840..5b568887bb 100644
--- a/data/org.eclipse.birt.report.data.adapter/pom.xml
+++ b/data/org.eclipse.birt.report.data.adapter/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.adapter</artifactId>
diff --git a/data/org.eclipse.birt.report.data.bidi.utils.ui/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.bidi.utils.ui/META-INF/MANIFEST.MF
index 799e414411..bb483ba441 100644
--- a/data/org.eclipse.birt.report.data.bidi.utils.ui/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.bidi.utils.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.bidi.utils.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.birt.report.data.bidi.utils.ui
 Require-Bundle: org.eclipse.birt.report.data.bidi.utils;bundle-version="[2.5.1,5.0.0)",
diff --git a/data/org.eclipse.birt.report.data.bidi.utils.ui/pom.xml b/data/org.eclipse.birt.report.data.bidi.utils.ui/pom.xml
index b368886753..c0ec0aae1f 100644
--- a/data/org.eclipse.birt.report.data.bidi.utils.ui/pom.xml
+++ b/data/org.eclipse.birt.report.data.bidi.utils.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.bidi.utils.ui</artifactId>
diff --git a/data/org.eclipse.birt.report.data.bidi.utils/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.bidi.utils/META-INF/MANIFEST.MF
index 76b1ebe04d..6b8cc46a23 100644
--- a/data/org.eclipse.birt.report.data.bidi.utils/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.bidi.utils/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.bidi.utils;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.birt.report.data.bidi.utils.core,
  org.eclipse.birt.report.data.bidi.utils.i18n
diff --git a/data/org.eclipse.birt.report.data.bidi.utils/pom.xml b/data/org.eclipse.birt.report.data.bidi.utils/pom.xml
index 0b684a9b5a..ca73f56f16 100644
--- a/data/org.eclipse.birt.report.data.bidi.utils/pom.xml
+++ b/data/org.eclipse.birt.report.data.bidi.utils/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.bidi.utils</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.excel.ui/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.excel.ui/META-INF/MANIFEST.MF
index 09dd6fdb08..ea69f5500b 100644
--- a/data/org.eclipse.birt.report.data.oda.excel.ui/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.excel.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.excel.ui; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.data.oda.excel.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/data/org.eclipse.birt.report.data.oda.excel.ui/pom.xml b/data/org.eclipse.birt.report.data.oda.excel.ui/pom.xml
index 003a2256d4..c8fc30c595 100644
--- a/data/org.eclipse.birt.report.data.oda.excel.ui/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.excel.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.excel.ui</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.excel/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.excel/META-INF/MANIFEST.MF
index cc351da13f..5160f676f1 100644
--- a/data/org.eclipse.birt.report.data.oda.excel/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.excel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.excel; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.data.oda.excel.Activator
 Bundle-Vendor: %Bundle-Vendor
diff --git a/data/org.eclipse.birt.report.data.oda.excel/pom.xml b/data/org.eclipse.birt.report.data.oda.excel/pom.xml
index 4817d8764e..685d789d63 100644
--- a/data/org.eclipse.birt.report.data.oda.excel/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.excel/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.excel</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.hive.ui/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.hive.ui/META-INF/MANIFEST.MF
index 48857e914b..a5d0cd3f20 100644
--- a/data/org.eclipse.birt.report.data.oda.hive.ui/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.hive.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.hive.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.data.oda.hive.ui.plugin.HiveUIPlugin
 Bundle-Vendor: %Bundle-Vendor
diff --git a/data/org.eclipse.birt.report.data.oda.hive.ui/pom.xml b/data/org.eclipse.birt.report.data.oda.hive.ui/pom.xml
index 390360e803..c96c0a5d17 100644
--- a/data/org.eclipse.birt.report.data.oda.hive.ui/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.hive.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.hive.ui</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.hive/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.hive/META-INF/MANIFEST.MF
index 28feb5289d..1232f246fb 100644
--- a/data/org.eclipse.birt.report.data.oda.hive/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.hive/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.hive;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
diff --git a/data/org.eclipse.birt.report.data.oda.hive/pom.xml b/data/org.eclipse.birt.report.data.oda.hive/pom.xml
index 07960d3378..aa73cbef63 100644
--- a/data/org.eclipse.birt.report.data.oda.hive/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.hive/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.hive</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.ui/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.ui/META-INF/MANIFEST.MF
index 890db0114f..2a52066be2 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.ui/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.ui/pom.xml b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.ui/pom.xml
index 4f6cef6a67..abdfe2aa7e 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.ui/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.ui</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb/META-INF/MANIFEST.MF
index 2b5223d326..64dd24ab31 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Bundle-ActivationPolicy: lazy
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb/pom.xml b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb/pom.xml
index df7be74d5c..52a0140573 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui/META-INF/MANIFEST.MF
index 9513a2e97c..b16cccebc5 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui.Activator
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui/pom.xml b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui/pom.xml
index b7b66fb45e..cfeef736a3 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile/META-INF/MANIFEST.MF
index 7958f48db0..33d43ad7ca 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc.dbprofile;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.data.oda.jdbc.dbprofile.Activator
 Bundle-Vendor: %Bundle-Vendor
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile/pom.xml b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile/pom.xml
index 62fa175bb9..5f01329870 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.dbprofile/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.jdbc.dbprofile</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.tests/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.jdbc.tests/META-INF/MANIFEST.MF
index bae0d8c66a..a6adae77c2 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.tests/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc.tests;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.data.oda.jdbc.plugin.Activator
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.23.0",
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.tests/pom.xml b/data/org.eclipse.birt.report.data.oda.jdbc.tests/pom.xml
index 9016f223c6..40a93a6bd3 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.tests/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.jdbc.tests</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.ui/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.jdbc.ui/META-INF/MANIFEST.MF
index 290c39f73c..c74bdba080 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.ui/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.data.oda.jdbc.ui.JdbcPlugin
 Bundle-Vendor: %Bundle-Vendor
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc.ui/pom.xml b/data/org.eclipse.birt.report.data.oda.jdbc.ui/pom.xml
index d986fd2e80..507b058c1d 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc.ui/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.jdbc.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.jdbc.ui</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.jdbc/META-INF/MANIFEST.MF
index bdd2867c9b..25c1a72342 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.jdbc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.data.oda.plugin.OdaJdbcPlugin
 Bundle-Vendor: %Bundle-Vendor
diff --git a/data/org.eclipse.birt.report.data.oda.jdbc/pom.xml b/data/org.eclipse.birt.report.data.oda.jdbc/pom.xml
index 04f0ddb22a..195f5b1d28 100644
--- a/data/org.eclipse.birt.report.data.oda.jdbc/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.jdbc/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.jdbc</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.sampledb.ui/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.sampledb.ui/META-INF/MANIFEST.MF
index 6d39fd746b..516e211f7c 100644
--- a/data/org.eclipse.birt.report.data.oda.sampledb.ui/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.sampledb.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.sampledb.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.data.oda.sampledb.ui.plugin.SampledbUIPlugin
 Bundle-Vendor: %Bundle-Vendor
diff --git a/data/org.eclipse.birt.report.data.oda.sampledb.ui/pom.xml b/data/org.eclipse.birt.report.data.oda.sampledb.ui/pom.xml
index de417e74f6..b7597c0ded 100644
--- a/data/org.eclipse.birt.report.data.oda.sampledb.ui/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.sampledb.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.sampledb.ui</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.sampledb/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.sampledb/META-INF/MANIFEST.MF
index a8173137d4..11dd5e3fa2 100644
--- a/data/org.eclipse.birt.report.data.oda.sampledb/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.sampledb/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.sampledb;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.data.oda.sampledb.SampledbPlugin
 Bundle-Vendor: %Bundle-Vendor
diff --git a/data/org.eclipse.birt.report.data.oda.sampledb/pom.xml b/data/org.eclipse.birt.report.data.oda.sampledb/pom.xml
index 2f2d4f8c14..9a55a8bc73 100644
--- a/data/org.eclipse.birt.report.data.oda.sampledb/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.sampledb/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.sampledb</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.xml.ui/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.xml.ui/META-INF/MANIFEST.MF
index e7ad6db32d..414b575364 100644
--- a/data/org.eclipse.birt.report.data.oda.xml.ui/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.xml.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %plugin.name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.xml.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/data/org.eclipse.birt.report.data.oda.xml.ui/pom.xml b/data/org.eclipse.birt.report.data.oda.xml.ui/pom.xml
index 78143d96eb..e500b55296 100644
--- a/data/org.eclipse.birt.report.data.oda.xml.ui/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.xml.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.xml.ui</artifactId>
diff --git a/data/org.eclipse.birt.report.data.oda.xml/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.data.oda.xml/META-INF/MANIFEST.MF
index c452871ff3..f2f03b56e7 100644
--- a/data/org.eclipse.birt.report.data.oda.xml/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.data.oda.xml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.xml;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/data/org.eclipse.birt.report.data.oda.xml/pom.xml b/data/org.eclipse.birt.report.data.oda.xml/pom.xml
index 8abeadadae..2e78902015 100644
--- a/data/org.eclipse.birt.report.data.oda.xml/pom.xml
+++ b/data/org.eclipse.birt.report.data.oda.xml/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.xml</artifactId>
diff --git a/data/org.eclipse.birt.report.engine.script.javascript/META-INF/MANIFEST.MF b/data/org.eclipse.birt.report.engine.script.javascript/META-INF/MANIFEST.MF
index f22c0b7b4f..dae9c2c031 100644
--- a/data/org.eclipse.birt.report.engine.script.javascript/META-INF/MANIFEST.MF
+++ b/data/org.eclipse.birt.report.engine.script.javascript/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.script.javascript;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.core;bundle-version="[2.5.0,5.0.0)",
  org.eclipse.birt.report.engine;bundle-version="[2.5.1,5.0.0)",
  org.eclipse.birt.data;bundle-version="[2.5.1,5.0.0)"
diff --git a/data/org.eclipse.birt.report.engine.script.javascript/pom.xml b/data/org.eclipse.birt.report.engine.script.javascript/pom.xml
index b966aa24fa..8cb9114bde 100644
--- a/data/org.eclipse.birt.report.engine.script.javascript/pom.xml
+++ b/data/org.eclipse.birt.report.engine.script.javascript/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.script.javascript</artifactId>
diff --git a/data/pom.xml b/data/pom.xml
index 72715005ca..82b17d86a5 100644
--- a/data/pom.xml
+++ b/data/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/docs/org.eclipse.birt.chart.cshelp/META-INF/MANIFEST.MF b/docs/org.eclipse.birt.chart.cshelp/META-INF/MANIFEST.MF
index bd4f8868f5..39dcf8db69 100644
--- a/docs/org.eclipse.birt.chart.cshelp/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.birt.chart.cshelp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.cshelp;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)",
diff --git a/docs/org.eclipse.birt.chart.cshelp/pom.xml b/docs/org.eclipse.birt.chart.cshelp/pom.xml
index 8e933b86b4..ebc44e30ae 100644
--- a/docs/org.eclipse.birt.chart.cshelp/pom.xml
+++ b/docs/org.eclipse.birt.chart.cshelp/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.cshelp</artifactId>
diff --git a/docs/org.eclipse.birt.chart.doc.isv/META-INF/MANIFEST.MF b/docs/org.eclipse.birt.chart.doc.isv/META-INF/MANIFEST.MF
index 7730810e69..e25d794007 100644
--- a/docs/org.eclipse.birt.chart.doc.isv/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.birt.chart.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.doc.isv;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/docs/org.eclipse.birt.chart.doc.isv/pom.xml b/docs/org.eclipse.birt.chart.doc.isv/pom.xml
index a0e26f4864..5ce2f33eaf 100644
--- a/docs/org.eclipse.birt.chart.doc.isv/pom.xml
+++ b/docs/org.eclipse.birt.chart.doc.isv/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.doc.isv</artifactId>
diff --git a/docs/org.eclipse.birt.cshelp/META-INF/MANIFEST.MF b/docs/org.eclipse.birt.cshelp/META-INF/MANIFEST.MF
index c620490d05..2562ad7762 100644
--- a/docs/org.eclipse.birt.cshelp/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.birt.cshelp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.cshelp;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.core.internal.compatibility.PluginActivator
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/docs/org.eclipse.birt.cshelp/pom.xml b/docs/org.eclipse.birt.cshelp/pom.xml
index 035c08e32a..47eeff58bc 100644
--- a/docs/org.eclipse.birt.cshelp/pom.xml
+++ b/docs/org.eclipse.birt.cshelp/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.cshelp</artifactId>
diff --git a/docs/org.eclipse.birt.doc.isv/META-INF/MANIFEST.MF b/docs/org.eclipse.birt.doc.isv/META-INF/MANIFEST.MF
index c30f4a427f..1dedd37c79 100644
--- a/docs/org.eclipse.birt.doc.isv/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.birt.doc.isv/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.doc.isv;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/docs/org.eclipse.birt.doc.isv/pom.xml b/docs/org.eclipse.birt.doc.isv/pom.xml
index ae182a6527..123ab446a2 100644
--- a/docs/org.eclipse.birt.doc.isv/pom.xml
+++ b/docs/org.eclipse.birt.doc.isv/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.doc.isv</artifactId>
diff --git a/docs/org.eclipse.birt.doc/META-INF/MANIFEST.MF b/docs/org.eclipse.birt.doc/META-INF/MANIFEST.MF
index 1b9d1fa5f0..cf44b54a34 100644
--- a/docs/org.eclipse.birt.doc/META-INF/MANIFEST.MF
+++ b/docs/org.eclipse.birt.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.doc; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/docs/org.eclipse.birt.doc/pom.xml b/docs/org.eclipse.birt.doc/pom.xml
index 1bce1c18da..c3dce3586a 100644
--- a/docs/org.eclipse.birt.doc/pom.xml
+++ b/docs/org.eclipse.birt.doc/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.doc</artifactId>
diff --git a/docs/pom.xml b/docs/pom.xml
index 492bb27eef..01ccb01b78 100644
--- a/docs/pom.xml
+++ b/docs/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/engine/org.eclipse.birt.report.engine.dataextraction.csv.tests/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.dataextraction.csv.tests/META-INF/MANIFEST.MF
index 5d91e7d840..1a8dc0f60b 100644
--- a/engine/org.eclipse.birt.report.engine.dataextraction.csv.tests/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.dataextraction.csv.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.dataextraction.csv.tests
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine.dataextraction.csv
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.junit
diff --git a/engine/org.eclipse.birt.report.engine.dataextraction.csv.tests/pom.xml b/engine/org.eclipse.birt.report.engine.dataextraction.csv.tests/pom.xml
index 29ed5d280a..9ded9f7ca8 100644
--- a/engine/org.eclipse.birt.report.engine.dataextraction.csv.tests/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.dataextraction.csv.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.dataextraction.csv.tests</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.dataextraction.csv/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.dataextraction.csv/META-INF/MANIFEST.MF
index 577cb8c7f0..e79021f016 100644
--- a/engine/org.eclipse.birt.report.engine.dataextraction.csv/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.dataextraction.csv/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Eclipse-ExtensibleAPI: true
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.dataextraction.csv;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.birt.report.engine.dataextraction;bundle-version="[2.3.0,5.0.0)",
diff --git a/engine/org.eclipse.birt.report.engine.dataextraction.csv/pom.xml b/engine/org.eclipse.birt.report.engine.dataextraction.csv/pom.xml
index 5a5d6931c5..5dcbd9e4d3 100644
--- a/engine/org.eclipse.birt.report.engine.dataextraction.csv/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.dataextraction.csv/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.dataextraction.csv</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.dataextraction/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.dataextraction/META-INF/MANIFEST.MF
index 9df503f158..be685c0f08 100644
--- a/engine/org.eclipse.birt.report.engine.dataextraction/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.dataextraction/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.dataextraction;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="[2.3.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
diff --git a/engine/org.eclipse.birt.report.engine.dataextraction/api/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.dataextraction/api/MANIFEST.MF
index b1498c38c8..72e658e694 100644
--- a/engine/org.eclipse.birt.report.engine.dataextraction/api/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.dataextraction/api/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dataextraction API
 Bundle-SymbolicName: org.eclipse.birt.report.engine.dataextraction.api;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: Eclipse BIRT Project
 
diff --git a/engine/org.eclipse.birt.report.engine.dataextraction/pom.xml b/engine/org.eclipse.birt.report.engine.dataextraction/pom.xml
index effbb5c957..96741f2974 100644
--- a/engine/org.eclipse.birt.report.engine.dataextraction/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.dataextraction/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.dataextraction</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.docx/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config.docx/META-INF/MANIFEST.MF
index 93b3f5ad20..054537ddaf 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.docx/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.docx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.docx;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.docx/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.config.docx/pom.xml
index c0bd16a667..4b077b69fe 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.docx/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.docx/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.docx</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.excel/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config.excel/META-INF/MANIFEST.MF
index 1ca3085755..5186f67a62 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.excel/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.excel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.excel;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.excel/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.config.excel/pom.xml
index e369afc8c7..bdd24136bd 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.excel/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.excel/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.excel</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.html/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config.html/META-INF/MANIFEST.MF
index 73492c02ac..7cde4386e2 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.html/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.html/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.html;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.html/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.config.html/pom.xml
index ac689228d8..6ab883062c 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.html/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.html/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.html</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.odp/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config.odp/META-INF/MANIFEST.MF
index 6325d6165b..81eea0efa8 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.odp/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.odp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.odp;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.odp/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.config.odp/pom.xml
index a14618bd37..cab7dec995 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.odp/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.odp/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.odp</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.ods/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config.ods/META-INF/MANIFEST.MF
index 36007759cc..bb001aa9b5 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.ods/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.ods/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.ods;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.ods/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.config.ods/pom.xml
index bd4116ea39..899ced5e69 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.ods/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.ods/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.ods</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.odt/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config.odt/META-INF/MANIFEST.MF
index 8e86e01fc3..def91d031c 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.odt/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.odt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.odt;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.odt/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.config.odt/pom.xml
index 22f9d14cbc..7c3351eb8f 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.odt/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.odt/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.odt</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.pdf/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config.pdf/META-INF/MANIFEST.MF
index 379fba4bda..be63823a3c 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.pdf/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.pdf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.pdf;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.pdf/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.config.pdf/pom.xml
index d5a12a2732..6d85c64d4a 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.pdf/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.pdf/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.pdf</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.postscript/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config.postscript/META-INF/MANIFEST.MF
index 06b96c9e82..d7106e774c 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.postscript/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.postscript/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.postscript;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.postscript/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.config.postscript/pom.xml
index c2afbeb1a1..9429177c88 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.postscript/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.postscript/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.postscript</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.ppt/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config.ppt/META-INF/MANIFEST.MF
index 5d79dbb2f3..7ccfa57cf0 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.ppt/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.ppt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.ppt;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.ppt/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.config.ppt/pom.xml
index 0eba6138c7..09c21906d4 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.ppt/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.ppt/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.ppt</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.pptx/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config.pptx/META-INF/MANIFEST.MF
index 72c5fdf795..469e360620 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.pptx/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.pptx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.pptx;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.pptx/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.config.pptx/pom.xml
index b8d40d171b..bd39b8f036 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.pptx/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.pptx/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.pptx</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.wpml/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config.wpml/META-INF/MANIFEST.MF
index 3997753d1a..f4c14ef724 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.wpml/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.wpml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.wpml;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config.wpml/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.config.wpml/pom.xml
index a0840d006a..eaec8ed859 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config.wpml/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.config.wpml/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.wpml</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config/META-INF/MANIFEST.MF
index e9aaa9e4f8..4a9e529121 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config/api/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.config/api/MANIFEST.MF
index e0fe040332..667a3716e1 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config/api/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.config/api/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Emitter Configuration API
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.api;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse BIRT Project
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/engine/org.eclipse.birt.report.engine.emitter.config/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.config/pom.xml
index 6877673d01..094ba9359e 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.config/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.config/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.docx/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.docx/META-INF/MANIFEST.MF
index 195fea533b..f3755afa9c 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.docx/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.docx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.docx;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="[2.1.0,5.0.0)",
  org.eclipse.birt.report.engine.emitter.wpml;bundle-version="[4.2.0,5.0.0)",
  org.eclipse.birt.report.engine.ooxml;bundle-version="[4.2.2,5.0.0)"
diff --git a/engine/org.eclipse.birt.report.engine.emitter.docx/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.docx/pom.xml
index 4ed7dbb71e..a8030c62c9 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.docx/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.docx/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.docx</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.html.tests/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.html.tests/META-INF/MANIFEST.MF
index 9dbadcff9d..f037dd9df6 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.html.tests/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.html.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.html.tests;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.engine.emitter.html.tests.Activator
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.html.tests/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.html.tests/pom.xml
index 5470e7f0eb..53c42417e0 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.html.tests/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.html.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.html.tests</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.html/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.html/META-INF/MANIFEST.MF
index 995811aaa3..7ab5f060f8 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.html/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.html/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.html; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.engine.emitter.html.plugin.HTMLEmitterPlugin
 Bundle-Vendor: %Bundle-Vendor
diff --git a/engine/org.eclipse.birt.report.engine.emitter.html/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.html/pom.xml
index fcdc8e8d75..2b94024a34 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.html/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.html/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.html</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.odp/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.odp/META-INF/MANIFEST.MF
index b879df12e4..6b381f3781 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.odp/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.odp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.odp;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="[2.1.0,5.0.0)",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.odp/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.odp/pom.xml
index 2b7a8d8872..ea11a16186 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.odp/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.odp/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.odp</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.ods/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.ods/META-INF/MANIFEST.MF
index 837199992a..374f59b2d5 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.ods/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.ods/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.ods;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="4.13.0",
  org.eclipse.birt.chart.engine;bundle-version="4.13.0",
  org.eclipse.birt.chart.engine.extension;bundle-version="4.13.0",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.ods/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.ods/pom.xml
index b3e1ef2f2d..0913ff7d5d 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.ods/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.ods/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.ods</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.odt/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.odt/META-INF/MANIFEST.MF
index c7281106e8..3e483e0c71 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.odt/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.odt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.odt;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="4.13.0",
  org.eclipse.birt.report.engine.fonts;bundle-version="4.13.0",
  org.eclipse.birt.core;bundle-version="4.13.0",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.odt/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.odt/pom.xml
index 31ddb70092..94ca1fba22 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.odt/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.odt/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.odt</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/META-INF/MANIFEST.MF
index 5f09415911..c5181ac15b 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.pdf.tests;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.engine.emitter.pdf.tests.Activator
 Import-Package: org.osgi.framework;version="1.3.0"
 Bundle-ActivationPolicy: lazy
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/pom.xml
index 61117281b7..d879559b4a 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.pdf.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.pdf.tests</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pdf/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.pdf/META-INF/MANIFEST.MF
index df90db2e4b..8124d0c1e0 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pdf/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.pdf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.pdf; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.birt.core;bundle-version="[2.1.0,5.0.0)",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pdf/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.pdf/pom.xml
index 6c22ab1ff7..61d5d7b11a 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pdf/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.pdf/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.pdf</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/META-INF/MANIFEST.MF
index 25325c4870..424c3321ae 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.postscript.tests;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.engine.emitter.postscript.Activator
 Import-Package: org.osgi.framework;version="1.3.0"
 Require-Bundle: org.eclipse.birt.core;bundle-version="4.13.0",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/pom.xml
index c6085d3729..4a2955a24c 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.postscript.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.postscript.tests</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.postscript/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.postscript/META-INF/MANIFEST.MF
index 0663769714..5b9ecdf29c 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.postscript/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.postscript/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.postscript;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="[2.1.0,5.0.0)",
  org.eclipse.birt.report.engine.fonts;bundle-version="[2.1.0,5.0.0)",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.postscript/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.postscript/pom.xml
index d3c460e7df..803db09198 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.postscript/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.postscript/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.postscript</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.ppt/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.ppt/META-INF/MANIFEST.MF
index 4b1ec4d247..189209dce2 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.ppt/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.ppt/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.ppt; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.birt.core;bundle-version="[2.1.0,5.0.0)",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.ppt/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.ppt/pom.xml
index 52baba1607..76f5a42e0e 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.ppt/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.ppt/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.ppt</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pptx.tests/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.pptx.tests/META-INF/MANIFEST.MF
index 4922113a30..198996d16c 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pptx.tests/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.pptx.tests/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.pptx.tests
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="4.2.3",
  org.eclipse.birt.report.engine.emitter.pptx;bundle-version="4.5.0",
  org.junit;bundle-version="4.13.0",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pptx.tests/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.pptx.tests/pom.xml
index bfcd34d5d4..4d67b76566 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pptx.tests/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.pptx.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.pptx.tests</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pptx/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.pptx/META-INF/MANIFEST.MF
index 8ffd3e9904..d2ee761772 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pptx/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.pptx/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.pptx;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="[2.1.0,5.0.0)",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.pptx/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.pptx/pom.xml
index 72cb91266b..de0ba02fda 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.pptx/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.pptx/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.pptx</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/META-INF/MANIFEST.MF
index 32cf4b20a5..597c190c86 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.prototype.excel.tests
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.engine.emitter.prototype.excel.tests.Activator
 Require-Bundle: org.eclipse.birt.report.engine.emitter.prototype.excel;bundle-version="[2.1.0,5.0.0)",
  org.eclipse.birt.report.engine;bundle-version="[2.5.0,5.0.0)",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/pom.xml
index d524e260bc..b20d87bbb8 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.prototype.excel.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.prototype.excel.tests</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.prototype.excel/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.prototype.excel/META-INF/MANIFEST.MF
index 09f7bdeb5f..f8e9c393cf 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.prototype.excel/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.prototype.excel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.prototype.excel;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="4.13.0",
  org.eclipse.birt.chart.engine;bundle-version="4.13.0",
  org.eclipse.birt.chart.engine.extension;bundle-version="4.13.0",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.prototype.excel/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.prototype.excel/pom.xml
index 5b2517d357..769f8f9e40 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.prototype.excel/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.prototype.excel/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.prototype.excel</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.emitter.wpml/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.emitter.wpml/META-INF/MANIFEST.MF
index 6f579893fb..f862214a0b 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.wpml/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.emitter.wpml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.wpml;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="4.13.0",
  org.eclipse.birt.report.engine.fonts;bundle-version="4.13.0",
  org.eclipse.birt.core;bundle-version="4.13.0",
diff --git a/engine/org.eclipse.birt.report.engine.emitter.wpml/pom.xml b/engine/org.eclipse.birt.report.engine.emitter.wpml/pom.xml
index 4e431b48cf..ead3b2ebba 100644
--- a/engine/org.eclipse.birt.report.engine.emitter.wpml/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.emitter.wpml/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.wpml</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.fonts/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.fonts/META-INF/MANIFEST.MF
index dddc303a79..71e35ffc75 100644
--- a/engine/org.eclipse.birt.report.engine.fonts/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.fonts/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.fonts
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Eclipse-BundleShape: dir
diff --git a/engine/org.eclipse.birt.report.engine.fonts/pom.xml b/engine/org.eclipse.birt.report.engine.fonts/pom.xml
index 434c968a17..0f705c01ea 100644
--- a/engine/org.eclipse.birt.report.engine.fonts/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.fonts/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.fonts</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.odf/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.odf/META-INF/MANIFEST.MF
index e7d921eeff..2841d9540f 100644
--- a/engine/org.eclipse.birt.report.engine.odf/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.odf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.odf;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.engine.odf.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/engine/org.eclipse.birt.report.engine.odf/pom.xml b/engine/org.eclipse.birt.report.engine.odf/pom.xml
index 2fd6ce6783..a67618e29b 100644
--- a/engine/org.eclipse.birt.report.engine.odf/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.odf/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.odf</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.ooxml/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.ooxml/META-INF/MANIFEST.MF
index 4bd55fb264..1e497abe07 100644
--- a/engine/org.eclipse.birt.report.engine.ooxml/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.ooxml/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.ooxml;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="[2.1.0,5.0.0)"
diff --git a/engine/org.eclipse.birt.report.engine.ooxml/pom.xml b/engine/org.eclipse.birt.report.engine.ooxml/pom.xml
index 25ed5a172c..9ff5b01c31 100644
--- a/engine/org.eclipse.birt.report.engine.ooxml/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.ooxml/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.ooxml</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.testhelper/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.testhelper/META-INF/MANIFEST.MF
index aac25c9add..f324e0e106 100644
--- a/engine/org.eclipse.birt.report.engine.testhelper/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.testhelper/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.testhelper
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine;bundle-version="[2.5.0,5.0.0)"
 Bundle-ClassPath: .
 Export-Package: org.eclipse.birt.report.engine,
diff --git a/engine/org.eclipse.birt.report.engine.testhelper/pom.xml b/engine/org.eclipse.birt.report.engine.testhelper/pom.xml
index a1790e137e..7b4a61e20f 100644
--- a/engine/org.eclipse.birt.report.engine.testhelper/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.testhelper/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.testhelper</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine.tests/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine.tests/META-INF/MANIFEST.MF
index 6517a7bd2e..1dfd582d00 100644
--- a/engine/org.eclipse.birt.report.engine.tests/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.tests; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.birt.core;bundle-version="[2.1.0,5.0.0)",
  org.eclipse.birt.report.engine;bundle-version="[2.1.0,5.0.0)",
diff --git a/engine/org.eclipse.birt.report.engine.tests/pom.xml b/engine/org.eclipse.birt.report.engine.tests/pom.xml
index c8fed1524b..8a35fe41a3 100644
--- a/engine/org.eclipse.birt.report.engine.tests/pom.xml
+++ b/engine/org.eclipse.birt.report.engine.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.tests</artifactId>
diff --git a/engine/org.eclipse.birt.report.engine/META-INF/MANIFEST.MF b/engine/org.eclipse.birt.report.engine/META-INF/MANIFEST.MF
index 44d3824ed4..b5e3da86d6 100644
--- a/engine/org.eclipse.birt.report.engine/META-INF/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.report.engine.plugin.EnginePlugin
 Bundle-Vendor: %Bundle-Vendor
diff --git a/engine/org.eclipse.birt.report.engine/api/engineapi/MANIFEST.MF b/engine/org.eclipse.birt.report.engine/api/engineapi/MANIFEST.MF
index 3902ba6a74..ed7e4cce25 100644
--- a/engine/org.eclipse.birt.report.engine/api/engineapi/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine/api/engineapi/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Engine API
 Bundle-SymbolicName: org.eclipse.birt.report.engine.api; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse BIRT Project
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/engine/org.eclipse.birt.report.engine/api/scriptapi/MANIFEST.MF b/engine/org.eclipse.birt.report.engine/api/scriptapi/MANIFEST.MF
index 7bb9f15d59..900257b5fb 100644
--- a/engine/org.eclipse.birt.report.engine/api/scriptapi/MANIFEST.MF
+++ b/engine/org.eclipse.birt.report.engine/api/scriptapi/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Engine Script API
 Bundle-SymbolicName: org.eclipse.birt.report.engine.scriptapi; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse BIRT Project
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/engine/org.eclipse.birt.report.engine/pom.xml b/engine/org.eclipse.birt.report.engine/pom.xml
index 2e7fe8d9ba..a261205a24 100644
--- a/engine/org.eclipse.birt.report.engine/pom.xml
+++ b/engine/org.eclipse.birt.report.engine/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine</artifactId>
diff --git a/engine/pom.xml b/engine/pom.xml
index 846c661f9c..1c78668861 100644
--- a/engine/pom.xml
+++ b/engine/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/engine/uk.co.spudsoft.birt.emitters.excel.tests/META-INF/MANIFEST.MF b/engine/uk.co.spudsoft.birt.emitters.excel.tests/META-INF/MANIFEST.MF
index f1a0e0f22f..a8f123d4f9 100644
--- a/engine/uk.co.spudsoft.birt.emitters.excel.tests/META-INF/MANIFEST.MF
+++ b/engine/uk.co.spudsoft.birt.emitters.excel.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: uk.co.spudsoft.birt.emitters.excel.tests
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: uk.co.spudsoft.birt.emitters.excel.tests.framework.Activator
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.core.runtime;bundle-version="3.23.0",
diff --git a/engine/uk.co.spudsoft.birt.emitters.excel.tests/pom.xml b/engine/uk.co.spudsoft.birt.emitters.excel.tests/pom.xml
index 0e1b7c1b96..2f8a4bbcfa 100644
--- a/engine/uk.co.spudsoft.birt.emitters.excel.tests/pom.xml
+++ b/engine/uk.co.spudsoft.birt.emitters.excel.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>uk.co.spudsoft.birt.emitters.excel.tests</artifactId>
diff --git a/engine/uk.co.spudsoft.birt.emitters.excel/META-INF/MANIFEST.MF b/engine/uk.co.spudsoft.birt.emitters.excel/META-INF/MANIFEST.MF
index 6cea8507c1..578f5892a6 100644
--- a/engine/uk.co.spudsoft.birt.emitters.excel/META-INF/MANIFEST.MF
+++ b/engine/uk.co.spudsoft.birt.emitters.excel/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: uk.co.spudsoft.birt.emitters.excel;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: uk.co.spudsoft.birt.emitters.excel.framework.ExcelEmitterPlugin
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.birt.report.engine;bundle-version="4.13.0",
diff --git a/engine/uk.co.spudsoft.birt.emitters.excel/pom.xml b/engine/uk.co.spudsoft.birt.emitters.excel/pom.xml
index 7bdee71807..6100e2d4aa 100644
--- a/engine/uk.co.spudsoft.birt.emitters.excel/pom.xml
+++ b/engine/uk.co.spudsoft.birt.emitters.excel/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>uk.co.spudsoft.birt.emitters.excel</artifactId>
diff --git a/features/org.eclipse.birt.chart.cshelp.feature/feature.xml b/features/org.eclipse.birt.chart.cshelp.feature/feature.xml
index f0c1431a18..cd85b94254 100644
--- a/features/org.eclipse.birt.chart.cshelp.feature/feature.xml
+++ b/features/org.eclipse.birt.chart.cshelp.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.chart.cshelp"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.chart.cshelp"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.chart.cshelp.feature/pom.xml b/features/org.eclipse.birt.chart.cshelp.feature/pom.xml
index 8fa5d6f836..8619237827 100644
--- a/features/org.eclipse.birt.chart.cshelp.feature/pom.xml
+++ b/features/org.eclipse.birt.chart.cshelp.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.features</groupId>
diff --git a/features/org.eclipse.birt.chart.doc.isv.feature/feature.xml b/features/org.eclipse.birt.chart.doc.isv.feature/feature.xml
index 0629e38809..87ef533a08 100644
--- a/features/org.eclipse.birt.chart.doc.isv.feature/feature.xml
+++ b/features/org.eclipse.birt.chart.doc.isv.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.chart.doc.isv"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.chart.doc.isv"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.chart.doc.isv.feature/pom.xml b/features/org.eclipse.birt.chart.doc.isv.feature/pom.xml
index 957fa1fe19..b7a109ba96 100644
--- a/features/org.eclipse.birt.chart.doc.isv.feature/pom.xml
+++ b/features/org.eclipse.birt.chart.doc.isv.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.features</groupId>
diff --git a/features/org.eclipse.birt.chart.feature/feature.xml b/features/org.eclipse.birt.chart.feature/feature.xml
index e756584c80..bbe2a90cec 100644
--- a/features/org.eclipse.birt.chart.feature/feature.xml
+++ b/features/org.eclipse.birt.chart.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.chart"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.chart"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.chart.feature/pom.xml b/features/org.eclipse.birt.chart.feature/pom.xml
index e9fd09a69a..170a04f39f 100644
--- a/features/org.eclipse.birt.chart.feature/pom.xml
+++ b/features/org.eclipse.birt.chart.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart</artifactId>
diff --git a/features/org.eclipse.birt.chart.integration.wtp.feature/feature.xml b/features/org.eclipse.birt.chart.integration.wtp.feature/feature.xml
index 8340b10f70..bff1a4e395 100644
--- a/features/org.eclipse.birt.chart.integration.wtp.feature/feature.xml
+++ b/features/org.eclipse.birt.chart.integration.wtp.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.chart.integration.wtp"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.chart.integration.wtp.ui"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.chart.integration.wtp.feature/pom.xml b/features/org.eclipse.birt.chart.integration.wtp.feature/pom.xml
index 57fb92ef34..09253ca278 100644
--- a/features/org.eclipse.birt.chart.integration.wtp.feature/pom.xml
+++ b/features/org.eclipse.birt.chart.integration.wtp.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.integration.wtp</artifactId>
diff --git a/features/org.eclipse.birt.chart.osgi.runtime.sdk/feature.xml b/features/org.eclipse.birt.chart.osgi.runtime.sdk/feature.xml
index fa8bd76104..88ac2556d8 100644
--- a/features/org.eclipse.birt.chart.osgi.runtime.sdk/feature.xml
+++ b/features/org.eclipse.birt.chart.osgi.runtime.sdk/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.chart.osgi.runtime.sdk"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.birt.chart.osgi.runtime.sdk/pom.xml b/features/org.eclipse.birt.chart.osgi.runtime.sdk/pom.xml
index 52c0f771b7..7edfded6a3 100644
--- a/features/org.eclipse.birt.chart.osgi.runtime.sdk/pom.xml
+++ b/features/org.eclipse.birt.chart.osgi.runtime.sdk/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.osgi.runtime.sdk</artifactId>
diff --git a/features/org.eclipse.birt.chart.osgi.runtime/feature.xml b/features/org.eclipse.birt.chart.osgi.runtime/feature.xml
index c37ca74d73..0f72ee9df0 100644
--- a/features/org.eclipse.birt.chart.osgi.runtime/feature.xml
+++ b/features/org.eclipse.birt.chart.osgi.runtime/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.chart.osgi.runtime"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.birt.chart.osgi.runtime/pom.xml b/features/org.eclipse.birt.chart.osgi.runtime/pom.xml
index c7d7e45597..b35ff208b8 100644
--- a/features/org.eclipse.birt.chart.osgi.runtime/pom.xml
+++ b/features/org.eclipse.birt.chart.osgi.runtime/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.osgi.runtime</artifactId>
diff --git a/features/org.eclipse.birt.chart.viewer.feature/feature.xml b/features/org.eclipse.birt.chart.viewer.feature/feature.xml
index d976ea2119..16eb8f1719 100644
--- a/features/org.eclipse.birt.chart.viewer.feature/feature.xml
+++ b/features/org.eclipse.birt.chart.viewer.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.chart.viewer"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.chart.viewer"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.chart.viewer.feature/pom.xml b/features/org.eclipse.birt.chart.viewer.feature/pom.xml
index 8f3f715304..d4882a74ee 100644
--- a/features/org.eclipse.birt.chart.viewer.feature/pom.xml
+++ b/features/org.eclipse.birt.chart.viewer.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.features</groupId>
diff --git a/features/org.eclipse.birt.cshelp.feature/feature.xml b/features/org.eclipse.birt.cshelp.feature/feature.xml
index b40d0660bd..41e4822b6c 100644
--- a/features/org.eclipse.birt.cshelp.feature/feature.xml
+++ b/features/org.eclipse.birt.cshelp.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.cshelp"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.cshelp"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.cshelp.feature/pom.xml b/features/org.eclipse.birt.cshelp.feature/pom.xml
index 9b024a48df..4811bb8af8 100644
--- a/features/org.eclipse.birt.cshelp.feature/pom.xml
+++ b/features/org.eclipse.birt.cshelp.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.features</groupId>
diff --git a/features/org.eclipse.birt.doc.feature/feature.xml b/features/org.eclipse.birt.doc.feature/feature.xml
index 480f263e85..9294f864e5 100644
--- a/features/org.eclipse.birt.doc.feature/feature.xml
+++ b/features/org.eclipse.birt.doc.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.doc"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.doc"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.doc.feature/pom.xml b/features/org.eclipse.birt.doc.feature/pom.xml
index 8931187985..d8e0103fce 100644
--- a/features/org.eclipse.birt.doc.feature/pom.xml
+++ b/features/org.eclipse.birt.doc.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.features</groupId>
diff --git a/features/org.eclipse.birt.doc.isv.feature/feature.xml b/features/org.eclipse.birt.doc.isv.feature/feature.xml
index bf6e457de4..9be6833dbc 100644
--- a/features/org.eclipse.birt.doc.isv.feature/feature.xml
+++ b/features/org.eclipse.birt.doc.isv.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.doc.isv"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.doc.isv"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.doc.isv.feature/pom.xml b/features/org.eclipse.birt.doc.isv.feature/pom.xml
index ba242dc1bb..3155587824 100644
--- a/features/org.eclipse.birt.doc.isv.feature/pom.xml
+++ b/features/org.eclipse.birt.doc.isv.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.features</groupId>
diff --git a/features/org.eclipse.birt.engine.runtime/feature.xml b/features/org.eclipse.birt.engine.runtime/feature.xml
index 5665d6fce3..7aff065d9c 100644
--- a/features/org.eclipse.birt.engine.runtime/feature.xml
+++ b/features/org.eclipse.birt.engine.runtime/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.engine.runtime"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.birt.engine.runtime/pom.xml b/features/org.eclipse.birt.engine.runtime/pom.xml
index 43da062892..9e39f074c6 100644
--- a/features/org.eclipse.birt.engine.runtime/pom.xml
+++ b/features/org.eclipse.birt.engine.runtime/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.engine.runtime</artifactId>
diff --git a/features/org.eclipse.birt.example.feature/feature.xml b/features/org.eclipse.birt.example.feature/feature.xml
index 36e871324a..3787ff01a1 100644
--- a/features/org.eclipse.birt.example.feature/feature.xml
+++ b/features/org.eclipse.birt.example.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.example"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.example"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.example.feature/pom.xml b/features/org.eclipse.birt.example.feature/pom.xml
index 5b3d5dac7e..c9a31e8d27 100644
--- a/features/org.eclipse.birt.example.feature/pom.xml
+++ b/features/org.eclipse.birt.example.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.features</groupId>
diff --git a/features/org.eclipse.birt.feature/feature.xml b/features/org.eclipse.birt.feature/feature.xml
index 14e6d40be6..a8de4d6401 100644
--- a/features/org.eclipse.birt.feature/feature.xml
+++ b/features/org.eclipse.birt.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.feature/pom.xml b/features/org.eclipse.birt.feature/pom.xml
index 9e71c0e0f4..9ace5d2ce0 100644
--- a/features/org.eclipse.birt.feature/pom.xml
+++ b/features/org.eclipse.birt.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt.features</groupId>
diff --git a/features/org.eclipse.birt.integration.wtp.feature/feature.xml b/features/org.eclipse.birt.integration.wtp.feature/feature.xml
index ef9bf3886a..a82fcb5cde 100644
--- a/features/org.eclipse.birt.integration.wtp.feature/feature.xml
+++ b/features/org.eclipse.birt.integration.wtp.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.integration.wtp"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.integration.wtp.ui"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.integration.wtp.feature/pom.xml b/features/org.eclipse.birt.integration.wtp.feature/pom.xml
index 2d8051f10a..62ebf95fc7 100644
--- a/features/org.eclipse.birt.integration.wtp.feature/pom.xml
+++ b/features/org.eclipse.birt.integration.wtp.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.integration.wtp</artifactId>
diff --git a/features/org.eclipse.birt.integration.wtp.sdk.feature/feature.xml b/features/org.eclipse.birt.integration.wtp.sdk.feature/feature.xml
index 6a63f5507f..9e6d535792 100644
--- a/features/org.eclipse.birt.integration.wtp.sdk.feature/feature.xml
+++ b/features/org.eclipse.birt.integration.wtp.sdk.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.integration.wtp.sdk"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.integration.wtp.sdk"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.integration.wtp.sdk.feature/pom.xml b/features/org.eclipse.birt.integration.wtp.sdk.feature/pom.xml
index 9e4d0c5a45..b64317bcb4 100644
--- a/features/org.eclipse.birt.integration.wtp.sdk.feature/pom.xml
+++ b/features/org.eclipse.birt.integration.wtp.sdk.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.integration.wtp.sdk</artifactId>
diff --git a/features/org.eclipse.birt.nl.feature/feature.xml b/features/org.eclipse.birt.nl.feature/feature.xml
index 20e3de454e..9614c67f6f 100644
--- a/features/org.eclipse.birt.nl.feature/feature.xml
+++ b/features/org.eclipse.birt.nl.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.nl"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.birt.nl.feature/pom.xml b/features/org.eclipse.birt.nl.feature/pom.xml
index ac909e26a7..1b47048cc0 100644
--- a/features/org.eclipse.birt.nl.feature/pom.xml
+++ b/features/org.eclipse.birt.nl.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.nl</artifactId>
diff --git a/features/org.eclipse.birt.osgi.runtime.sdk/feature.xml b/features/org.eclipse.birt.osgi.runtime.sdk/feature.xml
index 19847d3c2e..5bd9ec62b0 100644
--- a/features/org.eclipse.birt.osgi.runtime.sdk/feature.xml
+++ b/features/org.eclipse.birt.osgi.runtime.sdk/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.osgi.runtime.sdk"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.birt.osgi.runtime.sdk/pom.xml b/features/org.eclipse.birt.osgi.runtime.sdk/pom.xml
index 50cd34583e..6deba7ee9e 100644
--- a/features/org.eclipse.birt.osgi.runtime.sdk/pom.xml
+++ b/features/org.eclipse.birt.osgi.runtime.sdk/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.osgi.runtime.sdk</artifactId>
diff --git a/features/org.eclipse.birt.osgi.runtime/feature.xml b/features/org.eclipse.birt.osgi.runtime/feature.xml
index 13d3695e57..2468b1a414 100644
--- a/features/org.eclipse.birt.osgi.runtime/feature.xml
+++ b/features/org.eclipse.birt.osgi.runtime/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.osgi.runtime"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.birt.osgi.runtime/pom.xml b/features/org.eclipse.birt.osgi.runtime/pom.xml
index 2e983b1b24..16dd26b7ba 100644
--- a/features/org.eclipse.birt.osgi.runtime/pom.xml
+++ b/features/org.eclipse.birt.osgi.runtime/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.osgi.runtime</artifactId>
diff --git a/features/org.eclipse.birt.rcp.feature/feature.xml b/features/org.eclipse.birt.rcp.feature/feature.xml
index f98bdd0ed1..2ff9dbe070 100644
--- a/features/org.eclipse.birt.rcp.feature/feature.xml
+++ b/features/org.eclipse.birt.rcp.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.rcp"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.rcp.feature/pom.xml b/features/org.eclipse.birt.rcp.feature/pom.xml
index d154d4b93f..5093ab52ef 100644
--- a/features/org.eclipse.birt.rcp.feature/pom.xml
+++ b/features/org.eclipse.birt.rcp.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.rcp</artifactId>
diff --git a/features/org.eclipse.birt.rcp.nl.feature/feature.xml b/features/org.eclipse.birt.rcp.nl.feature/feature.xml
index efd1513f8d..27dcb6de17 100644
--- a/features/org.eclipse.birt.rcp.nl.feature/feature.xml
+++ b/features/org.eclipse.birt.rcp.nl.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.rcp.nl"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.birt.rcp.nl.feature/pom.xml b/features/org.eclipse.birt.rcp.nl.feature/pom.xml
index 141c67853d..539dc24f8c 100644
--- a/features/org.eclipse.birt.rcp.nl.feature/pom.xml
+++ b/features/org.eclipse.birt.rcp.nl.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.rcp.nl</artifactId>
diff --git a/features/org.eclipse.birt.report.designer.editor.xml.wtp.feature/feature.xml b/features/org.eclipse.birt.report.designer.editor.xml.wtp.feature/feature.xml
index 4f55614eec..db1d9b7cdf 100644
--- a/features/org.eclipse.birt.report.designer.editor.xml.wtp.feature/feature.xml
+++ b/features/org.eclipse.birt.report.designer.editor.xml.wtp.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.report.designer.editor.xml.wtp"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.report.designer.ui.editor.xml.wtp"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.report.designer.editor.xml.wtp.feature/pom.xml b/features/org.eclipse.birt.report.designer.editor.xml.wtp.feature/pom.xml
index 62424fb4ac..bb34867e90 100644
--- a/features/org.eclipse.birt.report.designer.editor.xml.wtp.feature/pom.xml
+++ b/features/org.eclipse.birt.report.designer.editor.xml.wtp.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.editor.xml.wtp</artifactId>
diff --git a/features/org.eclipse.birt.sdk.feature/feature.xml b/features/org.eclipse.birt.sdk.feature/feature.xml
index 23f18c018d..0eca739d30 100644
--- a/features/org.eclipse.birt.sdk.feature/feature.xml
+++ b/features/org.eclipse.birt.sdk.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.sdk"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.birt.sdk.feature/pom.xml b/features/org.eclipse.birt.sdk.feature/pom.xml
index 0dfc3b1803..d01a574cde 100644
--- a/features/org.eclipse.birt.sdk.feature/pom.xml
+++ b/features/org.eclipse.birt.sdk.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.sdk</artifactId>
diff --git a/features/org.eclipse.birt.testhelper.feature/feature.xml b/features/org.eclipse.birt.testhelper.feature/feature.xml
index 33674038fc..3f5266fb34 100644
--- a/features/org.eclipse.birt.testhelper.feature/feature.xml
+++ b/features/org.eclipse.birt.testhelper.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.testhelper"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.birt.testhelper.feature/pom.xml b/features/org.eclipse.birt.testhelper.feature/pom.xml
index 76280b1713..cad38be451 100644
--- a/features/org.eclipse.birt.testhelper.feature/pom.xml
+++ b/features/org.eclipse.birt.testhelper.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.testhelper</artifactId>
diff --git a/features/org.eclipse.birt.tests.feature/feature.xml b/features/org.eclipse.birt.tests.feature/feature.xml
index ef477213ad..5920e5499c 100644
--- a/features/org.eclipse.birt.tests.feature/feature.xml
+++ b/features/org.eclipse.birt.tests.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.tests"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       plugin="org.eclipse.birt.tests"
       license-feature="org.eclipse.license"
diff --git a/features/org.eclipse.birt.tests.feature/pom.xml b/features/org.eclipse.birt.tests.feature/pom.xml
index 3abfbe4d77..8ad1129190 100644
--- a/features/org.eclipse.birt.tests.feature/pom.xml
+++ b/features/org.eclipse.birt.tests.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.tests</artifactId>
diff --git a/features/org.eclipse.birt.wtp.nl.feature/feature.xml b/features/org.eclipse.birt.wtp.nl.feature/feature.xml
index 6f85094dcd..5f80daa629 100644
--- a/features/org.eclipse.birt.wtp.nl.feature/feature.xml
+++ b/features/org.eclipse.birt.wtp.nl.feature/feature.xml
@@ -16,7 +16,7 @@
 <feature
       id="org.eclipse.birt.wtp.nl"
       label="%featureName"
-      version="4.17.0.qualifier"
+      version="4.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.birt.wtp.nl.feature/pom.xml b/features/org.eclipse.birt.wtp.nl.feature/pom.xml
index 8f77b47327..e7611b1ede 100644
--- a/features/org.eclipse.birt.wtp.nl.feature/pom.xml
+++ b/features/org.eclipse.birt.wtp.nl.feature/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.features</groupId>
 		<artifactId>org.eclipse.birt.features-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.wtp.nl</artifactId>
diff --git a/features/pom.xml b/features/pom.xml
index e1f8b042da..8de1e59000 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/model/org.eclipse.birt.report.model.adapter.oda.tests/META-INF/MANIFEST.MF b/model/org.eclipse.birt.report.model.adapter.oda.tests/META-INF/MANIFEST.MF
index 5e1c795c0a..4ce5565137 100644
--- a/model/org.eclipse.birt.report.model.adapter.oda.tests/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model.adapter.oda.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.model.adapter.oda.tests; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.core;bundle-version="4.13.0",
  org.eclipse.birt.report.model.adapter.oda;bundle-version="4.13.0",
  org.eclipse.birt.report.model;bundle-version="4.13.0",
diff --git a/model/org.eclipse.birt.report.model.adapter.oda.tests/pom.xml b/model/org.eclipse.birt.report.model.adapter.oda.tests/pom.xml
index 7f1f11e81d..78db59b440 100644
--- a/model/org.eclipse.birt.report.model.adapter.oda.tests/pom.xml
+++ b/model/org.eclipse.birt.report.model.adapter.oda.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.model.adapter.oda.tests</artifactId>
diff --git a/model/org.eclipse.birt.report.model.adapter.oda/META-INF/MANIFEST.MF b/model/org.eclipse.birt.report.model.adapter.oda/META-INF/MANIFEST.MF
index 377ebdc7db..b2fdb12595 100644
--- a/model/org.eclipse.birt.report.model.adapter.oda/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model.adapter.oda/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.model.adapter.oda; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.model.adapter.oda.plugin.ModelAdapterOdaPlugin
 Bundle-ClassPath: .
 Eclipse-ExtensibleAPI: true 
diff --git a/model/org.eclipse.birt.report.model.adapter.oda/api/MANIFEST.MF b/model/org.eclipse.birt.report.model.adapter.oda/api/MANIFEST.MF
index 2cd47eb71d..fd3477f7fe 100644
--- a/model/org.eclipse.birt.report.model.adapter.oda/api/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model.adapter.oda/api/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Model ODA Adapter API
 Bundle-SymbolicName: org.eclipse.birt.report.model.adapter.oda.api; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse BIRT Project
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/model/org.eclipse.birt.report.model.adapter.oda/pom.xml b/model/org.eclipse.birt.report.model.adapter.oda/pom.xml
index 8068af2f86..c71326fedf 100644
--- a/model/org.eclipse.birt.report.model.adapter.oda/pom.xml
+++ b/model/org.eclipse.birt.report.model.adapter.oda/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.model.adapter.oda</artifactId>
diff --git a/model/org.eclipse.birt.report.model.testhelper/META-INF/MANIFEST.MF b/model/org.eclipse.birt.report.model.testhelper/META-INF/MANIFEST.MF
index 581040e813..f002b03c59 100644
--- a/model/org.eclipse.birt.report.model.testhelper/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model.testhelper/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.model.testhelper
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.model;bundle-version="2.2.0"
 Export-Package: org.eclipse.birt.report.model.activity;x-friends:="org.eclipse.birt.report.model.tests",
  org.eclipse.birt.report.model.api;x-friends:="org.eclipse.birt.report.model.tests",
diff --git a/model/org.eclipse.birt.report.model.testhelper/pom.xml b/model/org.eclipse.birt.report.model.testhelper/pom.xml
index b935729120..b406b9de8f 100644
--- a/model/org.eclipse.birt.report.model.testhelper/pom.xml
+++ b/model/org.eclipse.birt.report.model.testhelper/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.model.testhelper</artifactId>
diff --git a/model/org.eclipse.birt.report.model.testresources/META-INF/MANIFEST.MF b/model/org.eclipse.birt.report.model.testresources/META-INF/MANIFEST.MF
index 45dacdf456..781eb5ab4a 100644
--- a/model/org.eclipse.birt.report.model.testresources/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model.testresources/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.model.testresources
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.resources;bundle-version="2.2.0"
 Automatic-Module-Name: org.eclipse.birt.report.model.testresources
diff --git a/model/org.eclipse.birt.report.model.testresources/pom.xml b/model/org.eclipse.birt.report.model.testresources/pom.xml
index 41c788bc9d..930e5c1971 100644
--- a/model/org.eclipse.birt.report.model.testresources/pom.xml
+++ b/model/org.eclipse.birt.report.model.testresources/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.model.testresources</artifactId>
diff --git a/model/org.eclipse.birt.report.model.tests/META-INF/MANIFEST.MF b/model/org.eclipse.birt.report.model.tests/META-INF/MANIFEST.MF
index 9adeeab658..fad0d60447 100644
--- a/model/org.eclipse.birt.report.model.tests/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.model.tests; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.birt.core;bundle-version="[2.1.0,5.0.0)",
  org.eclipse.birt.report.model;bundle-version="[2.1.0,5.0.0)",
diff --git a/model/org.eclipse.birt.report.model.tests/pom.xml b/model/org.eclipse.birt.report.model.tests/pom.xml
index 8d42623bc6..a94aac5c9b 100644
--- a/model/org.eclipse.birt.report.model.tests/pom.xml
+++ b/model/org.eclipse.birt.report.model.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.model.tests</artifactId>
diff --git a/model/org.eclipse.birt.report.model/META-INF/MANIFEST.MF b/model/org.eclipse.birt.report.model/META-INF/MANIFEST.MF
index 633e21995b..d649171897 100644
--- a/model/org.eclipse.birt.report.model/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.model; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.model.plugin.ModelPlugin
 Eclipse-BuddyPolicy: registered
 Bundle-ClassPath: .
diff --git a/model/org.eclipse.birt.report.model/api/MANIFEST.MF b/model/org.eclipse.birt.report.model/api/MANIFEST.MF
index 930d09a955..a3d9c6ba65 100644
--- a/model/org.eclipse.birt.report.model/api/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.model/api/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Model API
 Bundle-SymbolicName: org.eclipse.birt.report.model.api; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: Eclipse BIRT Project
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/model/org.eclipse.birt.report.model/pom.xml b/model/org.eclipse.birt.report.model/pom.xml
index b14a96ba7c..39de1cb96e 100644
--- a/model/org.eclipse.birt.report.model/pom.xml
+++ b/model/org.eclipse.birt.report.model/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.model</groupId>
 		<artifactId>org.eclipse.birt.model-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/model/org.eclipse.birt.report.modelextension.tests/META-INF/MANIFEST.MF b/model/org.eclipse.birt.report.modelextension.tests/META-INF/MANIFEST.MF
index 7ae01627f7..170ef1b246 100644
--- a/model/org.eclipse.birt.report.modelextension.tests/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.report.modelextension.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.modelextension.tests;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: %Bundle-Vendor
 Require-Bundle: org.eclipse.birt.core;bundle-version="4.13.0",
  org.eclipse.birt.report.model;bundle-version="4.13.0"
diff --git a/model/org.eclipse.birt.report.modelextension.tests/pom.xml b/model/org.eclipse.birt.report.modelextension.tests/pom.xml
index e611b51a66..919154cc5c 100644
--- a/model/org.eclipse.birt.report.modelextension.tests/pom.xml
+++ b/model/org.eclipse.birt.report.modelextension.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.modelextension.tests</artifactId>
diff --git a/model/org.eclipse.birt.resources/META-INF/MANIFEST.MF b/model/org.eclipse.birt.resources/META-INF/MANIFEST.MF
index d2cc5047ad..f65142804f 100644
--- a/model/org.eclipse.birt.resources/META-INF/MANIFEST.MF
+++ b/model/org.eclipse.birt.resources/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.resources;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Localization: plugin
 Bundle-Vendor: %Bundle-Vendor
 Eclipse-BundleShape: dir
diff --git a/model/org.eclipse.birt.resources/pom.xml b/model/org.eclipse.birt.resources/pom.xml
index 02df2be141..8016d90047 100644
--- a/model/org.eclipse.birt.resources/pom.xml
+++ b/model/org.eclipse.birt.resources/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.resources</artifactId>
diff --git a/model/pom.xml b/model/pom.xml
index 8dfcc0e9d3..355112c5ef 100644
--- a/model/pom.xml
+++ b/model/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/nl/org.eclipse.birt.chart.device.extension.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.chart.device.extension.nl/META-INF/MANIFEST.MF
index 413c6aec3a..786faff120 100644
--- a/nl/org.eclipse.birt.chart.device.extension.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.chart.device.extension.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.device.extension.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.chart.device.extension;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.chart.device.extension.nl1
diff --git a/nl/org.eclipse.birt.chart.device.extension.nl/pom.xml b/nl/org.eclipse.birt.chart.device.extension.nl/pom.xml
index b636b3a224..9f3876e48c 100644
--- a/nl/org.eclipse.birt.chart.device.extension.nl/pom.xml
+++ b/nl/org.eclipse.birt.chart.device.extension.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.device.extension.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.chart.device.svg.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.chart.device.svg.nl/META-INF/MANIFEST.MF
index c2396492ce..42c960b23e 100644
--- a/nl/org.eclipse.birt.chart.device.svg.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.chart.device.svg.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.device.svg.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.chart.device.svg;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.chart.device.svg.nl1
diff --git a/nl/org.eclipse.birt.chart.device.svg.nl/pom.xml b/nl/org.eclipse.birt.chart.device.svg.nl/pom.xml
index 214b4f435f..df75b6a4b8 100644
--- a/nl/org.eclipse.birt.chart.device.svg.nl/pom.xml
+++ b/nl/org.eclipse.birt.chart.device.svg.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.device.svg.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.chart.device.swt.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.chart.device.swt.nl/META-INF/MANIFEST.MF
index 9d01506643..16706b89d0 100644
--- a/nl/org.eclipse.birt.chart.device.swt.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.chart.device.swt.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.device.swt.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.chart.device.swt;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.chart.device.swt.nl1
diff --git a/nl/org.eclipse.birt.chart.device.swt.nl/pom.xml b/nl/org.eclipse.birt.chart.device.swt.nl/pom.xml
index 8d5b480402..e605beb992 100644
--- a/nl/org.eclipse.birt.chart.device.swt.nl/pom.xml
+++ b/nl/org.eclipse.birt.chart.device.swt.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.device.swt.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.chart.engine.extension.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.chart.engine.extension.nl/META-INF/MANIFEST.MF
index d46a03f4b0..f1108a471d 100644
--- a/nl/org.eclipse.birt.chart.engine.extension.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.chart.engine.extension.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.engine.extension.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.chart.engine.extension;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.chart.engine.extension.nl1
diff --git a/nl/org.eclipse.birt.chart.engine.extension.nl/pom.xml b/nl/org.eclipse.birt.chart.engine.extension.nl/pom.xml
index 0045f7409f..4e5efe2de5 100644
--- a/nl/org.eclipse.birt.chart.engine.extension.nl/pom.xml
+++ b/nl/org.eclipse.birt.chart.engine.extension.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.engine.extension.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.chart.engine.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.chart.engine.nl/META-INF/MANIFEST.MF
index e66b475a22..7482aea8da 100644
--- a/nl/org.eclipse.birt.chart.engine.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.chart.engine.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.engine.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.chart.engine;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.chart.engine.nl1
diff --git a/nl/org.eclipse.birt.chart.engine.nl/pom.xml b/nl/org.eclipse.birt.chart.engine.nl/pom.xml
index 86987ed8ae..27c385b088 100644
--- a/nl/org.eclipse.birt.chart.engine.nl/pom.xml
+++ b/nl/org.eclipse.birt.chart.engine.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.engine.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.chart.examples.core.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.chart.examples.core.nl/META-INF/MANIFEST.MF
index e0f131797a..d25c93adb9 100644
--- a/nl/org.eclipse.birt.chart.examples.core.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.chart.examples.core.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.examples.core.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.chart.examples.core;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.chart.examples.core.nl1
diff --git a/nl/org.eclipse.birt.chart.examples.core.nl/pom.xml b/nl/org.eclipse.birt.chart.examples.core.nl/pom.xml
index 684a8b6d40..1a97aecb75 100644
--- a/nl/org.eclipse.birt.chart.examples.core.nl/pom.xml
+++ b/nl/org.eclipse.birt.chart.examples.core.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.examples.core.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.chart.examples.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.chart.examples.nl/META-INF/MANIFEST.MF
index 235c3eb414..5727ea73d2 100644
--- a/nl/org.eclipse.birt.chart.examples.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.chart.examples.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.examples.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.chart.examples;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.chart.examples.nl1
diff --git a/nl/org.eclipse.birt.chart.examples.nl/pom.xml b/nl/org.eclipse.birt.chart.examples.nl/pom.xml
index 5832497aef..117daa433a 100644
--- a/nl/org.eclipse.birt.chart.examples.nl/pom.xml
+++ b/nl/org.eclipse.birt.chart.examples.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.examples.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.chart.integration.wtp.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.chart.integration.wtp.ui.nl/META-INF/MANIFEST.MF
index 752e255865..c7e443ce5b 100644
--- a/nl/org.eclipse.birt.chart.integration.wtp.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.chart.integration.wtp.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.integration.wtp.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.chart.integration.wtp.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.chart.integration.wtp.ui.nl1
diff --git a/nl/org.eclipse.birt.chart.integration.wtp.ui.nl/pom.xml b/nl/org.eclipse.birt.chart.integration.wtp.ui.nl/pom.xml
index 906f5c4a19..f6d4226e53 100644
--- a/nl/org.eclipse.birt.chart.integration.wtp.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.chart.integration.wtp.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.integration.wtp.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.chart.reportitem.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.chart.reportitem.nl/META-INF/MANIFEST.MF
index b917a51783..a6003944fa 100644
--- a/nl/org.eclipse.birt.chart.reportitem.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.chart.reportitem.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.reportitem.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.chart.reportitem;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.chart.reportitem.nl1
diff --git a/nl/org.eclipse.birt.chart.reportitem.nl/pom.xml b/nl/org.eclipse.birt.chart.reportitem.nl/pom.xml
index 0a5c657bac..0c4ae9e349 100644
--- a/nl/org.eclipse.birt.chart.reportitem.nl/pom.xml
+++ b/nl/org.eclipse.birt.chart.reportitem.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.reportitem.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.chart.reportitem.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.chart.reportitem.ui.nl/META-INF/MANIFEST.MF
index 6b68378e52..121b50241c 100644
--- a/nl/org.eclipse.birt.chart.reportitem.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.chart.reportitem.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.reportitem.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.chart.reportitem.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.chart.reportitem.ui.nl1
diff --git a/nl/org.eclipse.birt.chart.reportitem.ui.nl/pom.xml b/nl/org.eclipse.birt.chart.reportitem.ui.nl/pom.xml
index 3915a29781..6be1bab445 100644
--- a/nl/org.eclipse.birt.chart.reportitem.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.chart.reportitem.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.reportitem.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.chart.ui.extension.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.chart.ui.extension.nl/META-INF/MANIFEST.MF
index 6b6d95a195..a107e9f148 100644
--- a/nl/org.eclipse.birt.chart.ui.extension.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.chart.ui.extension.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.ui.extension.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.chart.ui.extension;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.chart.ui.extension.nl1
diff --git a/nl/org.eclipse.birt.chart.ui.extension.nl/pom.xml b/nl/org.eclipse.birt.chart.ui.extension.nl/pom.xml
index a3a0f0b112..25e229b8b7 100644
--- a/nl/org.eclipse.birt.chart.ui.extension.nl/pom.xml
+++ b/nl/org.eclipse.birt.chart.ui.extension.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.ui.extension.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.chart.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.chart.ui.nl/META-INF/MANIFEST.MF
index ae7ac3e16e..e73bc87e2b 100644
--- a/nl/org.eclipse.birt.chart.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.chart.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.chart.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.chart.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.chart.ui.nl1
diff --git a/nl/org.eclipse.birt.chart.ui.nl/pom.xml b/nl/org.eclipse.birt.chart.ui.nl/pom.xml
index da1f3faef3..71b63c5db3 100644
--- a/nl/org.eclipse.birt.chart.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.chart.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.chart.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.core.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.core.nl/META-INF/MANIFEST.MF
index 0ec0d9354b..b3b9f6b852 100644
--- a/nl/org.eclipse.birt.core.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.core.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.core.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.core;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.core.nl1
diff --git a/nl/org.eclipse.birt.core.nl/pom.xml b/nl/org.eclipse.birt.core.nl/pom.xml
index f12a0fc3c9..c1706e910d 100644
--- a/nl/org.eclipse.birt.core.nl/pom.xml
+++ b/nl/org.eclipse.birt.core.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.core.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.core.script.function.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.core.script.function.nl/META-INF/MANIFEST.MF
index bb9ccd42ff..ef9ee990cd 100644
--- a/nl/org.eclipse.birt.core.script.function.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.core.script.function.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.core.script.function.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.core.script.function;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.core.script.function.nl1
diff --git a/nl/org.eclipse.birt.core.script.function.nl/pom.xml b/nl/org.eclipse.birt.core.script.function.nl/pom.xml
index c1ccc76208..bc13935450 100644
--- a/nl/org.eclipse.birt.core.script.function.nl/pom.xml
+++ b/nl/org.eclipse.birt.core.script.function.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.core.script.function.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.core.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.core.ui.nl/META-INF/MANIFEST.MF
index 7c58bdf3a8..37f6b14a8f 100644
--- a/nl/org.eclipse.birt.core.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.core.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.core.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.core.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.core.ui.nl1
diff --git a/nl/org.eclipse.birt.core.ui.nl/pom.xml b/nl/org.eclipse.birt.core.ui.nl/pom.xml
index 27355efd52..7a80304459 100644
--- a/nl/org.eclipse.birt.core.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.core.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.core.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.data.aggregation.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.data.aggregation.nl/META-INF/MANIFEST.MF
index 9e93dbe401..d74e6f76d4 100644
--- a/nl/org.eclipse.birt.data.aggregation.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.data.aggregation.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.data.aggregation.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.data.aggregation;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.data.aggregation.nl1
diff --git a/nl/org.eclipse.birt.data.aggregation.nl/pom.xml b/nl/org.eclipse.birt.data.aggregation.nl/pom.xml
index 3dde13d962..8fa3a887e2 100644
--- a/nl/org.eclipse.birt.data.aggregation.nl/pom.xml
+++ b/nl/org.eclipse.birt.data.aggregation.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.aggregation.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.data.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.data.nl/META-INF/MANIFEST.MF
index 3c70acc288..8cc78dc1e4 100644
--- a/nl/org.eclipse.birt.data.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.data.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.data.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.data;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.data.nl1
diff --git a/nl/org.eclipse.birt.data.nl/pom.xml b/nl/org.eclipse.birt.data.nl/pom.xml
index 5af957e291..63efb993d1 100644
--- a/nl/org.eclipse.birt.data.nl/pom.xml
+++ b/nl/org.eclipse.birt.data.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.data.oda.mongodb.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.data.oda.mongodb.nl/META-INF/MANIFEST.MF
index e61ed5d997..c30596af7f 100644
--- a/nl/org.eclipse.birt.data.oda.mongodb.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.data.oda.mongodb.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.data.oda.mongodb.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.data.oda.mongodb;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.data.oda.mongodb.nl1
diff --git a/nl/org.eclipse.birt.data.oda.mongodb.nl/pom.xml b/nl/org.eclipse.birt.data.oda.mongodb.nl/pom.xml
index 8a1f71b2fc..d40b76f414 100644
--- a/nl/org.eclipse.birt.data.oda.mongodb.nl/pom.xml
+++ b/nl/org.eclipse.birt.data.oda.mongodb.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.oda.mongodb.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.data.oda.mongodb.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.data.oda.mongodb.ui.nl/META-INF/MANIFEST.MF
index b9ddc799ac..8221645c01 100644
--- a/nl/org.eclipse.birt.data.oda.mongodb.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.data.oda.mongodb.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.data.oda.mongodb.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.data.oda.mongodb.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.data.oda.mongodb.ui.nl1
diff --git a/nl/org.eclipse.birt.data.oda.mongodb.ui.nl/pom.xml b/nl/org.eclipse.birt.data.oda.mongodb.ui.nl/pom.xml
index 539e0dea3e..0e620d3dfc 100644
--- a/nl/org.eclipse.birt.data.oda.mongodb.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.data.oda.mongodb.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.oda.mongodb.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.data.oda.pojo.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.data.oda.pojo.nl/META-INF/MANIFEST.MF
index f970a76870..d47810ebaa 100644
--- a/nl/org.eclipse.birt.data.oda.pojo.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.data.oda.pojo.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.data.oda.pojo.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.data.oda.pojo;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.data.oda.pojo.nl1
diff --git a/nl/org.eclipse.birt.data.oda.pojo.nl/pom.xml b/nl/org.eclipse.birt.data.oda.pojo.nl/pom.xml
index 36fa681e70..8aeea53974 100644
--- a/nl/org.eclipse.birt.data.oda.pojo.nl/pom.xml
+++ b/nl/org.eclipse.birt.data.oda.pojo.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.oda.pojo.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.data.oda.pojo.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.data.oda.pojo.ui.nl/META-INF/MANIFEST.MF
index f4767e0198..6fe8c96452 100644
--- a/nl/org.eclipse.birt.data.oda.pojo.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.data.oda.pojo.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.data.oda.pojo.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.data.oda.pojo.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.data.oda.pojo.ui.nl1
diff --git a/nl/org.eclipse.birt.data.oda.pojo.ui.nl/pom.xml b/nl/org.eclipse.birt.data.oda.pojo.ui.nl/pom.xml
index fffaf86296..2353cdb84e 100644
--- a/nl/org.eclipse.birt.data.oda.pojo.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.data.oda.pojo.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.data.oda.pojo.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.integration.wtp.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.integration.wtp.ui.nl/META-INF/MANIFEST.MF
index 4b19474e4a..f9576e9679 100644
--- a/nl/org.eclipse.birt.integration.wtp.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.integration.wtp.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.integration.wtp.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.integration.wtp.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.integration.wtp.ui.nl1
diff --git a/nl/org.eclipse.birt.integration.wtp.ui.nl/pom.xml b/nl/org.eclipse.birt.integration.wtp.ui.nl/pom.xml
index 23b6ed4c5d..ef9dc68f20 100644
--- a/nl/org.eclipse.birt.integration.wtp.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.integration.wtp.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.integration.wtp.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.adapter.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.adapter.nl/META-INF/MANIFEST.MF
index 538887f548..84dc52f9fb 100644
--- a/nl/org.eclipse.birt.report.data.adapter.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.adapter.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.adapter.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.adapter;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.adapter.nl1
diff --git a/nl/org.eclipse.birt.report.data.adapter.nl/pom.xml b/nl/org.eclipse.birt.report.data.adapter.nl/pom.xml
index f7a77755f3..fc8df85025 100644
--- a/nl/org.eclipse.birt.report.data.adapter.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.adapter.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.adapter.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.bidi.utils.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.bidi.utils.nl/META-INF/MANIFEST.MF
index cc541a4a66..e1deee344c 100644
--- a/nl/org.eclipse.birt.report.data.bidi.utils.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.bidi.utils.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.bidi.utils.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.bidi.utils;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.bidi.utils.nl1
diff --git a/nl/org.eclipse.birt.report.data.bidi.utils.nl/pom.xml b/nl/org.eclipse.birt.report.data.bidi.utils.nl/pom.xml
index 6d578ea109..83b768d6e0 100644
--- a/nl/org.eclipse.birt.report.data.bidi.utils.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.bidi.utils.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.bidi.utils.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.excel.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.excel.nl/META-INF/MANIFEST.MF
index 0094284f3b..65520f138a 100644
--- a/nl/org.eclipse.birt.report.data.oda.excel.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.excel.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.excel.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.excel;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.excel.nl1
diff --git a/nl/org.eclipse.birt.report.data.oda.excel.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.excel.nl/pom.xml
index c39e82a788..2cca45cd08 100644
--- a/nl/org.eclipse.birt.report.data.oda.excel.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.excel.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.excel.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.excel.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.excel.ui.nl/META-INF/MANIFEST.MF
index b6b2e5fd02..13ac4281b3 100644
--- a/nl/org.eclipse.birt.report.data.oda.excel.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.excel.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.excel.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.excel.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.excel.ui.nl1
diff --git a/nl/org.eclipse.birt.report.data.oda.excel.ui.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.excel.ui.nl/pom.xml
index 8ab7ec505b..c42145c107 100644
--- a/nl/org.eclipse.birt.report.data.oda.excel.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.excel.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.excel.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.hive.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.hive.nl/META-INF/MANIFEST.MF
index f148266fd7..e7903e7406 100644
--- a/nl/org.eclipse.birt.report.data.oda.hive.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.hive.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.hive.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.hive;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.hive.nl1
diff --git a/nl/org.eclipse.birt.report.data.oda.hive.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.hive.nl/pom.xml
index 089aab8410..54ed0d0863 100644
--- a/nl/org.eclipse.birt.report.data.oda.hive.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.hive.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.hive.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.hive.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.hive.ui.nl/META-INF/MANIFEST.MF
index 159e17df1b..8be28e4b19 100644
--- a/nl/org.eclipse.birt.report.data.oda.hive.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.hive.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.hive.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.hive.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.hive.ui.nl1
diff --git a/nl/org.eclipse.birt.report.data.oda.hive.ui.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.hive.ui.nl/pom.xml
index 1c10322e03..963a62136d 100644
--- a/nl/org.eclipse.birt.report.data.oda.hive.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.hive.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.hive.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.nl/META-INF/MANIFEST.MF
index 2868adba6b..c5a00e3c65 100644
--- a/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc.dbprofile.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.jdbc.dbprofile;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.jdbc.dbprofile.nl1
diff --git a/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.nl/pom.xml
index eea426c9c5..dc701d48df 100644
--- a/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.jdbc.dbprofile.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.nl/META-INF/MANIFEST.MF
index ea0461a344..fc1b2df596 100644
--- a/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.nl/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.nl1
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb;bundle-version="[2.1.0,5.0.0)"
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.nl1
 Export-Package: org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.nls;x-internal:=true
diff --git a/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.nl/pom.xml
index 7598865b49..cc99515ccb 100644
--- a/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.jdbc.dbprofile.sampledb.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui.nl/META-INF/MANIFEST.MF
index fb5a63f80c..ab3c33e10f 100644
--- a/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui.nl1
diff --git a/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui.nl/pom.xml
index 74c562ed43..8de4479ca8 100644
--- a/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.jdbc.dbprofile.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.jdbc.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.jdbc.nl/META-INF/MANIFEST.MF
index 87f4aa2ef2..8d4c01b1b1 100644
--- a/nl/org.eclipse.birt.report.data.oda.jdbc.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.jdbc.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.jdbc;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.jdbc.nl1
diff --git a/nl/org.eclipse.birt.report.data.oda.jdbc.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.jdbc.nl/pom.xml
index 831d2019cc..15cd48434c 100644
--- a/nl/org.eclipse.birt.report.data.oda.jdbc.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.jdbc.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.jdbc.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.jdbc.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.jdbc.ui.nl/META-INF/MANIFEST.MF
index 25e3f96262..f84b2a62a9 100644
--- a/nl/org.eclipse.birt.report.data.oda.jdbc.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.jdbc.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.jdbc.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.jdbc.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.jdbc.ui.nl1
diff --git a/nl/org.eclipse.birt.report.data.oda.jdbc.ui.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.jdbc.ui.nl/pom.xml
index bb03a5577a..be07abf4d3 100644
--- a/nl/org.eclipse.birt.report.data.oda.jdbc.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.jdbc.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.jdbc.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.sampledb.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.sampledb.nl/META-INF/MANIFEST.MF
index 8d51a806b1..c5f9623456 100644
--- a/nl/org.eclipse.birt.report.data.oda.sampledb.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.sampledb.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.sampledb.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.sampledb;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.sampledb.nl1
diff --git a/nl/org.eclipse.birt.report.data.oda.sampledb.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.sampledb.nl/pom.xml
index 6802db64ec..1db22216ff 100644
--- a/nl/org.eclipse.birt.report.data.oda.sampledb.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.sampledb.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.sampledb.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.sampledb.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.sampledb.ui.nl/META-INF/MANIFEST.MF
index c0384fb24e..d4150ce102 100644
--- a/nl/org.eclipse.birt.report.data.oda.sampledb.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.sampledb.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.sampledb.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.sampledb.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.sampledb.ui.nl1
diff --git a/nl/org.eclipse.birt.report.data.oda.sampledb.ui.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.sampledb.ui.nl/pom.xml
index 9117d577fc..5f8898eb36 100644
--- a/nl/org.eclipse.birt.report.data.oda.sampledb.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.sampledb.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.sampledb.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.xml.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.xml.nl/META-INF/MANIFEST.MF
index 0e05dad521..b389dfed0e 100644
--- a/nl/org.eclipse.birt.report.data.oda.xml.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.xml.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.xml.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.xml;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.xml.nl1
diff --git a/nl/org.eclipse.birt.report.data.oda.xml.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.xml.nl/pom.xml
index bacc30251c..8f37ab6679 100644
--- a/nl/org.eclipse.birt.report.data.oda.xml.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.xml.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.xml.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.data.oda.xml.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.data.oda.xml.ui.nl/META-INF/MANIFEST.MF
index 5c43dc3a78..2430606143 100644
--- a/nl/org.eclipse.birt.report.data.oda.xml.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.data.oda.xml.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.data.oda.xml.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.data.oda.xml.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.data.oda.xml.ui.nl1
diff --git a/nl/org.eclipse.birt.report.data.oda.xml.ui.nl/pom.xml b/nl/org.eclipse.birt.report.data.oda.xml.ui.nl/pom.xml
index 5614a56d4f..e55df088c0 100644
--- a/nl/org.eclipse.birt.report.data.oda.xml.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.data.oda.xml.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.data.oda.xml.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.debug.core.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.debug.core.nl/META-INF/MANIFEST.MF
index 5b0ed756ca..f54a339669 100644
--- a/nl/org.eclipse.birt.report.debug.core.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.debug.core.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.debug.core.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.debug.core;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.debug.core.nl1
diff --git a/nl/org.eclipse.birt.report.debug.core.nl/pom.xml b/nl/org.eclipse.birt.report.debug.core.nl/pom.xml
index 8f32e570b0..fd35a92554 100644
--- a/nl/org.eclipse.birt.report.debug.core.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.debug.core.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.debug.core.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.debug.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.debug.ui.nl/META-INF/MANIFEST.MF
index f853ac3aa5..fb547629ad 100644
--- a/nl/org.eclipse.birt.report.debug.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.debug.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.debug.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.debug.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.debug.ui.nl1
diff --git a/nl/org.eclipse.birt.report.debug.ui.nl/pom.xml b/nl/org.eclipse.birt.report.debug.ui.nl/pom.xml
index 9af0435a2e..3734b31811 100644
--- a/nl/org.eclipse.birt.report.debug.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.debug.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.debug.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.core.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.core.nl/META-INF/MANIFEST.MF
index 218fdce9ed..772d18b1a1 100644
--- a/nl/org.eclipse.birt.report.designer.core.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.core.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.core.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.core;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.core.nl1
diff --git a/nl/org.eclipse.birt.report.designer.core.nl/pom.xml b/nl/org.eclipse.birt.report.designer.core.nl/pom.xml
index 8f7d58f376..56551e579c 100644
--- a/nl/org.eclipse.birt.report.designer.core.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.core.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.core.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.cubebuilder.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.cubebuilder.nl/META-INF/MANIFEST.MF
index b504bb2cc0..327c02d9ef 100644
--- a/nl/org.eclipse.birt.report.designer.ui.cubebuilder.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.cubebuilder.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.cubebuilder.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.cubebuilder;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.cubebuilder.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.cubebuilder.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.cubebuilder.nl/pom.xml
index 7d2af8bbe3..93c4e58aaf 100644
--- a/nl/org.eclipse.birt.report.designer.ui.cubebuilder.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.cubebuilder.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.cubebuilder.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.editor.script.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.editor.script.nl/META-INF/MANIFEST.MF
index 02663cff62..14e56ce383 100644
--- a/nl/org.eclipse.birt.report.designer.ui.editor.script.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.editor.script.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.editor.script.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.editor.script;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.editor.script.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.editor.script.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.editor.script.nl/pom.xml
index c75316e9b2..3e36e9ddb4 100644
--- a/nl/org.eclipse.birt.report.designer.ui.editor.script.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.editor.script.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.editor.script.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.editor.xml.wtp.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.editor.xml.wtp.nl/META-INF/MANIFEST.MF
index 7685293545..db36737147 100644
--- a/nl/org.eclipse.birt.report.designer.ui.editor.xml.wtp.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.editor.xml.wtp.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.editor.xml.wtp.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.editor.xml.wtp;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.editor.xml.wtp.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.editor.xml.wtp.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.editor.xml.wtp.nl/pom.xml
index 20ec639c05..710ca8baee 100644
--- a/nl/org.eclipse.birt.report.designer.ui.editor.xml.wtp.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.editor.xml.wtp.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.editor.xml.wtp.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.editors.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.editors.nl/META-INF/MANIFEST.MF
index c3432151fb..1be751a73a 100644
--- a/nl/org.eclipse.birt.report.designer.ui.editors.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.editors.nl/META-INF/MANIFEST.MF
@@ -3,6 +3,6 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.editors.nl1
 Bundle-Vendor: %Bundle-Vendor
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.editors;bundle-version="[2.1.0,5.0.0)"
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.editors.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.editors.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.editors.nl/pom.xml
index dfd29f80f1..2d08a36f82 100644
--- a/nl/org.eclipse.birt.report.designer.ui.editors.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.editors.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.editors.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.editors.schematic.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.editors.schematic.nl/META-INF/MANIFEST.MF
index 48f0649844..16ca41f9b3 100644
--- a/nl/org.eclipse.birt.report.designer.ui.editors.schematic.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.editors.schematic.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.editors.schematic.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.editors.schematic;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.editors.schematic.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.editors.schematic.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.editors.schematic.nl/pom.xml
index d8c872445a..64043409a6 100644
--- a/nl/org.eclipse.birt.report.designer.ui.editors.schematic.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.editors.schematic.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.editors.schematic.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.ide.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.ide.nl/META-INF/MANIFEST.MF
index 77b9555aa3..d606c92391 100644
--- a/nl/org.eclipse.birt.report.designer.ui.ide.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.ide.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.ide.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.ide;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.ide.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.ide.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.ide.nl/pom.xml
index eae6995de5..24187271fa 100644
--- a/nl/org.eclipse.birt.report.designer.ui.ide.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.ide.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.ide.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.lib.explorer.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.lib.explorer.nl/META-INF/MANIFEST.MF
index 328e8b1e9e..46053bcaaa 100644
--- a/nl/org.eclipse.birt.report.designer.ui.lib.explorer.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.lib.explorer.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.lib.explorer.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.lib.explorer;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.lib.explorer.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.lib.explorer.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.lib.explorer.nl/pom.xml
index 6963f497d9..011d6edbf0 100644
--- a/nl/org.eclipse.birt.report.designer.ui.lib.explorer.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.lib.explorer.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.lib.explorer.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.lib.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.lib.nl/META-INF/MANIFEST.MF
index da108c68f9..a6619ae8e3 100644
--- a/nl/org.eclipse.birt.report.designer.ui.lib.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.lib.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.lib.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.lib;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.lib.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.lib.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.lib.nl/pom.xml
index ee8e97eeca..071a267282 100644
--- a/nl/org.eclipse.birt.report.designer.ui.lib.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.lib.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.lib.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.nl/META-INF/MANIFEST.MF
index e393a3b99b..92ce234950 100644
--- a/nl/org.eclipse.birt.report.designer.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.nl/pom.xml
index 093ec794c0..5f03c278ea 100644
--- a/nl/org.eclipse.birt.report.designer.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.preview.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.preview.nl/META-INF/MANIFEST.MF
index 35016bf4f9..1d82a0e953 100644
--- a/nl/org.eclipse.birt.report.designer.ui.preview.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.preview.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.preview.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.preview;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.preview.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.preview.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.preview.nl/pom.xml
index 9b625aad70..3884e5be33 100644
--- a/nl/org.eclipse.birt.report.designer.ui.preview.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.preview.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.preview.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.preview.web.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.preview.web.nl/META-INF/MANIFEST.MF
index 374f483e1f..cde2ef47ac 100644
--- a/nl/org.eclipse.birt.report.designer.ui.preview.web.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.preview.web.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.preview.web.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.preview.web;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.preview.web.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.preview.web.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.preview.web.nl/pom.xml
index 1614e9ee34..03d592700b 100644
--- a/nl/org.eclipse.birt.report.designer.ui.preview.web.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.preview.web.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.preview.web.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.rcp.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.rcp.nl/META-INF/MANIFEST.MF
index c0caf4b10f..c553cef075 100644
--- a/nl/org.eclipse.birt.report.designer.ui.rcp.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.rcp.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.rcp.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.rcp;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.rcp.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.rcp.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.rcp.nl/pom.xml
index 67c7c5c84e..a6af57a9cf 100644
--- a/nl/org.eclipse.birt.report.designer.ui.rcp.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.rcp.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.rcp.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.samples.ide.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.samples.ide.nl/META-INF/MANIFEST.MF
index 1699b21d1f..66f4710309 100644
--- a/nl/org.eclipse.birt.report.designer.ui.samples.ide.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.samples.ide.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.samples.ide.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.samples.ide;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.samples.ide.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.samples.ide.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.samples.ide.nl/pom.xml
index 31b256c4e6..0aa774d664 100644
--- a/nl/org.eclipse.birt.report.designer.ui.samples.ide.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.samples.ide.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.samples.ide.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.samplesview.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.samplesview.nl/META-INF/MANIFEST.MF
index 188b3601d0..0f5771d630 100644
--- a/nl/org.eclipse.birt.report.designer.ui.samplesview.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.samplesview.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.samplesview.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.samplesview;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.samplesview.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.samplesview.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.samplesview.nl/pom.xml
index 43fc529584..c86451f221 100644
--- a/nl/org.eclipse.birt.report.designer.ui.samplesview.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.samplesview.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.samplesview.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.designer.ui.views.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.designer.ui.views.nl/META-INF/MANIFEST.MF
index ea7b2e2129..dccda30627 100644
--- a/nl/org.eclipse.birt.report.designer.ui.views.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.designer.ui.views.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.designer.ui.views.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.designer.ui.views;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.designer.ui.views.nl1
diff --git a/nl/org.eclipse.birt.report.designer.ui.views.nl/pom.xml b/nl/org.eclipse.birt.report.designer.ui.views.nl/pom.xml
index 2abf0cc538..a5ffde3fa7 100644
--- a/nl/org.eclipse.birt.report.designer.ui.views.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.designer.ui.views.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.designer.ui.views.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.engine.dataextraction.csv.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.engine.dataextraction.csv.nl/META-INF/MANIFEST.MF
index 6a00e3cdb1..09061944d2 100644
--- a/nl/org.eclipse.birt.report.engine.dataextraction.csv.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.engine.dataextraction.csv.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.dataextraction.csv.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine.dataextraction.csv;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Bundle-Localization: plugin
diff --git a/nl/org.eclipse.birt.report.engine.dataextraction.csv.nl/pom.xml b/nl/org.eclipse.birt.report.engine.dataextraction.csv.nl/pom.xml
index 6befaed586..903146e569 100644
--- a/nl/org.eclipse.birt.report.engine.dataextraction.csv.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.engine.dataextraction.csv.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.dataextraction.csv.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.engine.dataextraction.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.engine.dataextraction.nl/META-INF/MANIFEST.MF
index e48f4cb7ca..d9f1949efe 100644
--- a/nl/org.eclipse.birt.report.engine.dataextraction.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.engine.dataextraction.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.dataextraction.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine.dataextraction;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.dataextraction.nl1
diff --git a/nl/org.eclipse.birt.report.engine.dataextraction.nl/pom.xml b/nl/org.eclipse.birt.report.engine.dataextraction.nl/pom.xml
index 4394b4890b..500f9e2761 100644
--- a/nl/org.eclipse.birt.report.engine.dataextraction.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.engine.dataextraction.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.dataextraction.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.docx.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.engine.emitter.config.docx.nl/META-INF/MANIFEST.MF
index ce81deaa10..b72abb8109 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.docx.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.docx.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.docx.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine.emitter.config.docx;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.config.docx.nl1
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.docx.nl/pom.xml b/nl/org.eclipse.birt.report.engine.emitter.config.docx.nl/pom.xml
index a096cb9e10..50f8fe5e8d 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.docx.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.docx.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.docx.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.excel.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.engine.emitter.config.excel.nl/META-INF/MANIFEST.MF
index d8007b2e39..a301c290f8 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.excel.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.excel.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.excel.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine.emitter.config.excel;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.config.excel.nl1
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.excel.nl/pom.xml b/nl/org.eclipse.birt.report.engine.emitter.config.excel.nl/pom.xml
index 98557654e5..cacd4e67da 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.excel.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.excel.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.excel.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.html.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.engine.emitter.config.html.nl/META-INF/MANIFEST.MF
index d0f3652005..c15e0e47d7 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.html.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.html.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.html.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine.emitter.config.html;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.config.html.nl1
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.html.nl/pom.xml b/nl/org.eclipse.birt.report.engine.emitter.config.html.nl/pom.xml
index 1d2f7b7177..4a018b6415 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.html.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.html.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.html.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.engine.emitter.config.nl/META-INF/MANIFEST.MF
index 2b4463e3a0..c2028e3de0 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine.emitter.config;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.config.nl1
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.nl/pom.xml b/nl/org.eclipse.birt.report.engine.emitter.config.nl/pom.xml
index 2d0cd2fa84..8426b0269b 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.pdf.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.engine.emitter.config.pdf.nl/META-INF/MANIFEST.MF
index 8cf38c187d..5cf38fde31 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.pdf.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.pdf.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.pdf.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine.emitter.config.pdf;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.config.pdf.nl1
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.pdf.nl/pom.xml b/nl/org.eclipse.birt.report.engine.emitter.config.pdf.nl/pom.xml
index 081f771a98..a38f1a754c 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.pdf.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.pdf.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.pdf.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.postscript.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.engine.emitter.config.postscript.nl/META-INF/MANIFEST.MF
index 3337d544e6..e37a38f2c1 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.postscript.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.postscript.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.postscript.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine.emitter.config.postscript;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.config.postscript.nl1
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.postscript.nl/pom.xml b/nl/org.eclipse.birt.report.engine.emitter.config.postscript.nl/pom.xml
index ff05b5d8b9..96ec1bda3a 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.postscript.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.postscript.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.postscript.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.ppt.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.engine.emitter.config.ppt.nl/META-INF/MANIFEST.MF
index 0905164e95..035f399f49 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.ppt.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.ppt.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.ppt.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine.emitter.config.ppt;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.config.ppt.nl1
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.ppt.nl/pom.xml b/nl/org.eclipse.birt.report.engine.emitter.config.ppt.nl/pom.xml
index af8bbbbfbd..e0eef432f2 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.ppt.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.ppt.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.ppt.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.pptx.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.engine.emitter.config.pptx.nl/META-INF/MANIFEST.MF
index 5f114c266d..8fbfa80960 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.pptx.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.pptx.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.pptx.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine.emitter.config.pptx;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.config.pptx.nl1
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.pptx.nl/pom.xml b/nl/org.eclipse.birt.report.engine.emitter.config.pptx.nl/pom.xml
index 9f1c914f37..bcbce446f9 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.pptx.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.pptx.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.pptx.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.wpml.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.engine.emitter.config.wpml.nl/META-INF/MANIFEST.MF
index 137c14c10c..8f11e40b5f 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.wpml.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.wpml.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.emitter.config.wpml.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine.emitter.config.wpml;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.emitter.config.wpml.nl1
diff --git a/nl/org.eclipse.birt.report.engine.emitter.config.wpml.nl/pom.xml b/nl/org.eclipse.birt.report.engine.emitter.config.wpml.nl/pom.xml
index b165de2b68..fb2bba78d2 100644
--- a/nl/org.eclipse.birt.report.engine.emitter.config.wpml.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.engine.emitter.config.wpml.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.emitter.config.wpml.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.engine.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.engine.nl/META-INF/MANIFEST.MF
index 3be0ead4f2..0494a9f0be 100644
--- a/nl/org.eclipse.birt.report.engine.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.engine.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.engine.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.engine;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.engine.nl1
diff --git a/nl/org.eclipse.birt.report.engine.nl/pom.xml b/nl/org.eclipse.birt.report.engine.nl/pom.xml
index 05682722db..51cd252a78 100644
--- a/nl/org.eclipse.birt.report.engine.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.engine.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.engine.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.item.crosstab.core.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.item.crosstab.core.nl/META-INF/MANIFEST.MF
index f22b9e0d54..f86141474c 100644
--- a/nl/org.eclipse.birt.report.item.crosstab.core.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.item.crosstab.core.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.item.crosstab.core.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.item.crosstab.core;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.item.crosstab.core.nl1
diff --git a/nl/org.eclipse.birt.report.item.crosstab.core.nl/pom.xml b/nl/org.eclipse.birt.report.item.crosstab.core.nl/pom.xml
index 5e742f6392..461dbd44ed 100644
--- a/nl/org.eclipse.birt.report.item.crosstab.core.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.item.crosstab.core.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.item.crosstab.core.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.item.crosstab.ui.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.item.crosstab.ui.nl/META-INF/MANIFEST.MF
index 386a1f3e24..3991867f39 100644
--- a/nl/org.eclipse.birt.report.item.crosstab.ui.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.item.crosstab.ui.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.item.crosstab.ui.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.item.crosstab.ui;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.item.crosstab.ui.nl1
diff --git a/nl/org.eclipse.birt.report.item.crosstab.ui.nl/pom.xml b/nl/org.eclipse.birt.report.item.crosstab.ui.nl/pom.xml
index f1a3b4f526..e3d74b975c 100644
--- a/nl/org.eclipse.birt.report.item.crosstab.ui.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.item.crosstab.ui.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.item.crosstab.ui.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.model.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.model.nl/META-INF/MANIFEST.MF
index 216b735b73..922e7415e4 100644
--- a/nl/org.eclipse.birt.report.model.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.model.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.model.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.model;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.model.nl1
diff --git a/nl/org.eclipse.birt.report.model.nl/pom.xml b/nl/org.eclipse.birt.report.model.nl/pom.xml
index 5548e07a1f..1a2475f633 100644
--- a/nl/org.eclipse.birt.report.model.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.model.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.model.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.report.viewer.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.report.viewer.nl/META-INF/MANIFEST.MF
index 1e3a5bec86..e084e88c33 100644
--- a/nl/org.eclipse.birt.report.viewer.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.report.viewer.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.viewers.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.viewer;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.report.viewers.nl1
diff --git a/nl/org.eclipse.birt.report.viewer.nl/pom.xml b/nl/org.eclipse.birt.report.viewer.nl/pom.xml
index fce4976bda..d5815feb39 100644
--- a/nl/org.eclipse.birt.report.viewer.nl/pom.xml
+++ b/nl/org.eclipse.birt.report.viewer.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.viewers.nl1</artifactId>
diff --git a/nl/org.eclipse.birt.resources.nl/META-INF/MANIFEST.MF b/nl/org.eclipse.birt.resources.nl/META-INF/MANIFEST.MF
index d443b08d76..0eb5c59d6d 100644
--- a/nl/org.eclipse.birt.resources.nl/META-INF/MANIFEST.MF
+++ b/nl/org.eclipse.birt.resources.nl/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.resources.nl1
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.resources;bundle-version="[2.1.0,5.0.0)"
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.resources.nl1
diff --git a/nl/org.eclipse.birt.resources.nl/pom.xml b/nl/org.eclipse.birt.resources.nl/pom.xml
index db05a662e1..2f813773f7 100644
--- a/nl/org.eclipse.birt.resources.nl/pom.xml
+++ b/nl/org.eclipse.birt.resources.nl/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.nl</groupId>
 		<artifactId>org.eclipse.birt.nl-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.resources.nl1</artifactId>
diff --git a/nl/pom.xml b/nl/pom.xml
index 344d38c5a4..40a29f0f0f 100644
--- a/nl/pom.xml
+++ b/nl/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/pom.xml b/pom.xml
index cdd785447f..c46f1c7222 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,11 +21,11 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>org.eclipse.birt</groupId>
 	<artifactId>org.eclipse.birt-parent</artifactId>
-	<version>4.17.0-SNAPSHOT</version>
+	<version>4.18.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<properties>
-		<birt.version>4.17.0</birt.version>
+		<birt.version>4.18.0</birt.version>
 		<tycho.scmUrl>scm:git:https://github.com/eclipse-birt/birt.git</tycho.scmUrl>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<skipTests>false</skipTests>
@@ -255,7 +255,7 @@
 						<artifact>
 							<groupId>org.eclipse.birt</groupId>
 							<artifactId>org.eclipse.birt.target</artifactId>
-							<version>4.17.0-SNAPSHOT</version>
+							<version>4.18.0-SNAPSHOT</version>
 						</artifact>
 					</target>
 					<executionEnvironment>org.eclipse.justj.openjdk.hotspot.jre.full-21</executionEnvironment>
diff --git a/promotion/pom.xml b/promotion/pom.xml
index f559f9586d..3622e4a74f 100644
--- a/promotion/pom.xml
+++ b/promotion/pom.xml
@@ -18,7 +18,7 @@ SPDX-License-Identifier: EPL-2.0
   <parent>
 	<groupId>org.eclipse.birt</groupId>
 	<artifactId>org.eclipse.birt-parent</artifactId>
-	<version>4.17.0-SNAPSHOT</version>
+	<version>4.18.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
diff --git a/testsuites/org.eclipse.birt.report.tests.chart/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.report.tests.chart/META-INF/MANIFEST.MF
index 56419906d7..2940405076 100644
--- a/testsuites/org.eclipse.birt.report.tests.chart/META-INF/MANIFEST.MF
+++ b/testsuites/org.eclipse.birt.report.tests.chart/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.tests.chart
 Bundle-ClassPath: .
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.tests.chart.plugin.ChartPlugin
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.junit,
diff --git a/testsuites/org.eclipse.birt.report.tests.chart/pom.xml b/testsuites/org.eclipse.birt.report.tests.chart/pom.xml
index 49b137a5d5..31fd22ef01 100644
--- a/testsuites/org.eclipse.birt.report.tests.chart/pom.xml
+++ b/testsuites/org.eclipse.birt.report.tests.chart/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.tests.chart</artifactId>
diff --git a/testsuites/org.eclipse.birt.report.tests.engine.emitter.html/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.report.tests.engine.emitter.html/META-INF/MANIFEST.MF
index a5c720054f..d11d91ef2f 100644
--- a/testsuites/org.eclipse.birt.report.tests.engine.emitter.html/META-INF/MANIFEST.MF
+++ b/testsuites/org.eclipse.birt.report.tests.engine.emitter.html/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.tests.engine.emitter.html;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.core;bundle-version="4.13.0",
  org.eclipse.birt.report.engine;bundle-version="4.13.0"
 Bundle-ClassPath: .
diff --git a/testsuites/org.eclipse.birt.report.tests.engine.emitter.html/pom.xml b/testsuites/org.eclipse.birt.report.tests.engine.emitter.html/pom.xml
index b9a20e8b43..4fb1cb1382 100644
--- a/testsuites/org.eclipse.birt.report.tests.engine.emitter.html/pom.xml
+++ b/testsuites/org.eclipse.birt.report.tests.engine.emitter.html/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.tests.engine.emitter.html</artifactId>
diff --git a/testsuites/org.eclipse.birt.report.tests.engine/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.report.tests.engine/META-INF/MANIFEST.MF
index b364e887ca..1774110619 100644
--- a/testsuites/org.eclipse.birt.report.tests.engine/META-INF/MANIFEST.MF
+++ b/testsuites/org.eclipse.birt.report.tests.engine/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.tests.engine; singleton:=true
 Bundle-ClassPath: .
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.tests.engine.plugin.EnginePlugin
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.junit,
diff --git a/testsuites/org.eclipse.birt.report.tests.engine/pom.xml b/testsuites/org.eclipse.birt.report.tests.engine/pom.xml
index ccb0ff9707..841d220049 100644
--- a/testsuites/org.eclipse.birt.report.tests.engine/pom.xml
+++ b/testsuites/org.eclipse.birt.report.tests.engine/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt.testsuites</groupId>
 		<artifactId>org.eclipse.birt.testsuites-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>..</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/testsuites/org.eclipse.birt.report.tests.model/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.report.tests.model/META-INF/MANIFEST.MF
index d68f662605..20e2f4b89f 100644
--- a/testsuites/org.eclipse.birt.report.tests.model/META-INF/MANIFEST.MF
+++ b/testsuites/org.eclipse.birt.report.tests.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.tests.model; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.report.tests.model.plugin.ModelPlugin
 Bundle-ClassPath: .
 Bundle-ActivationPolicy: lazy
diff --git a/testsuites/org.eclipse.birt.report.tests.model/pom.xml b/testsuites/org.eclipse.birt.report.tests.model/pom.xml
index 3308e77e03..e8c8ed93b1 100644
--- a/testsuites/org.eclipse.birt.report.tests.model/pom.xml
+++ b/testsuites/org.eclipse.birt.report.tests.model/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.tests.model</artifactId>
diff --git a/testsuites/org.eclipse.birt.tests.core/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.tests.core/META-INF/MANIFEST.MF
index 660adefe52..b5e95c651c 100644
--- a/testsuites/org.eclipse.birt.tests.core/META-INF/MANIFEST.MF
+++ b/testsuites/org.eclipse.birt.tests.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.tests.core
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.junit;bundle-version="4.13.0",
  org.eclipse.birt.report.engine;bundle-version="4.13.0",
  org.eclipse.birt.core;bundle-version="4.13.0"
diff --git a/testsuites/org.eclipse.birt.tests.core/pom.xml b/testsuites/org.eclipse.birt.tests.core/pom.xml
index 8bf885767f..91b472e23c 100644
--- a/testsuites/org.eclipse.birt.tests.core/pom.xml
+++ b/testsuites/org.eclipse.birt.tests.core/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.tests.core</artifactId>
diff --git a/testsuites/org.eclipse.birt.tests.data/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.tests.data/META-INF/MANIFEST.MF
index bb48689d7d..b84cd58c8d 100644
--- a/testsuites/org.eclipse.birt.tests.data/META-INF/MANIFEST.MF
+++ b/testsuites/org.eclipse.birt.tests.data/META-INF/MANIFEST.MF
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.tests.data;singleton:=true
 Bundle-ClassPath: .
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Activator: org.eclipse.birt.tests.data.engine.plugin.DataPlugin
 Require-Bundle: org.junit,
  org.eclipse.birt.core;bundle-version="4.13.0",
diff --git a/testsuites/org.eclipse.birt.tests.data/pom.xml b/testsuites/org.eclipse.birt.tests.data/pom.xml
index 11e149769e..f815ea15f7 100644
--- a/testsuites/org.eclipse.birt.tests.data/pom.xml
+++ b/testsuites/org.eclipse.birt.tests.data/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.tests.data</artifactId>
diff --git a/testsuites/org.eclipse.birt.tests/META-INF/MANIFEST.MF b/testsuites/org.eclipse.birt.tests/META-INF/MANIFEST.MF
index f8fa5890bf..6bfe7ec901 100644
--- a/testsuites/org.eclipse.birt.tests/META-INF/MANIFEST.MF
+++ b/testsuites/org.eclipse.birt.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.tests
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
 Automatic-Module-Name: org.eclipse.birt.tests
diff --git a/testsuites/org.eclipse.birt.tests/pom.xml b/testsuites/org.eclipse.birt.tests/pom.xml
index 0917ef91ca..feb93784b4 100644
--- a/testsuites/org.eclipse.birt.tests/pom.xml
+++ b/testsuites/org.eclipse.birt.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/testsuites/pom.xml b/testsuites/pom.xml
index d5323bf31e..23ddea26f7 100644
--- a/testsuites/pom.xml
+++ b/testsuites/pom.xml
@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/tutorial/extension-tutorial-1/META-INF/MANIFEST.MF b/tutorial/extension-tutorial-1/META-INF/MANIFEST.MF
index 54a8330e4a..f6b85f66f8 100644
--- a/tutorial/extension-tutorial-1/META-INF/MANIFEST.MF
+++ b/tutorial/extension-tutorial-1/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.extension.tutorial_1;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/tutorial/extension-tutorial-1/pom.xml b/tutorial/extension-tutorial-1/pom.xml
index 9ebae7f2bf..19ef474141 100644
--- a/tutorial/extension-tutorial-1/pom.xml
+++ b/tutorial/extension-tutorial-1/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/tutorial/extension-tutorial-2/META-INF/MANIFEST.MF b/tutorial/extension-tutorial-2/META-INF/MANIFEST.MF
index 39dd8294d7..c2ee530782 100644
--- a/tutorial/extension-tutorial-2/META-INF/MANIFEST.MF
+++ b/tutorial/extension-tutorial-2/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.extension.tutorial_2;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: %Bundle-Vendor
diff --git a/tutorial/extension-tutorial-2/pom.xml b/tutorial/extension-tutorial-2/pom.xml
index 63ff45fa9e..417548246b 100644
--- a/tutorial/extension-tutorial-2/pom.xml
+++ b/tutorial/extension-tutorial-2/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<groupId>org.eclipse.birt</groupId>
diff --git a/viewer/org.eclipse.birt.axis.overlay/META-INF/MANIFEST.MF b/viewer/org.eclipse.birt.axis.overlay/META-INF/MANIFEST.MF
index e35fcdf4c8..b33c9041d6 100644
--- a/viewer/org.eclipse.birt.axis.overlay/META-INF/MANIFEST.MF
+++ b/viewer/org.eclipse.birt.axis.overlay/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.axis.overlay;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.apache.axis;bundle-version="1.4.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Bundle-Vendor: %Bundle-Vendor
diff --git a/viewer/org.eclipse.birt.axis.overlay/pom.xml b/viewer/org.eclipse.birt.axis.overlay/pom.xml
index 3d0ab5432b..ec794ff406 100644
--- a/viewer/org.eclipse.birt.axis.overlay/pom.xml
+++ b/viewer/org.eclipse.birt.axis.overlay/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.axis.overlay</artifactId>
diff --git a/viewer/org.eclipse.birt.integration.wtp.ui/META-INF/MANIFEST.MF b/viewer/org.eclipse.birt.integration.wtp.ui/META-INF/MANIFEST.MF
index c59020abec..da97a5f712 100644
--- a/viewer/org.eclipse.birt.integration.wtp.ui/META-INF/MANIFEST.MF
+++ b/viewer/org.eclipse.birt.integration.wtp.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.integration.wtp.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.birt.integration.wtp.ui.BirtWTPUIPlugin
 Bundle-Localization: plugin
diff --git a/viewer/org.eclipse.birt.integration.wtp.ui/pom.xml b/viewer/org.eclipse.birt.integration.wtp.ui/pom.xml
index b4a6e940aa..579f000a23 100644
--- a/viewer/org.eclipse.birt.integration.wtp.ui/pom.xml
+++ b/viewer/org.eclipse.birt.integration.wtp.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.integration.wtp.ui</artifactId>
diff --git a/viewer/org.eclipse.birt.report.viewer.tests/META-INF/MANIFEST.MF b/viewer/org.eclipse.birt.report.viewer.tests/META-INF/MANIFEST.MF
index e300577ebc..2d3fb7a4de 100644
--- a/viewer/org.eclipse.birt.report.viewer.tests/META-INF/MANIFEST.MF
+++ b/viewer/org.eclipse.birt.report.viewer.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.viewer.tests
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.viewer;bundle-version="2.3.1"
 Bundle-RequiredExecutionEnvironment: JavaSE-11
 Export-Package: org.eclipse.birt.report.viewer
diff --git a/viewer/org.eclipse.birt.report.viewer.tests/pom.xml b/viewer/org.eclipse.birt.report.viewer.tests/pom.xml
index c978d28f05..9ce4dc0a21 100644
--- a/viewer/org.eclipse.birt.report.viewer.tests/pom.xml
+++ b/viewer/org.eclipse.birt.report.viewer.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.viewer.tests</artifactId>
diff --git a/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF b/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF
index 33ac15094a..6b83707ec8 100644
--- a/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF
+++ b/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.viewer; singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-ClassPath: .,
  birt/WEB-INF/lib/viewservlets.jar
 Bundle-Activator: org.eclipse.birt.report.viewer.ViewerPlugin
diff --git a/viewer/org.eclipse.birt.report.viewer/birt/index.jsp b/viewer/org.eclipse.birt.report.viewer/birt/index.jsp
index be144b34b5..de4e96484a 100644
--- a/viewer/org.eclipse.birt.report.viewer/birt/index.jsp
+++ b/viewer/org.eclipse.birt.report.viewer/birt/index.jsp
@@ -45,8 +45,8 @@
 			}
 		</style>
 	<%
-		String viewerVersion = "4.17.0";
-		String engineVersion = "4.17.0";
+		String viewerVersion = "4.18.0";
+		String engineVersion = "4.18.0";
 
 		String javaVersion	= System.getProperty("java.version");
 		String javaVendor	= System.getProperty("java.vendor");
diff --git a/viewer/org.eclipse.birt.report.viewer/pom.xml b/viewer/org.eclipse.birt.report.viewer/pom.xml
index d2afcf7a6a..b53e6ae48e 100644
--- a/viewer/org.eclipse.birt.report.viewer/pom.xml
+++ b/viewer/org.eclipse.birt.report.viewer/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.viewer</artifactId>
diff --git a/viewer/pom.xml b/viewer/pom.xml
index 677f19a29b..3bf1782f7c 100644
--- a/viewer/pom.xml
+++ b/viewer/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>
 
diff --git a/xtab/org.eclipse.birt.report.item.crosstab.core.tests/META-INF/MANIFEST.MF b/xtab/org.eclipse.birt.report.item.crosstab.core.tests/META-INF/MANIFEST.MF
index 0bb2796d56..8bad307530 100644
--- a/xtab/org.eclipse.birt.report.item.crosstab.core.tests/META-INF/MANIFEST.MF
+++ b/xtab/org.eclipse.birt.report.item.crosstab.core.tests/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.item.crosstab.core.tests;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Fragment-Host: org.eclipse.birt.report.item.crosstab.core;bundle-version="1.0.0"
 Require-Bundle: org.junit;bundle-version="4.13.0",
  org.eclipse.birt.report.modelextension.tests;bundle-version="4.17.0"
diff --git a/xtab/org.eclipse.birt.report.item.crosstab.core.tests/pom.xml b/xtab/org.eclipse.birt.report.item.crosstab.core.tests/pom.xml
index d5af3aa9f8..0cc97696c1 100644
--- a/xtab/org.eclipse.birt.report.item.crosstab.core.tests/pom.xml
+++ b/xtab/org.eclipse.birt.report.item.crosstab.core.tests/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.item.crosstab.core.tests</artifactId>
diff --git a/xtab/org.eclipse.birt.report.item.crosstab.core/META-INF/MANIFEST.MF b/xtab/org.eclipse.birt.report.item.crosstab.core/META-INF/MANIFEST.MF
index b2c7b0e01e..b3d57deb40 100644
--- a/xtab/org.eclipse.birt.report.item.crosstab.core/META-INF/MANIFEST.MF
+++ b/xtab/org.eclipse.birt.report.item.crosstab.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.item.crosstab.core;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Require-Bundle: org.eclipse.birt.data;bundle-version="4.13.0";visibility:=reexport,
  org.eclipse.birt.report.data.adapter;bundle-version="4.13.0";visibility:=reexport,
  org.eclipse.birt.report.engine;bundle-version="4.13.0"
diff --git a/xtab/org.eclipse.birt.report.item.crosstab.core/api/MANIFEST.MF b/xtab/org.eclipse.birt.report.item.crosstab.core/api/MANIFEST.MF
index c2327d9989..9a244665e9 100644
--- a/xtab/org.eclipse.birt.report.item.crosstab.core/api/MANIFEST.MF
+++ b/xtab/org.eclipse.birt.report.item.crosstab.core/api/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: BIRT Crosstab API 
 Bundle-SymbolicName: org.eclipse.birt.report.item.crosstab.core.api;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Vendor: Eclipse BIRT Project
 Bundle-RequiredExecutionEnvironment: JavaSE-11
diff --git a/xtab/org.eclipse.birt.report.item.crosstab.core/pom.xml b/xtab/org.eclipse.birt.report.item.crosstab.core/pom.xml
index 286560a5ef..3c4d8302d0 100644
--- a/xtab/org.eclipse.birt.report.item.crosstab.core/pom.xml
+++ b/xtab/org.eclipse.birt.report.item.crosstab.core/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.item.crosstab.core</artifactId>
diff --git a/xtab/org.eclipse.birt.report.item.crosstab.ui/META-INF/MANIFEST.MF b/xtab/org.eclipse.birt.report.item.crosstab.ui/META-INF/MANIFEST.MF
index 9c4da00468..7ce268c25b 100644
--- a/xtab/org.eclipse.birt.report.item.crosstab.ui/META-INF/MANIFEST.MF
+++ b/xtab/org.eclipse.birt.report.item.crosstab.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %Bundle-Name
 Bundle-SymbolicName: org.eclipse.birt.report.item.crosstab.ui;singleton:=true
-Bundle-Version: 4.17.0.qualifier
+Bundle-Version: 4.18.0.qualifier
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.birt.core;bundle-version="4.13.0",
  org.eclipse.birt.report.model;bundle-version="4.13.0",
diff --git a/xtab/org.eclipse.birt.report.item.crosstab.ui/pom.xml b/xtab/org.eclipse.birt.report.item.crosstab.ui/pom.xml
index eb5b3fc41e..cdecaead8b 100644
--- a/xtab/org.eclipse.birt.report.item.crosstab.ui/pom.xml
+++ b/xtab/org.eclipse.birt.report.item.crosstab.ui/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../../</relativePath>
 	</parent>
 	<artifactId>org.eclipse.birt.report.item.crosstab.ui</artifactId>
diff --git a/xtab/pom.xml b/xtab/pom.xml
index a2bb1b6785..e231467c80 100644
--- a/xtab/pom.xml
+++ b/xtab/pom.xml
@@ -18,7 +18,7 @@
 	<parent>
 		<groupId>org.eclipse.birt</groupId>
 		<artifactId>org.eclipse.birt-parent</artifactId>
-		<version>4.17.0-SNAPSHOT</version>
+		<version>4.18.0-SNAPSHOT</version>
 		<relativePath>../</relativePath>
 	</parent>