[572246] CDO interferes with Oomph setup
https://bugs.eclipse.org/bugs/show_bug.cgi?id=572246
diff --git a/features/org.eclipse.emf.cdo.server-feature/feature.xml b/features/org.eclipse.emf.cdo.server-feature/feature.xml
index 93a6b84..aa08997 100644
--- a/features/org.eclipse.emf.cdo.server-feature/feature.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/feature.xml
@@ -12,7 +12,7 @@
<feature
id="org.eclipse.emf.cdo.server"
label="%featureName"
- version="4.13.0.qualifier"
+ version="4.13.1.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-feature/pom.xml b/features/org.eclipse.emf.cdo.server-feature/pom.xml
index 06e6d39..2994c1f 100644
--- a/features/org.eclipse.emf.cdo.server-feature/pom.xml
+++ b/features/org.eclipse.emf.cdo.server-feature/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo.features</groupId>
<artifactId>org.eclipse.emf.cdo.server</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.13.1-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters b/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters
index 058bb70..4ba3666 100644
--- a/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters
+++ b/plugins/org.eclipse.emf.cdo.common/.settings/.api_filters
@@ -21,6 +21,12 @@
<message_argument value="org.eclipse.emf.cdo.common_4.12.0"/>
</message_arguments>
</filter>
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.core.runtime.ILibrary"/>
+ <message_argument value="org.eclipse.emf.cdo.common_4.13.0"/>
+ </message_arguments>
+ </filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.core.runtime.IPlatformRunnable">
<filter id="305422471">
@@ -29,6 +35,12 @@
<message_argument value="org.eclipse.emf.cdo.common_4.12.0"/>
</message_arguments>
</filter>
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.core.runtime.IPlatformRunnable"/>
+ <message_argument value="org.eclipse.emf.cdo.common_4.13.0"/>
+ </message_arguments>
+ </filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.core.runtime.IPluginDescriptor">
<filter id="305422471">
@@ -45,6 +57,12 @@
<message_argument value="org.eclipse.emf.cdo.common_4.12.0"/>
</message_arguments>
</filter>
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.core.runtime.IPluginPrerequisite"/>
+ <message_argument value="org.eclipse.emf.cdo.common_4.13.0"/>
+ </message_arguments>
+ </filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.core.runtime.IPluginRegistry">
<filter id="305422471">
@@ -53,6 +71,12 @@
<message_argument value="org.eclipse.emf.cdo.common_4.12.0"/>
</message_arguments>
</filter>
+ <filter id="305422471">
+ <message_arguments>
+ <message_argument value="org.eclipse.core.runtime.IPluginRegistry"/>
+ <message_argument value="org.eclipse.emf.cdo.common_4.13.0"/>
+ </message_arguments>
+ </filter>
</resource>
<resource path="META-INF/MANIFEST.MF" type="org.eclipse.emf.cdo.spi.common.id.AbstractCDOIDByteArray">
<filter id="305324134">
diff --git a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
index 6c6d43b..f97d477 100644
--- a/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.common/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.emf.cdo.common;singleton:=true
-Bundle-Version: 4.13.0.qualifier
+Bundle-Version: 4.13.1.qualifier
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
@@ -15,21 +15,21 @@
org.eclipse.emf.ecore.change;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
-Export-Package: org.eclipse.emf.cdo.common;version="4.13.0",
- org.eclipse.emf.cdo.common.admin;version="4.13.0",
- org.eclipse.emf.cdo.common.branch;version="4.13.0",
- org.eclipse.emf.cdo.common.commit;version="4.13.0",
- org.eclipse.emf.cdo.common.commit.handler;version="4.13.0",
- org.eclipse.emf.cdo.common.id;version="4.13.0",
- org.eclipse.emf.cdo.common.lob;version="4.13.0",
- org.eclipse.emf.cdo.common.lock;version="4.13.0",
- org.eclipse.emf.cdo.common.model;version="4.13.0",
- org.eclipse.emf.cdo.common.protocol;version="4.13.0",
- org.eclipse.emf.cdo.common.revision;version="4.13.0",
- org.eclipse.emf.cdo.common.revision.delta;version="4.13.0",
- org.eclipse.emf.cdo.common.security;version="4.13.0",
- org.eclipse.emf.cdo.common.util;version="4.13.0",
- org.eclipse.emf.cdo.internal.common;version="4.13.0";
+Export-Package: org.eclipse.emf.cdo.common;version="4.13.1",
+ org.eclipse.emf.cdo.common.admin;version="4.13.1",
+ org.eclipse.emf.cdo.common.branch;version="4.13.1",
+ org.eclipse.emf.cdo.common.commit;version="4.13.1",
+ org.eclipse.emf.cdo.common.commit.handler;version="4.13.1",
+ org.eclipse.emf.cdo.common.id;version="4.13.1",
+ org.eclipse.emf.cdo.common.lob;version="4.13.1",
+ org.eclipse.emf.cdo.common.lock;version="4.13.1",
+ org.eclipse.emf.cdo.common.model;version="4.13.1",
+ org.eclipse.emf.cdo.common.protocol;version="4.13.1",
+ org.eclipse.emf.cdo.common.revision;version="4.13.1",
+ org.eclipse.emf.cdo.common.revision.delta;version="4.13.1",
+ org.eclipse.emf.cdo.common.security;version="4.13.1",
+ org.eclipse.emf.cdo.common.util;version="4.13.1",
+ org.eclipse.emf.cdo.internal.common;version="4.13.1";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -38,9 +38,9 @@
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.branch;version="4.13.0";x-friends:="org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.bundle;version="4.13.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.commit;version="4.13.0";
+ org.eclipse.emf.cdo.internal.common.branch;version="4.13.1";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.cdo.internal.common.bundle;version="4.13.1";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.commit;version="4.13.1";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -49,7 +49,7 @@
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.id;version="4.13.0";
+ org.eclipse.emf.cdo.internal.common.id;version="4.13.1";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -60,9 +60,9 @@
org.eclipse.emf.cdo.tests,
org.eclipse.emf.cdo.admin,
org.eclipse.emf.cdo.server.admin",
- org.eclipse.emf.cdo.internal.common.lock;version="4.13.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.messages;version="4.13.0";x-internal:=true,
- org.eclipse.emf.cdo.internal.common.model;version="4.13.0";
+ org.eclipse.emf.cdo.internal.common.lock;version="4.13.1";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.messages;version="4.13.1";x-internal:=true,
+ org.eclipse.emf.cdo.internal.common.model;version="4.13.1";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -71,7 +71,7 @@
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.revision;version="4.13.0";
+ org.eclipse.emf.cdo.internal.common.revision;version="4.13.1";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -80,7 +80,7 @@
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.revision.delta;version="4.13.0";
+ org.eclipse.emf.cdo.internal.common.revision.delta;version="4.13.1";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -89,7 +89,7 @@
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.internal.common.util;version="4.13.0";
+ org.eclipse.emf.cdo.internal.common.util;version="4.13.1";
x-friends:="org.eclipse.emf.cdo.common,
org.eclipse.emf.cdo.common.db,
org.eclipse.emf.cdo,
@@ -98,15 +98,15 @@
org.eclipse.emf.cdo.server.net4j,
org.eclipse.emf.cdo.ui,
org.eclipse.emf.cdo.tests",
- org.eclipse.emf.cdo.spi.common;version="4.13.0",
- org.eclipse.emf.cdo.spi.common.admin;version="4.13.0",
- org.eclipse.emf.cdo.spi.common.branch;version="4.13.0",
- org.eclipse.emf.cdo.spi.common.commit;version="4.13.0",
- org.eclipse.emf.cdo.spi.common.id;version="4.13.0",
- org.eclipse.emf.cdo.spi.common.lock;version="4.13.0",
- org.eclipse.emf.cdo.spi.common.model;version="4.13.0",
- org.eclipse.emf.cdo.spi.common.protocol;version="4.13.0",
- org.eclipse.emf.cdo.spi.common.revision;version="4.13.0",
- org.eclipse.emf.cdo.spi.common.util;version="4.13.0"
+ org.eclipse.emf.cdo.spi.common;version="4.13.1",
+ org.eclipse.emf.cdo.spi.common.admin;version="4.13.1",
+ org.eclipse.emf.cdo.spi.common.branch;version="4.13.1",
+ org.eclipse.emf.cdo.spi.common.commit;version="4.13.1",
+ org.eclipse.emf.cdo.spi.common.id;version="4.13.1",
+ org.eclipse.emf.cdo.spi.common.lock;version="4.13.1",
+ org.eclipse.emf.cdo.spi.common.model;version="4.13.1",
+ org.eclipse.emf.cdo.spi.common.protocol;version="4.13.1",
+ org.eclipse.emf.cdo.spi.common.revision;version="4.13.1",
+ org.eclipse.emf.cdo.spi.common.util;version="4.13.1"
Automatic-Module-Name: org.eclipse.emf.cdo.common
Eclipse-RegisterBuddy: org.eclipse.net4j.util
diff --git a/plugins/org.eclipse.emf.cdo.common/pom.xml b/plugins/org.eclipse.emf.cdo.common/pom.xml
index fc81725..f181ce5 100644
--- a/plugins/org.eclipse.emf.cdo.common/pom.xml
+++ b/plugins/org.eclipse.emf.cdo.common/pom.xml
@@ -25,7 +25,7 @@
<groupId>org.eclipse.emf.cdo</groupId>
<artifactId>org.eclipse.emf.cdo.common</artifactId>
- <version>4.13.0-SNAPSHOT</version>
+ <version>4.13.1-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
