From 384fd7947b7d62d8b654d3d2e1804d2f7fbd3eba Mon Sep 17 00:00:00 2001 From: Ed Merks Date: Sun, 7 Jul 2024 18:26:07 +0200 Subject: [PATCH] Use com.h2database 2.2.224 instead of org.h2 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.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 +- .../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 +- .../org.gastro.server/META-INF/MANIFEST.MF | 14 +++++----- .../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 | 28 +++++++++---------- plugins/org.eclipse.emf.cdo.explorer/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 16 +++++------ .../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 | 16 +++++------ plugins/org.eclipse.net4j.db.h2/pom.xml | 2 +- .../META-INF/MANIFEST.MF | 16 +++++------ plugins/org.eclipse.net4j.db.tests/pom.xml | 2 +- .../org.gastro.server/META-INF/MANIFEST.MF | 14 +++++----- plugins/org.gastro.server/pom.xml | 2 +- .../tp/org.eclipse.emf.cdo.releng.tp.target | 8 ++++-- releng/org.eclipse.emf.cdo.releng/CDO.setup | 2 +- 54 files changed, 136 insertions(+), 140 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 @@ 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 @@ org.eclipse.emf.cdo.features org.eclipse.emf.cdo.all - 4.26.0-SNAPSHOT + 5.0.0-SNAPSHOT eclipse-feature 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 @@ org.eclipse.emf.cdo.features org.eclipse.emf.cdo.examples - 4.6.3-SNAPSHOT + 4.6.4-SNAPSHOT eclipse-feature 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 @@ org.eclipse.emf.cdo.features org.eclipse.emf.cdo.examples.installer - 4.4.3-SNAPSHOT + 4.4.4-SNAPSHOT eclipse-feature 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 @@ org.eclipse.emf.cdo.features org.eclipse.emf.cdo.server.lissome - 4.3.9-SNAPSHOT + 4.3.10-SNAPSHOT eclipse-feature 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 @@ 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 @@ org.eclipse.emf.cdo.features org.eclipse.net4j.db - 4.24.0-SNAPSHOT + 5.0.0-SNAPSHOT eclipse-feature 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 @@ @@ -42,7 +42,7 @@ unpack="false"/> org.eclipse.emf.cdo.features org.eclipse.net4j.db.h2 - 4.5.5-SNAPSHOT + 5.0.0-SNAPSHOT eclipse-feature 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 @@ org.eclipse.emf.cdo.features org.eclipse.net4j.sdk - 4.26.0-SNAPSHOT + 5.0.0-SNAPSHOT eclipse-feature 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 @@ 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 @@ org.eclipse.emf.cdo.features org.eclipse.net4j.tests - 4.3.12-SNAPSHOT + 4.3.13-SNAPSHOT eclipse-feature 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.examples.client.offline - 4.4.1-SNAPSHOT + 4.4.2-SNAPSHOT eclipse-plugin 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.examples.clone - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT eclipse-plugin 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.examples.client.offline - 4.4.1-SNAPSHOT + 4.4.2-SNAPSHOT eclipse-plugin 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.examples.clone - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT eclipse-plugin 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.examples.master - 4.2.7-SNAPSHOT + 4.2.8-SNAPSHOT eclipse-plugin 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..2b82ccc907c 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, @@ -12,13 +12,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.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)" + 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 @@ org.eclipse.emf.cdo org.gastro.server - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT eclipse-plugin 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.examples.installer - 4.3.3-SNAPSHOT + 4.3.4-SNAPSHOT eclipse-plugin 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.examples.master - 4.2.7-SNAPSHOT + 4.2.8-SNAPSHOT eclipse-plugin 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.examples.server - 4.1.0-SNAPSHOT + 4.1.1-SNAPSHOT eclipse-plugin 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.examples - 4.1.9-SNAPSHOT + 4.1.10-SNAPSHOT eclipse-plugin 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..430f1bac6b9 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: . @@ -22,19 +22,17 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", 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" + 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.explorer - 4.14.1-SNAPSHOT + 4.14.2-SNAPSHOT eclipse-plugin 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..31894df65a3 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 @@ -13,11 +13,11 @@ 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" + 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.server.lissome - 4.3.6-SNAPSHOT + 4.3.7-SNAPSHOT eclipse-plugin 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.server.product - 4.2.8-SNAPSHOT + 4.2.9-SNAPSHOT eclipse-plugin 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.tests.db - 4.2.1-SNAPSHOT + 4.2.2-SNAPSHOT eclipse-test-plugin 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 @@ org.eclipse.emf.cdo org.eclipse.emf.cdo.tests.lissome - 4.5.1-SNAPSHOT + 4.5.2-SNAPSHOT eclipse-plugin 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..57e81eae76c 100644 --- a/plugins/org.eclipse.net4j.db.h2/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.net4j.db.h2/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ 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: . @@ -10,15 +10,13 @@ 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 + 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 @@ org.eclipse.emf.cdo org.eclipse.net4j.db.h2 - 4.5.4-SNAPSHOT + 4.5.5-SNAPSHOT eclipse-plugin 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..0df66c6323c 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 @@ -17,16 +17,14 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", 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, + 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, 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.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 @@ org.eclipse.emf.cdo org.eclipse.net4j.db.tests - 4.1.0-SNAPSHOT + 4.1.1-SNAPSHOT eclipse-plugin diff --git a/plugins/org.gastro.server/META-INF/MANIFEST.MF b/plugins/org.gastro.server/META-INF/MANIFEST.MF index b7caee4cda2..2b82ccc907c 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, @@ -12,13 +12,13 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.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)" + 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 @@ org.eclipse.emf.cdo org.gastro.server - 4.1.1-SNAPSHOT + 4.1.2-SNAPSHOT eclipse-plugin 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..82c360d2fd3 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 @@ - + @@ -13,15 +13,18 @@ + + + @@ -81,7 +84,6 @@ - @@ -99,7 +101,7 @@ - + diff --git a/releng/org.eclipse.emf.cdo.releng/CDO.setup b/releng/org.eclipse.emf.cdo.releng/CDO.setup index baf558c7a9b..98cf3213487 100644 --- a/releng/org.eclipse.emf.cdo.releng/CDO.setup +++ b/releng/org.eclipse.emf.cdo.releng/CDO.setup @@ -304,7 +304,7 @@ + url="https://download.eclipse.org/tools/orbit/simrel/maven-osgi/nightly/latest"/>