[releng] Avoid deprecated org.eclipse.xtext.util.MergeableManifest
Use org.eclipse.xtext.util.MergeableManifest2 instead.
diff --git a/features/org.eclipse.emf.ecore.xcore.ui-feature/feature.xml b/features/org.eclipse.emf.ecore.xcore.ui-feature/feature.xml
index 944e379..83d48ae 100644
--- a/features/org.eclipse.emf.ecore.xcore.ui-feature/feature.xml
+++ b/features/org.eclipse.emf.ecore.xcore.ui-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.ecore.xcore.ui"
label="%featureName"
- version="1.8.0.qualifier"
+ version="1.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.10.0">
diff --git a/features/org.eclipse.emf.ecore.xcore.ui-feature/pom.xml b/features/org.eclipse.emf.ecore.xcore.ui-feature/pom.xml
index 4a6ce14..145797d 100644
--- a/features/org.eclipse.emf.ecore.xcore.ui-feature/pom.xml
+++ b/features/org.eclipse.emf.ecore.xcore.ui-feature/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.eclipse.emf.features</groupId>
<artifactId>org.eclipse.emf.ecore.xcore.ui</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF
index 65eb64f..b73f507 100644
--- a/plugins/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.ecore.xcore.ui/META-INF/MANIFEST.MF
@@ -4,7 +4,7 @@
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.emf.ecore.xcore.ui;singleton:=true
Bundle-Localization: plugin
-Bundle-Version: 1.8.0.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-Activator: org.eclipse.emf.ecore.xcore.ui.internal.XcoreActivator
Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
@@ -14,7 +14,7 @@
org.antlr.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.compare;bundle-version="[3.5.0,4.0.0)",
org.eclipse.xtext.builder;bundle-version="[2.13.0,3.0.0)",
- org.eclipse.emf.ecore.xcore;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.ecore.xcore;bundle-version="[1.9.0,2.0.0)",
org.eclipse.xtext.xbase;bundle-version="[2.13.0,3.0.0)",
org.eclipse.xtext.xbase.ui;bundle-version="[2.13.0,3.0.0)",
org.eclipse.xtext.xbase.lib;bundle-version="[2.13.0,3.0.0)",
diff --git a/plugins/org.eclipse.emf.ecore.xcore.ui/pom.xml b/plugins/org.eclipse.emf.ecore.xcore.ui/pom.xml
index 0c0ee51..28e5152 100644
--- a/plugins/org.eclipse.emf.ecore.xcore.ui/pom.xml
+++ b/plugins/org.eclipse.emf.ecore.xcore.ui/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.ecore.xcore.ui</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/quickfix/XcoreClasspathUpdater.java b/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/quickfix/XcoreClasspathUpdater.java
index 9af6abe..25803f4 100644
--- a/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/quickfix/XcoreClasspathUpdater.java
+++ b/plugins/org.eclipse.emf.ecore.xcore.ui/src/org/eclipse/emf/ecore/xcore/ui/quickfix/XcoreClasspathUpdater.java
@@ -35,7 +35,7 @@
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.xtext.util.MergeableManifest;
+import org.eclipse.xtext.util.MergeableManifest2;
import org.osgi.framework.Bundle;
@@ -125,7 +125,7 @@
try
{
IFile manifestFile = (IFile)manifestResource;
- MergeableManifest manifest = new MergeableManifest(manifestFile.getContents());
+ MergeableManifest2 manifest = new MergeableManifest2(manifestFile.getContents());
manifest.addRequiredBundles(Collections.singleton(bundleID));
if (manifest.isModified())
{
diff --git a/tests/org.eclipse.emf.test.ecore.xcore-feature/feature.xml b/tests/org.eclipse.emf.test.ecore.xcore-feature/feature.xml
index 0672fb6..3c4ea50 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore-feature/feature.xml
+++ b/tests/org.eclipse.emf.test.ecore.xcore-feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.test.ecore.xcore"
label="%featureName"
- version="1.8.0.qualifier"
+ version="1.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.emf.license"
license-feature-version="2.10.0">
diff --git a/tests/org.eclipse.emf.test.ecore.xcore-feature/pom.xml b/tests/org.eclipse.emf.test.ecore.xcore-feature/pom.xml
index a19dfec..af9b66e 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore-feature/pom.xml
+++ b/tests/org.eclipse.emf.test.ecore.xcore-feature/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.eclipse.emf.features</groupId>
<artifactId>org.eclipse.emf.test.ecore.xcore</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
</project>
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.test.ecore.xcore/META-INF/MANIFEST.MF
index b56388d..fe06d1e 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.test.ecore.xcore/META-INF/MANIFEST.MF
@@ -3,12 +3,12 @@
Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-SymbolicName: org.eclipse.emf.test.ecore.xcore
-Bundle-Version: 1.8.0.qualifier
+Bundle-Version: 1.9.0.qualifier
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)";resolution:=optional,
org.eclipse.emf.codegen.ecore;bundle-version="[2.16.0,3.0.0)",
- org.eclipse.emf.ecore.xcore;bundle-version="[1.8.0,2.0.0)",
+ org.eclipse.emf.ecore.xcore;bundle-version="[1.9.0,2.0.0)",
org.eclipse.xtext.testing;bundle-version="[2.13.0,3.0.0)",
org.eclipse.xtext.common.types;bundle-version="[2.13.0,3.0.0)",
org.eclipse.xtext.xbase;bundle-version="[2.13.0,3.0.0)",
diff --git a/tests/org.eclipse.emf.test.ecore.xcore/pom.xml b/tests/org.eclipse.emf.test.ecore.xcore/pom.xml
index 9db2ae9..0b14b23 100644
--- a/tests/org.eclipse.emf.test.ecore.xcore/pom.xml
+++ b/tests/org.eclipse.emf.test.ecore.xcore/pom.xml
@@ -12,7 +12,7 @@
<groupId>org.eclipse.emf</groupId>
<artifactId>org.eclipse.emf.test.ecore.xcore</artifactId>
- <version>1.8.0-SNAPSHOT</version>
+ <version>1.9.0-SNAPSHOT</version>
<packaging>eclipse-test-plugin</packaging>
</project>
