From b4d9082bce976b2df23ffb8b45bba23a17f74577 Mon Sep 17 00:00:00 2001
From: Ed Merks <ed.merks@gmail.com>
Date: Sun, 7 Jul 2024 18:26:07 +0200
Subject: [PATCH] Use com.h2database 2.2.224 instead of org.h2

- org.apache.commons.logging -> org.apache.commons.commons-logging

https://github.com/eclipse-simrel/simrel.build/issues/438
---
 .../feature.xml                               |  2 +-
 .../org.eclipse.emf.cdo.all-feature/pom.xml   |  2 +-
 .../feature.xml                               |  2 +-
 .../pom.xml                                   |  2 +-
 .../feature.xml                               |  2 +-
 .../pom.xml                                   |  2 +-
 .../feature.xml                               |  2 +-
 .../pom.xml                                   |  2 +-
 .../org.eclipse.net4j-feature/feature.xml     |  2 +-
 features/org.eclipse.net4j-feature/pom.xml    |  2 +-
 .../org.eclipse.net4j.db-feature/feature.xml  |  2 +-
 features/org.eclipse.net4j.db-feature/pom.xml |  2 +-
 .../feature.xml                               |  4 +--
 .../org.eclipse.net4j.db.h2-feature/pom.xml   |  2 +-
 .../org.eclipse.net4j.sdk-feature/feature.xml |  2 +-
 .../org.eclipse.net4j.sdk-feature/pom.xml     |  2 +-
 .../feature.xml                               |  2 +-
 .../org.eclipse.net4j.tests-feature/pom.xml   |  2 +-
 .../feature.xml                               |  4 +--
 .../org.eclipse.net4j.util-feature/pom.xml    |  2 +-
 .../feature.xml                               |  2 +-
 .../org.eclipse.net4j.util.ui-feature/pom.xml |  2 +-
 .../META-INF/MANIFEST.MF                      | 10 +++----
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  6 ++--
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      | 10 +++----
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  6 ++--
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  4 +--
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  8 ++---
 .../org.gastro.server/META-INF/MANIFEST.MF    | 15 +++++-----
 .../examples/org.gastro.server/pom.xml        |  2 +-
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  4 +--
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  8 ++---
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      | 14 ++++-----
 plugins/org.eclipse.emf.cdo.examples/pom.xml  |  2 +-
 .../META-INF/MANIFEST.MF                      | 29 +++++++++----------
 plugins/org.eclipse.emf.cdo.explorer/pom.xml  |  2 +-
 .../META-INF/MANIFEST.MF                      | 17 +++++------
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../pom.xml                                   |  2 +-
 .../META-INF/MANIFEST.MF                      | 18 ++++++------
 plugins/org.eclipse.emf.cdo.tests.db/pom.xml  |  2 +-
 .../META-INF/MANIFEST.MF                      |  8 ++---
 .../org.eclipse.emf.cdo.tests.lissome/pom.xml |  2 +-
 .../META-INF/MANIFEST.MF                      |  2 +-
 .../META-INF/MANIFEST.MF                      | 17 +++++------
 plugins/org.eclipse.net4j.db.h2/pom.xml       |  2 +-
 .../META-INF/MANIFEST.MF                      | 19 +++++-------
 plugins/org.eclipse.net4j.db.tests/pom.xml    |  2 +-
 .../META-INF/MANIFEST.MF                      |  8 ++---
 plugins/org.gastro.server.web/pom.xml         |  2 +-
 .../org.gastro.server/META-INF/MANIFEST.MF    | 15 +++++-----
 plugins/org.gastro.server/pom.xml             |  2 +-
 .../features/pom.xml                          |  6 ++--
 .../tp/org.eclipse.emf.cdo.releng.tp.target   |  8 ++---
 releng/org.eclipse.emf.cdo.releng/CDO.setup   |  4 +--
 65 files changed, 157 insertions(+), 169 deletions(-)

diff --git a/features/org.eclipse.emf.cdo.all-feature/feature.xml b/features/org.eclipse.emf.cdo.all-feature/feature.xml
index e661f545b71..78eed105cfb 100644
--- a/features/org.eclipse.emf.cdo.all-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.all-feature/feature.xml
@@ -13,7 +13,7 @@
 <feature
       id="org.eclipse.emf.cdo.all"
       label="%featureName"
-      version="4.26.0.qualifier"
+      version="5.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.cdo.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.cdo.all-feature/pom.xml b/features/org.eclipse.emf.cdo.all-feature/pom.xml
index ed74ecf28e1..91bcca66b51 100644
--- a/features/org.eclipse.emf.cdo.all-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.all-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.emf.cdo.all</artifactId>
-  <version>4.26.0-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.cdo.examples-feature/feature.xml b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
index 0154bec5470..7fa597d6aae 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.examples-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.examples"
       label="%featureName"
-      version="4.6.3.qualifier"
+      version="4.6.4.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.examples-feature/pom.xml b/features/org.eclipse.emf.cdo.examples-feature/pom.xml
index 65a1e279d4f..d2dbb798bd2 100644
--- a/features/org.eclipse.emf.cdo.examples-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.examples-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.emf.cdo.examples</artifactId>
-  <version>4.6.3-SNAPSHOT</version>
+  <version>4.6.4-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml b/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml
index b9ccf66c0a0..3e997db922c 100644
--- a/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.examples.installer-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.examples.installer"
       label="%featureName"
-      version="4.4.3.qualifier"
+      version="4.4.4.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml b/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml
index 9900a9ea6ce..2f13ac847fa 100644
--- a/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.examples.installer-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.emf.cdo.examples.installer</artifactId>
-  <version>4.4.3-SNAPSHOT</version>
+  <version>4.4.4-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml b/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml
index 24ebedf25ea..ce493ac28e8 100644
--- a/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.emf.cdo.server.lissome"
       label="%featureName"
-      version="4.3.9.qualifier"
+      version="4.3.10.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.emf.cdo.server.lissome-feature/pom.xml b/features/org.eclipse.emf.cdo.server.lissome-feature/pom.xml
index a0cdf295463..c3e91463923 100644
--- a/features/org.eclipse.emf.cdo.server.lissome-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server.lissome-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.emf.cdo.server.lissome</artifactId>
-  <version>4.3.9-SNAPSHOT</version>
+  <version>4.3.10-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.net4j-feature/feature.xml b/features/org.eclipse.net4j-feature/feature.xml
index 2cccdfa14b9..497a4640656 100644
--- a/features/org.eclipse.net4j-feature/feature.xml
+++ b/features/org.eclipse.net4j-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.net4j"
       label="%featureName"
-      version="4.26.0.qualifier"
+      version="5.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j-feature/pom.xml b/features/org.eclipse.net4j-feature/pom.xml
index c0cbbafc9c7..fed65f71682 100644
--- a/features/org.eclipse.net4j-feature/pom.xml
+++ b/features/org.eclipse.net4j-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.net4j</artifactId>
-  <version>4.26.0-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.net4j.db-feature/feature.xml b/features/org.eclipse.net4j.db-feature/feature.xml
index 953a6a88dfe..0df913c6775 100644
--- a/features/org.eclipse.net4j.db-feature/feature.xml
+++ b/features/org.eclipse.net4j.db-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.net4j.db"
       label="%featureName"
-      version="4.24.0.qualifier"
+      version="5.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.cdo.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.db-feature/pom.xml b/features/org.eclipse.net4j.db-feature/pom.xml
index b46671b1d26..66116cc963b 100644
--- a/features/org.eclipse.net4j.db-feature/pom.xml
+++ b/features/org.eclipse.net4j.db-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.net4j.db</artifactId>
-  <version>4.24.0-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.net4j.db.h2-feature/feature.xml b/features/org.eclipse.net4j.db.h2-feature/feature.xml
index 5495e41a7c2..09a43875840 100644
--- a/features/org.eclipse.net4j.db.h2-feature/feature.xml
+++ b/features/org.eclipse.net4j.db.h2-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.net4j.db.h2"
       label="%featureName"
-      version="4.5.5.qualifier"
+      version="5.0.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.cdo.license"
       license-feature-version="0.0.0">
@@ -42,7 +42,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.h2"
+         id="com.h2database"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipse.net4j.db.h2-feature/pom.xml b/features/org.eclipse.net4j.db.h2-feature/pom.xml
index ccf9169619a..852eb7397bf 100644
--- a/features/org.eclipse.net4j.db.h2-feature/pom.xml
+++ b/features/org.eclipse.net4j.db.h2-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.net4j.db.h2</artifactId>
-  <version>4.5.5-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.net4j.sdk-feature/feature.xml b/features/org.eclipse.net4j.sdk-feature/feature.xml
index eb96c575679..f81955cf06e 100644
--- a/features/org.eclipse.net4j.sdk-feature/feature.xml
+++ b/features/org.eclipse.net4j.sdk-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.net4j.sdk"
       label="%featureName"
-      version="4.26.0.qualifier"
+      version="5.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.sdk-feature/pom.xml b/features/org.eclipse.net4j.sdk-feature/pom.xml
index 0e6fc7b4d7d..ea1793857c1 100644
--- a/features/org.eclipse.net4j.sdk-feature/pom.xml
+++ b/features/org.eclipse.net4j.sdk-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.net4j.sdk</artifactId>
-  <version>4.26.0-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.net4j.tests-feature/feature.xml b/features/org.eclipse.net4j.tests-feature/feature.xml
index 6911c4affa7..9718ac1ebd6 100644
--- a/features/org.eclipse.net4j.tests-feature/feature.xml
+++ b/features/org.eclipse.net4j.tests-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.net4j.tests"
       label="%featureName"
-      version="4.3.12.qualifier"
+      version="4.3.13.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.cdo.license"
       license-feature-version="0.0.0">
diff --git a/features/org.eclipse.net4j.tests-feature/pom.xml b/features/org.eclipse.net4j.tests-feature/pom.xml
index 768cb9f5b98..74a662a8026 100644
--- a/features/org.eclipse.net4j.tests-feature/pom.xml
+++ b/features/org.eclipse.net4j.tests-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.net4j.tests</artifactId>
-  <version>4.3.12-SNAPSHOT</version>
+  <version>4.3.13-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.net4j.util-feature/feature.xml b/features/org.eclipse.net4j.util-feature/feature.xml
index f85198ecb75..73b3255b19a 100644
--- a/features/org.eclipse.net4j.util-feature/feature.xml
+++ b/features/org.eclipse.net4j.util-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.net4j.util"
       label="%featureName"
-      version="4.24.0.qualifier"
+      version="5.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
@@ -43,7 +43,7 @@
          unpack="false"/>
 
    <plugin
-         id="org.apache.commons.logging"
+         id="org.apache.commons.commons-logging"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipse.net4j.util-feature/pom.xml b/features/org.eclipse.net4j.util-feature/pom.xml
index 934badd9261..8ba1b0492d7 100644
--- a/features/org.eclipse.net4j.util-feature/pom.xml
+++ b/features/org.eclipse.net4j.util-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.net4j.util</artifactId>
-  <version>4.24.0-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.net4j.util.ui-feature/feature.xml b/features/org.eclipse.net4j.util.ui-feature/feature.xml
index 3ed62e75f08..b55724dfce4 100644
--- a/features/org.eclipse.net4j.util.ui-feature/feature.xml
+++ b/features/org.eclipse.net4j.util.ui-feature/feature.xml
@@ -12,7 +12,7 @@
 <feature
       id="org.eclipse.net4j.util.ui"
       label="%featureName"
-      version="4.24.0.qualifier"
+      version="5.0.0.qualifier"
       provider-name="%providerName"
       image="eclipse_update_120.jpg"
       license-feature="org.eclipse.emf.cdo.license"
diff --git a/features/org.eclipse.net4j.util.ui-feature/pom.xml b/features/org.eclipse.net4j.util.ui-feature/pom.xml
index a9b80cc07d0..8a1f0cbde24 100644
--- a/features/org.eclipse.net4j.util.ui-feature/pom.xml
+++ b/features/org.eclipse.net4j.util.ui-feature/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo.features</groupId>
   <artifactId>org.eclipse.net4j.util.ui</artifactId>
-  <version>4.24.0-SNAPSHOT</version>
+  <version>5.0.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
index 3db44cc8060..c2a40e88e85 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.client.offline;singleton:=true
-Bundle-Version: 4.4.1.qualifier
+Bundle-Version: 4.4.2.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
@@ -21,9 +21,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
-Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
+Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
 Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.4.1";x-internal:=true,
- org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.4.1";x-internal:=true,
- org.eclipse.wb.swt;version="4.4.1";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.4.2";x-internal:=true,
+ org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.4.2";x-internal:=true,
+ org.eclipse.wb.swt;version="4.4.2";x-internal:=true
 Automatic-Module-Name: org.eclipse.emf.cdo.examples.client.offline
diff --git a/plugins/org.eclipse.emf.cdo.examples.client.offline/pom.xml b/plugins/org.eclipse.emf.cdo.examples.client.offline/pom.xml
index 1c51b29e014..11ace585573 100644
--- a/plugins/org.eclipse.emf.cdo.examples.client.offline/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.client.offline/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.examples.client.offline</artifactId>
-  <version>4.4.1-SNAPSHOT</version>
+  <version>4.4.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
index 671b4cd6c92..78c1fc353c1 100644
--- a/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.clone;singleton:=true
-Bundle-Version: 4.2.1.qualifier
+Bundle-Version: 4.2.2.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
@@ -17,6 +17,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.examples.company;bundle-version="[4.0.0,5.0.0)"
-Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.examples.server.offline;version="4.2.1";x-internal:=true
+Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.emf.cdo.examples.server.offline;version="4.2.2";x-internal:=true
 Automatic-Module-Name: org.eclipse.emf.cdo.examples.clone
diff --git a/plugins/org.eclipse.emf.cdo.examples.clone/pom.xml b/plugins/org.eclipse.emf.cdo.examples.clone/pom.xml
index 76e89b6c86e..7ec66fc64ec 100644
--- a/plugins/org.eclipse.emf.cdo.examples.clone/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.clone/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.examples.clone</artifactId>
-  <version>4.2.1-SNAPSHOT</version>
+  <version>4.2.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF
index 6b80276034a..ee8d38a4176 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.installer;singleton:=true
-Bundle-Version: 4.3.3.qualifier
+Bundle-Version: 4.3.4.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
index 3db44cc8060..c2a40e88e85 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.client.offline;singleton:=true
-Bundle-Version: 4.4.1.qualifier
+Bundle-Version: 4.4.2.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
@@ -21,9 +21,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)"
-Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
+Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
 Bundle-ClassPath: .
-Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.4.1";x-internal:=true,
- org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.4.1";x-internal:=true,
- org.eclipse.wb.swt;version="4.4.1";x-internal:=true
+Export-Package: org.eclipse.emf.cdo.examples.client.offline;version="4.4.2";x-internal:=true,
+ org.eclipse.emf.cdo.examples.client.offline.nodes;version="4.4.2";x-internal:=true,
+ org.eclipse.wb.swt;version="4.4.2";x-internal:=true
 Automatic-Module-Name: org.eclipse.emf.cdo.examples.client.offline
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/pom.xml
index 1c51b29e014..11ace585573 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.client.offline/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.examples.client.offline</artifactId>
-  <version>4.4.1-SNAPSHOT</version>
+  <version>4.4.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
index 671b4cd6c92..78c1fc353c1 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.clone;singleton:=true
-Bundle-Version: 4.2.1.qualifier
+Bundle-Version: 4.2.2.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
@@ -17,6 +17,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.examples.company;bundle-version="[4.0.0,5.0.0)"
-Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.examples.server.offline;version="4.2.1";x-internal:=true
+Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.emf.cdo.examples.server.offline;version="4.2.2";x-internal:=true
 Automatic-Module-Name: org.eclipse.emf.cdo.examples.clone
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/pom.xml
index 76e89b6c86e..7ec66fc64ec 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.clone/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.examples.clone</artifactId>
-  <version>4.2.1-SNAPSHOT</version>
+  <version>4.2.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF
index e8b3a69e31a..5895e4f30ad 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.master;singleton:=true
-Bundle-Version: 4.2.7.qualifier
+Bundle-Version: 4.2.8.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
@@ -14,5 +14,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)"
-Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
+Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.cdo.examples.master
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml
index f316268e2ed..391f5d2113f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.eclipse.emf.cdo.examples.master/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.examples.master</artifactId>
-  <version>4.2.7-SNAPSHOT</version>
+  <version>4.2.8-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/META-INF/MANIFEST.MF
index a9ae028598d..5bd721b05dd 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server.web/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.server.web;singleton:=true
-Bundle-Version: 4.4.1.qualifier
+Bundle-Version: 4.4.2.qualifier
 Bundle-Activator: org.gastro.server.internal.web.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)",
+Require-Bundle: org.apache.commons.commons-logging;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.equinox.http.registry;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.http.servlet;bundle-version="[1.0.0,2.0.0)",
@@ -22,6 +22,6 @@ Import-Package: javax.servlet;version="[2.3.0,5.0.0)",
  org.apache.commons.lang;version="[2.3.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Export-Package: org.gastro.server.internal.web;version="4.4.1";x-internal:=true,
- templates;version="4.4.1";x-internal:=true
+Export-Package: org.gastro.server.internal.web;version="4.4.2";x-internal:=true,
+ templates;version="4.4.2";x-internal:=true
 Automatic-Module-Name: org.gastro.server.web
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/META-INF/MANIFEST.MF
index b7caee4cda2..09ec9b08a99 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.server;singleton:=true
-Bundle-Version: 4.1.1.qualifier
+Bundle-Version: 4.1.2.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
@@ -11,14 +11,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[2.0.0,5.0.0)"
 Bundle-Activator: org.gastro.internal.server.OM$Activator
-Import-Package: org.h2;version="[1.0.0,2.0.0)",
- org.h2.api;version="[1.0.0,2.0.0)",
- org.h2.jdbcx;version="[1.0.0,2.0.0)",
- org.h2.tools;version="[1.0.0,2.0.0)",
- org.h2.util;version="[1.0.0,2.0.0)"
+Import-Package: org.h2.api;version="[2.0.0,3.0.0)",
+ org.h2.jdbcx;version="[2.0.0,3.0.0)",
+ org.h2.tools;version="[2.0.0,3.0.0)",
+ org.h2.util;version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.gastro.internal.server;version="4.1.1";x-internal:=true,
- org.gastro.server;version="4.1.1"
+Export-Package: org.gastro.internal.server;version="4.1.2";x-internal:=true,
+ org.gastro.server;version="4.1.2"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.gastro.server
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/pom.xml
index 6bca046c147..7a66ba51540 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/examples/org.gastro.server/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.gastro.server</artifactId>
-  <version>4.1.1-SNAPSHOT</version>
+  <version>4.1.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.examples.installer/pom.xml b/plugins/org.eclipse.emf.cdo.examples.installer/pom.xml
index 30ad83a39b3..f57d55a80f6 100644
--- a/plugins/org.eclipse.emf.cdo.examples.installer/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.installer/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.examples.installer</artifactId>
-  <version>4.3.3-SNAPSHOT</version>
+  <version>4.3.4-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF
index e8b3a69e31a..5895e4f30ad 100644
--- a/plugins/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.master/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.master;singleton:=true
-Bundle-Version: 4.2.7.qualifier
+Bundle-Version: 4.2.8.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-ActivationPolicy: lazy
@@ -14,5 +14,5 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)"
-Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
+Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.cdo.examples.master
diff --git a/plugins/org.eclipse.emf.cdo.examples.master/pom.xml b/plugins/org.eclipse.emf.cdo.examples.master/pom.xml
index f316268e2ed..391f5d2113f 100644
--- a/plugins/org.eclipse.emf.cdo.examples.master/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.master/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.examples.master</artifactId>
-  <version>4.2.7-SNAPSHOT</version>
+  <version>4.2.8-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
index b70cd6c3ef7..ee337b9908a 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples.server/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples.server; singleton:=true
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 4.1.1.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -13,9 +13,9 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.jvm;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[4.0.0,5.0.0)"
-Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.examples.internal.server;version="4.1.0";x-internal:=true,
- org.eclipse.emf.cdo.examples.server;version="4.1.0"
+Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.emf.cdo.examples.internal.server;version="4.1.1";x-internal:=true,
+ org.eclipse.emf.cdo.examples.server;version="4.1.1"
 Bundle-Activator: org.eclipse.emf.cdo.examples.internal.server.OM$Activator
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.cdo.examples.server
diff --git a/plugins/org.eclipse.emf.cdo.examples.server/pom.xml b/plugins/org.eclipse.emf.cdo.examples.server/pom.xml
index 5e85cfa0426..e213e99cf24 100644
--- a/plugins/org.eclipse.emf.cdo.examples.server/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.examples.server/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.examples.server</artifactId>
-  <version>4.1.0-SNAPSHOT</version>
+  <version>4.1.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
index 60ee5408501..e3eb3ace8fd 100644
--- a/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.examples/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.examples;singleton:=true
-Bundle-Version: 4.1.9.qualifier
+Bundle-Version: 4.1.10.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Activator: org.eclipse.emf.cdo.internal.examples.bundle.OM$Activator
@@ -22,10 +22,10 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resoluti
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.security;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.server.security;bundle-version="[4.0.0,5.0.0)"
-Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.examples;version="4.1.9";x-internal:=true,
- org.eclipse.emf.cdo.examples.embedded;version="4.1.9",
- org.eclipse.emf.cdo.examples.server;version="4.1.9";x-internal:=true,
- org.eclipse.emf.cdo.examples.server.offline;version="4.1.9";x-internal:=true,
- org.eclipse.emf.cdo.internal.examples.bundle;version="4.1.9";x-internal:=true
+Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.emf.cdo.examples;version="4.1.10";x-internal:=true,
+ org.eclipse.emf.cdo.examples.embedded;version="4.1.10",
+ org.eclipse.emf.cdo.examples.server;version="4.1.10";x-internal:=true,
+ org.eclipse.emf.cdo.examples.server.offline;version="4.1.10";x-internal:=true,
+ org.eclipse.emf.cdo.internal.examples.bundle;version="4.1.10";x-internal:=true
 Automatic-Module-Name: org.eclipse.emf.cdo.examples
diff --git a/plugins/org.eclipse.emf.cdo.examples/pom.xml b/plugins/org.eclipse.emf.cdo.examples/pom.xml
index 2537f901d04..8c52df86ad7 100644
--- a/plugins/org.eclipse.emf.cdo.examples/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.examples/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.examples</artifactId>
-  <version>4.1.9-SNAPSHOT</version>
+  <version>4.1.10-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
index 4c1fc1d550a..23cfb7a2d14 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.explorer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.cdo.explorer;singleton:=true
-Bundle-Version: 4.14.1.qualifier
+Bundle-Version: 4.14.2.qualifier
 Bundle-Activator: org.eclipse.emf.cdo.internal.explorer.bundle.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-ClassPath: .
@@ -21,20 +21,17 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.server.security;bundle-version="[4.0.0,5.0.0)";resolution:=optional,
  org.eclipse.emf.cdo.lm.server;bundle-version="[1.0.0,2.0.0)";resolution:=optional,
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)"
-Import-Package: org.h2;version="[1.0.0,2.0.0)";resolution:=optional,
- org.h2.command;version="[1.0.0,2.0.0)";resolution:=optional,
- org.h2.expression;version="[1.0.0,2.0.0)";resolution:=optional,
- org.h2.jdbc;version="[1.0.0,2.0.0)";resolution:=optional,
- org.h2.jdbcx;version="[1.0.0,2.0.0)";resolution:=optional,
- org.h2.util;version="[1.0.0,2.0.0)";resolution:=optional,
- org.h2.value;version="[1.0.0,2.0.0)";resolution:=optional
-Export-Package: org.eclipse.emf.cdo.explorer;version="4.14.1",
- org.eclipse.emf.cdo.explorer.checkouts;version="4.14.1",
- org.eclipse.emf.cdo.explorer.repositories;version="4.14.1",
- org.eclipse.emf.cdo.internal.explorer;version="4.14.1";x-friends:="org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.internal.explorer.bundle;version="4.14.1";x-internal:=true,
- org.eclipse.emf.cdo.internal.explorer.checkouts;version="4.14.1";x-friends:="org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.internal.explorer.repositories;version="4.14.1";x-friends:="org.eclipse.emf.cdo.explorer.ui",
- org.eclipse.emf.cdo.internal.explorer.resources;version="4.14.1";x-friends:="org.eclipse.emf.cdo.explorer.ui"
+Import-Package: org.h2.jdbc;version="[2.0.0,3.0.0)";resolution:=optional,
+ org.h2.jdbcx;version="[2.0.0,3.0.0)";resolution:=optional,
+ org.h2.util;version="[2.0.0,3.0.0)";resolution:=optional,
+ org.h2.value;version="[2.0.0,3.0.0)";resolution:=optional
+Export-Package: org.eclipse.emf.cdo.explorer;version="4.14.2",
+ org.eclipse.emf.cdo.explorer.checkouts;version="4.14.2",
+ org.eclipse.emf.cdo.explorer.repositories;version="4.14.2",
+ org.eclipse.emf.cdo.internal.explorer;version="4.14.2";x-friends:="org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.internal.explorer.bundle;version="4.14.2";x-internal:=true,
+ org.eclipse.emf.cdo.internal.explorer.checkouts;version="4.14.2";x-friends:="org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.internal.explorer.repositories;version="4.14.2";x-friends:="org.eclipse.emf.cdo.explorer.ui",
+ org.eclipse.emf.cdo.internal.explorer.resources;version="4.14.2";x-friends:="org.eclipse.emf.cdo.explorer.ui"
 Eclipse-BuddyPolicy: registered
 Automatic-Module-Name: org.eclipse.emf.cdo.explorer
diff --git a/plugins/org.eclipse.emf.cdo.explorer/pom.xml b/plugins/org.eclipse.emf.cdo.explorer/pom.xml
index ef6a33fe988..f9e1140182c 100644
--- a/plugins/org.eclipse.emf.cdo.explorer/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.explorer/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.explorer</artifactId>
-  <version>4.14.1-SNAPSHOT</version>
+  <version>4.14.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.lissome/META-INF/MANIFEST.MF
index c83669dcd02..1e1765c5f01 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.lissome;singleton:=true
-Bundle-Version: 4.3.6.qualifier
+Bundle-Version: 4.3.7.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,12 +12,11 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)"
-Import-Package: org.h2;version="[1.0.0,2.0.0)",
- org.h2.jdbcx;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.emf.cdo.server.internal.lissome;version="4.3.6";x-friends:="org.eclipse.emf.cdo.tests.lissome",
- org.eclipse.emf.cdo.server.internal.lissome.bundle;version="4.3.6";x-friends:="org.eclipse.emf.cdo.tests.lissome",
- org.eclipse.emf.cdo.server.internal.lissome.db;version="4.3.6";x-friends:="org.eclipse.emf.cdo.tests.lissome",
- org.eclipse.emf.cdo.server.internal.lissome.file;version="4.3.6";x-friends:="org.eclipse.emf.cdo.tests.lissome",
- org.eclipse.emf.cdo.server.internal.lissome.optimizer;version="4.3.6";x-friends:="org.eclipse.emf.cdo.tests.lissome",
- org.eclipse.emf.cdo.server.lissome;version="4.3.6"
+Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
+Export-Package: org.eclipse.emf.cdo.server.internal.lissome;version="4.3.7";x-friends:="org.eclipse.emf.cdo.tests.lissome",
+ org.eclipse.emf.cdo.server.internal.lissome.bundle;version="4.3.7";x-friends:="org.eclipse.emf.cdo.tests.lissome",
+ org.eclipse.emf.cdo.server.internal.lissome.db;version="4.3.7";x-friends:="org.eclipse.emf.cdo.tests.lissome",
+ org.eclipse.emf.cdo.server.internal.lissome.file;version="4.3.7";x-friends:="org.eclipse.emf.cdo.tests.lissome",
+ org.eclipse.emf.cdo.server.internal.lissome.optimizer;version="4.3.7";x-friends:="org.eclipse.emf.cdo.tests.lissome",
+ org.eclipse.emf.cdo.server.lissome;version="4.3.7"
 Automatic-Module-Name: org.eclipse.emf.cdo.server.lissome
diff --git a/plugins/org.eclipse.emf.cdo.server.lissome/pom.xml b/plugins/org.eclipse.emf.cdo.server.lissome/pom.xml
index 402812fc2b8..8c00ecf76e9 100644
--- a/plugins/org.eclipse.emf.cdo.server.lissome/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.server.lissome/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.server.lissome</artifactId>
-  <version>4.3.6-SNAPSHOT</version>
+  <version>4.3.7-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF
index 67fcd64f9b2..2acbfedf730 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.server.product/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.server.product;singleton:=true
-Bundle-Version: 4.2.8.qualifier
+Bundle-Version: 4.2.9.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.cdo.server.product/pom.xml b/plugins/org.eclipse.emf.cdo.server.product/pom.xml
index 81760ca4faf..181e722e9b1 100644
--- a/plugins/org.eclipse.emf.cdo.server.product/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.server.product/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.server.product</artifactId>
-  <version>4.2.8-SNAPSHOT</version>
+  <version>4.2.9-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF
index 49bf7f3a379..2c9829d752e 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.db;singleton:=true
-Bundle-Version: 4.2.1.qualifier
+Bundle-Version: 4.2.2.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -22,15 +22,15 @@ Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)";visibil
 Eclipse-BuddyPolicy: dependent
 Import-Package: com.mysql.jdbc.jdbc2.optional;version="[5.0.0,6.0.0)",
  org.apache.derby.jdbc;version="[10.0.0,11.0.0)",
- org.h2.jdbcx;version="[1.0.0,2.0.0)",
+ org.h2.jdbcx;version="[2.0.0,3.0.0)",
  org.hsqldb.jdbc;version="[2.0.0,3.0.0)",
  org.postgresql.ds;version="[9.0.0,10.0.0)",
  org.postgresql.ds.common;version="[9.0.0,10.0.0)"
-Export-Package: org.eclipse.emf.cdo.tests.db;version="4.2.1";x-friends:="org.eclipse.emf.cdo.tests.all",
- org.eclipse.emf.cdo.tests.db.bugzilla;version="4.2.1";x-friends:="org.eclipse.emf.cdo.tests.all",
- org.eclipse.emf.cdo.tests.db.bundle;version="4.2.1";x-internal:=true,
- org.eclipse.emf.cdo.tests.db.capabilities;version="4.2.1";x-friends:="org.eclipse.emf.cdo.tests.all",
- org.eclipse.emf.cdo.tests.db.offline;version="4.2.1";x-friends:="org.eclipse.emf.cdo.tests.all",
- org.eclipse.emf.cdo.tests.db.performance;version="4.2.1";x-friends:="org.eclipse.emf.cdo.tests.all",
- org.eclipse.emf.cdo.tests.db.verifier;version="4.2.1";x-friends:="org.eclipse.emf.cdo.tests.all"
+Export-Package: org.eclipse.emf.cdo.tests.db;version="4.2.2";x-friends:="org.eclipse.emf.cdo.tests.all",
+ org.eclipse.emf.cdo.tests.db.bugzilla;version="4.2.2";x-friends:="org.eclipse.emf.cdo.tests.all",
+ org.eclipse.emf.cdo.tests.db.bundle;version="4.2.2";x-internal:=true,
+ org.eclipse.emf.cdo.tests.db.capabilities;version="4.2.2";x-friends:="org.eclipse.emf.cdo.tests.all",
+ org.eclipse.emf.cdo.tests.db.offline;version="4.2.2";x-friends:="org.eclipse.emf.cdo.tests.all",
+ org.eclipse.emf.cdo.tests.db.performance;version="4.2.2";x-friends:="org.eclipse.emf.cdo.tests.all",
+ org.eclipse.emf.cdo.tests.db.verifier;version="4.2.2";x-friends:="org.eclipse.emf.cdo.tests.all"
 Automatic-Module-Name: org.eclipse.emf.cdo.tests.db
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/pom.xml b/plugins/org.eclipse.emf.cdo.tests.db/pom.xml
index ee01f954b8c..96ce8d54486 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.tests.db/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.tests.db</artifactId>
-  <version>4.2.1-SNAPSHOT</version>
+  <version>4.2.2-SNAPSHOT</version>
   <packaging>eclipse-test-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.tests.lissome/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.lissome/META-INF/MANIFEST.MF
index 5b91eba0699..f8244dcc159 100644
--- a/plugins/org.eclipse.emf.cdo.tests.lissome/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.lissome/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.emf.cdo.tests.lissome;singleton:=true
-Bundle-Version: 4.5.1.qualifier
+Bundle-Version: 4.5.2.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -12,7 +12,7 @@ Bundle-ClassPath: .
 Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.server.lissome;bundle-version="[4.2.0,5.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)"
-Export-Package: org.eclipse.emf.cdo.tests.lissome;version="4.5.1",
- org.eclipse.emf.cdo.tests.lissome.bundle;version="4.5.1";x-internal:=true
-Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
+Export-Package: org.eclipse.emf.cdo.tests.lissome;version="4.5.2",
+ org.eclipse.emf.cdo.tests.lissome.bundle;version="4.5.2";x-internal:=true
+Import-Package: org.h2.jdbcx;version="[2.0.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.cdo.tests.lissome
diff --git a/plugins/org.eclipse.emf.cdo.tests.lissome/pom.xml b/plugins/org.eclipse.emf.cdo.tests.lissome/pom.xml
index 99d78434944..f3f79e81503 100644
--- a/plugins/org.eclipse.emf.cdo.tests.lissome/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.tests.lissome/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.emf.cdo.tests.lissome</artifactId>
-  <version>4.5.1-SNAPSHOT</version>
+  <version>4.5.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.cdo.tests.lm/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.lm/META-INF/MANIFEST.MF
index 46b32c5ad4d..c971db3b2c2 100644
--- a/plugins/org.eclipse.emf.cdo.tests.lm/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.lm/META-INF/MANIFEST.MF
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.net4j.tests;bundle-version="[4.0.0,5.0.0)";visibilit
  org.eclipse.emf.cdo.server.db;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.emf.cdo.server.net4j;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
- org.h2;bundle-version="[1.0.0,2.0.0)"
+ com.h2database;bundle-version="[2.0.0,3.0.0)"
 Automatic-Module-Name: org.eclipse.emf.cdo.tests.lm
 Export-Package: org.eclipse.emf.cdo.tests.lm;version="1.1.3",
  org.eclipse.emf.cdo.tests.lm.bundle;version="1.1.3";x-internal:=true
diff --git a/plugins/org.eclipse.net4j.db.h2/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.h2/META-INF/MANIFEST.MF
index 76812441e0c..327195007e0 100644
--- a/plugins/org.eclipse.net4j.db.h2/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.h2/META-INF/MANIFEST.MF
@@ -2,23 +2,20 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db.h2;singleton:=true
-Bundle-Version: 4.5.4.qualifier
+Bundle-Version: 4.5.5.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.net4j.db.internal.h2.bundle.OM$Activator
-Import-Package: org.h2;version="[1.0.0,2.0.0)";resolution:=optional;x-installation:=greedy,
- org.h2.command;version="[1.0.0,2.0.0)";resolution:=optional;x-installation:=greedy,
- org.h2.expression;version="[1.0.0,2.0.0)";resolution:=optional;x-installation:=greedy,
- org.h2.jdbc;version="[1.0.0,2.0.0)";resolution:=optional;x-installation:=greedy,
- org.h2.jdbcx;version="[1.0.0,2.0.0)";resolution:=optional;x-installation:=greedy,
- org.h2.util;version="[1.0.0,2.0.0)";resolution:=optional;x-installation:=greedy,
- org.h2.value;version="[1.0.0,2.0.0)";resolution:=optional;x-installation:=greedy
+Import-Package: org.h2.jdbc;version="[2.0.0,3.0.0)";resolution:=optional;x-installation:=greedy,
+ org.h2.jdbcx;version="[2.0.0,3.0.0)";resolution:=optional;x-installation:=greedy,
+ org.h2.util;version="[2.0.0,3.0.0)";resolution:=optional;x-installation:=greedy,
+ org.h2.value;version="[2.0.0,3.0.0)";resolution:=optional;x-installation:=greedy
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Export-Package: org.eclipse.net4j.db.h2;version="4.5.4",
- org.eclipse.net4j.db.internal.h2.bundle;version="4.5.4";x-internal:=true
+Export-Package: org.eclipse.net4j.db.h2;version="4.5.5",
+ org.eclipse.net4j.db.internal.h2.bundle;version="4.5.5";x-internal:=true
 Eclipse-RegisterBuddy: org.eclipse.net4j.db
 Automatic-Module-Name: org.eclipse.net4j.db.h2
diff --git a/plugins/org.eclipse.net4j.db.h2/pom.xml b/plugins/org.eclipse.net4j.db.h2/pom.xml
index 58e621ffce5..48ccc1ed4e9 100644
--- a/plugins/org.eclipse.net4j.db.h2/pom.xml
+++ b/plugins/org.eclipse.net4j.db.h2/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.net4j.db.h2</artifactId>
-  <version>4.5.4-SNAPSHOT</version>
+  <version>4.5.5-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
index 17f37e22130..5e5d8709b39 100644
--- a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.db.tests
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 4.1.1.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -16,17 +16,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.db.hsqldb;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.net4j.db.mysql;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport,
  org.eclipse.net4j.db.postgresql;bundle-version="[4.0.0,5.0.0)";resolution:=optional;visibility:=reexport
-Import-Package: org.h2;version="[1.0.0,2.0.0)";resolution:=optional,
- org.h2.command;version="[1.0.0,2.0.0)";resolution:=optional,
- org.h2.expression;version="[1.0.0,2.0.0)";resolution:=optional,
- org.h2.jdbc;version="[1.0.0,2.0.0)";resolution:=optional,
- org.h2.jdbcx;version="[1.0.0,2.0.0)";resolution:=optional,
- org.h2.util;version="[1.0.0,2.0.0)";resolution:=optional,
- org.h2.value;version="[1.0.0,2.0.0)";resolution:=optional,
- com.mysql.jdbc;version="[5.1.0,6.0.0)";resolution:=optional,
+Import-Package: com.mysql.jdbc;version="[5.1.0,6.0.0)";resolution:=optional,
  com.mysql.jdbc.jdbc2.optional;version="[5.1.0,6.0.0)";resolution:=optional,
  org.apache.derby.jdbc;version="[10.0.0,11.0.0)";resolution:=optional,
+ org.h2.jdbc;version="[2.0.0,3.0.0)";resolution:=optional,
+ org.h2.jdbcx;version="[2.0.0,3.0.0)";resolution:=optional,
+ org.h2.util;version="[2.0.0,3.0.0)";resolution:=optional,
+ org.h2.value;version="[2.0.0,3.0.0)";resolution:=optional,
  org.hsqldb.jdbc;version="[2.0.0,3.0.0)";resolution:=optional
-Export-Package: org.eclipse.net4j.db.tests;version="4.1.0";x-internal:=true,
- org.eclipse.net4j.db.tests.bundle;version="4.1.0";x-internal:=true
+Export-Package: org.eclipse.net4j.db.tests;version="4.1.1";x-internal:=true,
+ org.eclipse.net4j.db.tests.bundle;version="4.1.1";x-internal:=true
 Automatic-Module-Name: org.eclipse.net4j.db.tests
diff --git a/plugins/org.eclipse.net4j.db.tests/pom.xml b/plugins/org.eclipse.net4j.db.tests/pom.xml
index dca7ef9b1d1..b6d125e22a0 100644
--- a/plugins/org.eclipse.net4j.db.tests/pom.xml
+++ b/plugins/org.eclipse.net4j.db.tests/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.eclipse.net4j.db.tests</artifactId>
-  <version>4.1.0-SNAPSHOT</version>
+  <version>4.1.1-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.gastro.server.web/META-INF/MANIFEST.MF b/plugins/org.gastro.server.web/META-INF/MANIFEST.MF
index a9ae028598d..5bd721b05dd 100644
--- a/plugins/org.gastro.server.web/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.server.web/META-INF/MANIFEST.MF
@@ -2,11 +2,11 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.server.web;singleton:=true
-Bundle-Version: 4.4.1.qualifier
+Bundle-Version: 4.4.2.qualifier
 Bundle-Activator: org.gastro.server.internal.web.OM$Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Require-Bundle: org.apache.commons.logging;bundle-version="[1.1.0,2.0.0)",
+Require-Bundle: org.apache.commons.commons-logging;bundle-version="[1.1.0,2.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.equinox.http.registry;bundle-version="[1.0.0,2.0.0)",
  org.eclipse.equinox.http.servlet;bundle-version="[1.0.0,2.0.0)",
@@ -22,6 +22,6 @@ Import-Package: javax.servlet;version="[2.3.0,5.0.0)",
  org.apache.commons.lang;version="[2.3.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
 Bundle-ClassPath: .
-Export-Package: org.gastro.server.internal.web;version="4.4.1";x-internal:=true,
- templates;version="4.4.1";x-internal:=true
+Export-Package: org.gastro.server.internal.web;version="4.4.2";x-internal:=true,
+ templates;version="4.4.2";x-internal:=true
 Automatic-Module-Name: org.gastro.server.web
diff --git a/plugins/org.gastro.server.web/pom.xml b/plugins/org.gastro.server.web/pom.xml
index d7a37a22cc8..15d7965f84d 100644
--- a/plugins/org.gastro.server.web/pom.xml
+++ b/plugins/org.gastro.server.web/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.gastro.server.web</artifactId>
-  <version>4.4.1-SNAPSHOT</version>
+  <version>4.4.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.gastro.server/META-INF/MANIFEST.MF b/plugins/org.gastro.server/META-INF/MANIFEST.MF
index b7caee4cda2..09ec9b08a99 100644
--- a/plugins/org.gastro.server/META-INF/MANIFEST.MF
+++ b/plugins/org.gastro.server/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.gastro.server;singleton:=true
-Bundle-Version: 4.1.1.qualifier
+Bundle-Version: 4.1.2.qualifier
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.cdo.server;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
@@ -11,14 +11,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)",
  org.eclipse.net4j.tcp;bundle-version="[2.0.0,5.0.0)"
 Bundle-Activator: org.gastro.internal.server.OM$Activator
-Import-Package: org.h2;version="[1.0.0,2.0.0)",
- org.h2.api;version="[1.0.0,2.0.0)",
- org.h2.jdbcx;version="[1.0.0,2.0.0)",
- org.h2.tools;version="[1.0.0,2.0.0)",
- org.h2.util;version="[1.0.0,2.0.0)"
+Import-Package: org.h2.api;version="[2.0.0,3.0.0)",
+ org.h2.jdbcx;version="[2.0.0,3.0.0)",
+ org.h2.tools;version="[2.0.0,3.0.0)",
+ org.h2.util;version="[2.0.0,3.0.0)"
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Export-Package: org.gastro.internal.server;version="4.1.1";x-internal:=true,
- org.gastro.server;version="4.1.1"
+Export-Package: org.gastro.internal.server;version="4.1.2";x-internal:=true,
+ org.gastro.server;version="4.1.2"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.gastro.server
diff --git a/plugins/org.gastro.server/pom.xml b/plugins/org.gastro.server/pom.xml
index 6bca046c147..7a66ba51540 100644
--- a/plugins/org.gastro.server/pom.xml
+++ b/plugins/org.gastro.server/pom.xml
@@ -25,7 +25,7 @@
 
   <groupId>org.eclipse.emf.cdo</groupId>
   <artifactId>org.gastro.server</artifactId>
-  <version>4.1.1-SNAPSHOT</version>
+  <version>4.1.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/features/pom.xml b/releng/org.eclipse.emf.cdo.releng.parent/features/pom.xml
index c3f494704d6..63b8839a2f9 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/features/pom.xml
+++ b/releng/org.eclipse.emf.cdo.releng.parent/features/pom.xml
@@ -88,10 +88,10 @@ Eike Stepper - initial API and implementation
                 <feature id="org.eclipse.net4j.doc"/>
                 <feature id="org.eclipse.net4j.examples.installer"/>
                 <feature id="org.eclipse.net4j.util.doc"/>
-                <plugin id="org.apache.commons.codec"/>
+                <plugin id="org.apache.commons.commons-codec"/>
                 <plugin id="org.apache.commons.httpclient"/>
                 <plugin id="org.apache.commons.lang"/>
-                <plugin id="org.apache.commons.logging"/>
+                <plugin id="org.apache.commons.commons-logging"/>
                 <plugin id="org.apache.derby"/>
                 <plugin id="org.eclipse.emf.cdo.doc"/>
                 <plugin id="org.eclipse.emf.cdo.examples.installer"/>
@@ -104,7 +104,7 @@ Eike Stepper - initial API and implementation
                 <plugin id="org.eclipse.net4j.examples.installer"/>
                 <plugin id="org.eclipse.net4j.util.doc"/>
                 <plugin id="org.eclipse.orbit.mongodb"/>
-                <plugin id="org.h2"/>
+                <plugin id="com.h2database"/>
               </excludes>
             </configuration>
           </execution>
diff --git a/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target b/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target
index 65d3370507a..aa01890b776 100644
--- a/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target
+++ b/releng/org.eclipse.emf.cdo.releng.parent/tp/org.eclipse.emf.cdo.releng.tp.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="Generated from CDO" sequenceNumber="105">
+<target name="Generated from CDO" sequenceNumber="106">
   <locations>
     <location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
       <unit id="a.jre.javase" version="0.0.0"/>
@@ -13,6 +13,7 @@
       <unit id="bndtools.api" version="0.0.0"/>
       <unit id="com.google.guava" version="0.0.0"/>
       <unit id="com.google.guava.failureaccess" version="0.0.0"/>
+      <unit id="com.h2database" version="0.0.0"/>
       <unit id="com.ibm.icu" version="0.0.0"/>
       <unit id="com.mysql.jdbc" version="0.0.0"/>
       <unit id="com.sun.el.javax.el" version="0.0.0"/>
@@ -26,8 +27,8 @@
       <unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
       <unit id="org.apache.batik.i18n" version="0.0.0"/>
       <unit id="org.apache.commons.commons-io" version="0.0.0"/>
+      <unit id="org.apache.commons.commons-logging" version="0.0.0"/>
       <unit id="org.apache.commons.lang" version="0.0.0"/>
-      <unit id="org.apache.commons.logging" version="0.0.0"/>
       <unit id="org.apache.derby" version="0.0.0"/>
       <unit id="org.apache.felix.scr" version="0.0.0"/>
       <unit id="org.apache.log4j" version="0.0.0"/>
@@ -79,7 +80,6 @@
       <unit id="org.eclipse.orbit.xml-apis-ext" version="0.0.0"/>
       <unit id="org.eclipse.pde.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.platform.feature.group" version="0.0.0"/>
-      <unit id="org.h2" version="0.0.0"/>
       <unit id="org.hsqldb" version="0.0.0"/>
       <unit id="org.mongodb.mongo-java-driver" version="0.0.0"/>
       <unit id="org.mortbay.jasper.apache-el" version="0.0.0"/>
@@ -99,7 +99,7 @@
       <unit id="org.slf4j.api" version="0.0.0"/>
       <repository location="https://download.eclipse.org/releases/2024-09"/>
       <repository location="https://download.eclipse.org/eclipse/updates/latest"/>
-      <repository location="https://download.eclipse.org/tools/orbit/downloads/latest-S"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly/latest"/>
       <repository location="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository"/>
       <repository location="https://download.eclipse.org/nebula/archive/releases/3.1.1"/>
       <repository location="https://download.eclipse.org/oomph/jetty/release/10.0.15"/>
diff --git a/releng/org.eclipse.emf.cdo.releng/CDO.setup b/releng/org.eclipse.emf.cdo.releng/CDO.setup
index baf558c7a9b..6bbc1de2db2 100644
--- a/releng/org.eclipse.emf.cdo.releng/CDO.setup
+++ b/releng/org.eclipse.emf.cdo.releng/CDO.setup
@@ -248,7 +248,7 @@
         </detail>
         <detail
             key="extraUnits">
-          <value>org.eclipse.orbit.mongodb, org.h2, org.slf4j.api, org.apache.commons.lang, org.apache.log4j, org.eclipse.jetty.websocket.server, org.eclipse.jetty.websocket.client</value>
+          <value>org.eclipse.orbit.mongodb, org.slf4j.api, org.apache.commons.lang, org.apache.log4j, org.eclipse.jetty.websocket.server, org.eclipse.jetty.websocket.client</value>
         </detail>
         <detail
             key="generateImplicitUnits">
@@ -304,7 +304,7 @@
         <repository
             url="https://download.eclipse.org/eclipse/updates/latest"/>
         <repository
-            url="https://download.eclipse.org/tools/orbit/downloads/latest-S"/>
+            url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly/latest"/>
         <repository
             url="https://download.eclipse.org/tools/orbit/downloads/drops/R20220302172233/repository">
           <annotation