Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/org.eclipse.emf.diffmerge.doc/META-INF/MANIFEST.MF2
-rw-r--r--doc/org.eclipse.emf.diffmerge.doc/pom.xml2
-rw-r--r--doc/pom.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.svn.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.tests.feature/feature.xml2
-rw-r--r--features/pom.xml2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.core/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.generic/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.gmf/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.pojo/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.sirius/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.structures/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.gmf/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui.sirius/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF2
-rw-r--r--plugins/pom.xml2
-rw-r--r--pom.xml4
-rw-r--r--releng/org.eclipse.emf.diffmerge.configuration/pom.xml4
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF2
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml2
-rw-r--r--releng/org.eclipse.emf.diffmerge.dependencies/META-INF/MANIFEST.MF2
-rw-r--r--releng/org.eclipse.emf.diffmerge.dependencies/pom.xml2
-rw-r--r--releng/org.eclipse.emf.diffmerge.target/pom.xml2
-rw-r--r--releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml2
-rw-r--r--releng/org.eclipse.emf.diffmerge.update/category.xml10
-rw-r--r--releng/org.eclipse.emf.diffmerge.update/pom.xml2
-rw-r--r--releng/pom.xml2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.design/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model.edit/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model.editor/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.emf.diffmerge.tests.ui/pom.xml2
-rw-r--r--tests/pom.xml2
41 files changed, 47 insertions, 47 deletions
diff --git a/doc/org.eclipse.emf.diffmerge.doc/META-INF/MANIFEST.MF b/doc/org.eclipse.emf.diffmerge.doc/META-INF/MANIFEST.MF
index 7720fcdc..2f365854 100644
--- a/doc/org.eclipse.emf.diffmerge.doc/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.emf.diffmerge.doc/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.doc;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime
diff --git a/doc/org.eclipse.emf.diffmerge.doc/pom.xml b/doc/org.eclipse.emf.diffmerge.doc/pom.xml
index 37e2d798..7be72c65 100644
--- a/doc/org.eclipse.emf.diffmerge.doc/pom.xml
+++ b/doc/org.eclipse.emf.diffmerge.doc/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.docs</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/doc/pom.xml b/doc/pom.xml
index ab04cfea..38f5f683 100644
--- a/doc/pom.xml
+++ b/doc/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.root</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
index 8402d2e2..e957059e 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.egit.feature"
label="%featureName"
- version="0.13.0.qualifier"
+ version="0.14.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.2.v20181016-2210">
diff --git a/features/org.eclipse.emf.diffmerge.feature/feature.xml b/features/org.eclipse.emf.diffmerge.feature/feature.xml
index bee77e4e..2cfb05d5 100644
--- a/features/org.eclipse.emf.diffmerge.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.feature"
label="%featureName"
- version="0.13.0.qualifier"
+ version="0.14.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.2.v20181016-2210">
diff --git a/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml b/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
index ba82b198..51d3916d 100644
--- a/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.gmf.feature"
label="%featureName"
- version="0.13.0.qualifier"
+ version="0.14.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.2.v20181016-2210">
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
index 5abe7892..3084cb20 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.sdk.feature"
label="%featureName"
- version="0.13.0.qualifier"
+ version="0.14.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.2.v20181016-2210">
diff --git a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
index 4f81c8ca..cddd1578 100644
--- a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.sirius.feature"
label="%featureName"
- version="0.13.0.qualifier"
+ version="0.14.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.2.v20181016-2210">
diff --git a/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml b/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
index 8c4617b4..c222f862 100644
--- a/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.svn.feature"
label="%featureName"
- version="0.13.0.qualifier"
+ version="0.14.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="2.0.2.v20181016-2210">
diff --git a/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml b/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
index 4cfe2962..461548c4 100644
--- a/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
@@ -13,7 +13,7 @@
<feature
id="org.eclipse.emf.diffmerge.tests.feature"
label="%featureName"
- version="0.13.0.qualifier"
+ version="0.14.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/pom.xml b/features/pom.xml
index 2e05c650..7050f4a8 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.root</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.core/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.connector.core/META-INF/MANIFEST.MF
index 9b2f5434..6daf5b9e 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.core/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.connector.core/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.connector.core;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF
index 5ab86e86..9a64e7e8 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.connector.git/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.connector.git;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.core.resources,
diff --git a/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF
index 8c0e5166..f8dc541e 100644
--- a/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.connector.svn/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.connector.svn;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
diff --git a/plugins/org.eclipse.emf.diffmerge.generic/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.generic/META-INF/MANIFEST.MF
index 519bdebd..e7c3bf0c 100644
--- a/plugins/org.eclipse.emf.diffmerge.generic/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.generic/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.generic;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.diffmerge.gmf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.gmf/META-INF/MANIFEST.MF
index f029307d..3e239a1f 100644
--- a/plugins/org.eclipse.emf.diffmerge.gmf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.gmf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.gmf;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.gmf.GMFDiffMergePlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.diffmerge.pojo/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.pojo/META-INF/MANIFEST.MF
index 7486e282..73360d64 100644
--- a/plugins/org.eclipse.emf.diffmerge.pojo/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.pojo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.pojo;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.diffmerge.sirius/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.sirius/META-INF/MANIFEST.MF
index 20e2740b..70230de4 100644
--- a/plugins/org.eclipse.emf.diffmerge.sirius/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.sirius/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.sirius;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.sirius.SiriusDiffMergePlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.emf.diffmerge.gmf;visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.diffmerge.structures/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.structures/META-INF/MANIFEST.MF
index 420ea076..bc973c27 100644
--- a/plugins/org.eclipse.emf.diffmerge.structures/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.structures/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.structures;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.gmf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.ui.gmf/META-INF/MANIFEST.MF
index d311c713..37d30ab7 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.gmf/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.ui.gmf/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.ui.gmf;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.ui.gmf.GMFDiffMergeUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.diffmerge.ui.sirius/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.ui.sirius/META-INF/MANIFEST.MF
index 5f8e7294..04bcb011 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui.sirius/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.ui.sirius/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.ui.sirius;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.ui.sirius.SiriusDiffMergeUIPlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.emf.diffmerge.ui.gmf;visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.diffmerge.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.ui/META-INF/MANIFEST.MF
index ecacf870..7280ba11 100644
--- a/plugins/org.eclipse.emf.diffmerge.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.ui;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.diffmerge.ui.EMFDiffMergeUIPlugin
Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF
index 4d7a8eec..87f0ecd6 100644
--- a/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.emf.diffmerge.EMFDiffMergePlugin
diff --git a/plugins/pom.xml b/plugins/pom.xml
index fd49bb9d..0f5f8e4d 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.root</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/pom.xml b/pom.xml
index ef8bca0f..e533ed66 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,12 +1,12 @@
<project>
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.emf.diffmerge.root</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.configuration</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<relativePath>./releng/org.eclipse.emf.diffmerge.configuration</relativePath>
</parent>
<modules>
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index 4c2e5762..a3683d9c 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.configuration</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -41,7 +41,7 @@
<artifact>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.target</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
</artifact>
</target>
<includePackedArtifacts>true</includePackedArtifacts>
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF b/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
index 8b5fde2d..58d73569 100644
--- a/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Javadoc for Diff/Merge Core (Incubation)
Bundle-SymbolicName: org.eclipse.emf.diffmerge.core.javadoc
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: org.eclipse.emf.diffmerge.core.javadoc
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml b/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml
index d8dc6775..4a8e8d39 100644
--- a/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/releng/org.eclipse.emf.diffmerge.dependencies/META-INF/MANIFEST.MF b/releng/org.eclipse.emf.diffmerge.dependencies/META-INF/MANIFEST.MF
index 67f61d86..f7004f56 100644
--- a/releng/org.eclipse.emf.diffmerge.dependencies/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.emf.diffmerge.dependencies/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.dependencies
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/releng/org.eclipse.emf.diffmerge.dependencies/pom.xml b/releng/org.eclipse.emf.diffmerge.dependencies/pom.xml
index b10d45fc..c91ae2c8 100644
--- a/releng/org.eclipse.emf.diffmerge.dependencies/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.dependencies/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/releng/org.eclipse.emf.diffmerge.target/pom.xml b/releng/org.eclipse.emf.diffmerge.target/pom.xml
index 1cbed23b..7659edf0 100644
--- a/releng/org.eclipse.emf.diffmerge.target/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.target/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
</project> \ No newline at end of file
diff --git a/releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml b/releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml
index 1c060de0..37d819f5 100644
--- a/releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.tests.ui.product/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/releng/org.eclipse.emf.diffmerge.update/category.xml b/releng/org.eclipse.emf.diffmerge.update/category.xml
index fa27f5d4..b96dfc4b 100644
--- a/releng/org.eclipse.emf.diffmerge.update/category.xml
+++ b/releng/org.eclipse.emf.diffmerge.update/category.xml
@@ -1,18 +1,18 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.emf.diffmerge.feature_0.13.0.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.13.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.feature_0.14.0.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.14.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.13.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.13.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.14.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.14.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.gmf.feature_0.13.0.qualifier.jar" id="org.eclipse.emf.diffmerge.gmf.feature" version="0.13.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.gmf.feature_0.14.0.qualifier.jar" id="org.eclipse.emf.diffmerge.gmf.feature" version="0.14.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sirius.feature_0.13.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sirius.feature" version="0.13.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sirius.feature_0.14.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sirius.feature" version="0.14.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.13.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.13.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.14.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.14.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
<category-def name="org.eclipse.emf.diffmerge.category" label="EMF Diff/Merge (Incubation)"/>
diff --git a/releng/org.eclipse.emf.diffmerge.update/pom.xml b/releng/org.eclipse.emf.diffmerge.update/pom.xml
index b058496d..a5d408a6 100644
--- a/releng/org.eclipse.emf.diffmerge.update/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.update/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
</project> \ No newline at end of file
diff --git a/releng/pom.xml b/releng/pom.xml
index 99bafe5c..7c4fa62f 100644
--- a/releng/pom.xml
+++ b/releng/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.root</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/tests/org.eclipse.emf.diffmerge.structures.design/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.structures.design/META-INF/MANIFEST.MF
index 63f17a89..4bd560f7 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.design/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.structures.design/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.structures.design;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Require-Bundle: org.eclipse.core.runtime,
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model.edit/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.structures.model.edit/META-INF/MANIFEST.MF
index ff9ad7df..3d59fdb9 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model.edit/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.structures.model.edit/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.structures.model.edit;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.diffmerge.structures.model.egraphs.provider.EGraphsEditPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model.editor/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.structures.model.editor/META-INF/MANIFEST.MF
index 7c6b0342..2687e34c 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model.editor/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.structures.model.editor/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.structures.model.editor;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-ClassPath: .
Bundle-Activator: org.eclipse.emf.diffmerge.structures.model.egraphs.presentation.EGraphsEditorPlugin$Implementation
Bundle-Vendor: %providerName
diff --git a/tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF b/tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF
index 6c482fa1..c0b9bcad 100644
--- a/tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF
+++ b/tests/org.eclipse.emf.diffmerge.structures.model/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.emf.diffmerge.structures.model;singleton:=true
-Bundle-Version: 0.13.0.qualifier
+Bundle-Version: 0.14.0.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/pom.xml b/tests/org.eclipse.emf.diffmerge.tests.ui/pom.xml
index 5c250c1b..0fa0bd8b 100644
--- a/tests/org.eclipse.emf.diffmerge.tests.ui/pom.xml
+++ b/tests/org.eclipse.emf.diffmerge.tests.ui/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.tests</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/tests/pom.xml b/tests/pom.xml
index 4d104eb5..5f8f87cd 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.root</artifactId>
- <version>0.13.0-SNAPSHOT</version>
+ <version>0.14.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>

Back to the top