Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2019-03-26 06:50:21 -0400
committerOlivier Constant2019-03-26 06:50:21 -0400
commit56107efd62a99c7e7ac11d713e8b26f5612f29c4 (patch)
treea26a32aed6bf6f4fbb01d992f734434a688705d9
parentfde3db06c16dd8d96f6a1d89fe521c398df3f7ad (diff)
downloadorg.eclipse.emf.diffmerge.core-56107efd62a99c7e7ac11d713e8b26f5612f29c4.tar.gz
org.eclipse.emf.diffmerge.core-56107efd62a99c7e7ac11d713e8b26f5612f29c4.tar.xz
org.eclipse.emf.diffmerge.core-56107efd62a99c7e7ac11d713e8b26f5612f29c4.zip
[releng] Upgrade version to 0.11.1v0.11.1
Change-Id: If8303f285b2694566152dd9ddf562a857b9d5993 Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
-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.gmf/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.target/pom.xml2
-rw-r--r--releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product4
-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
38 files changed, 45 insertions, 45 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 ba0617b6..6524006c 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.11.0.qualifier
+Bundle-Version: 0.11.1.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 6b78b491..f7a3cd13 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.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
</parent>
<properties>
diff --git a/doc/pom.xml b/doc/pom.xml
index 851f9301..5346c133 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.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
</parent>
<modules>
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
index 87a97b7b..b01bff55 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.11.0.qualifier"
+ version="0.11.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.diffmerge.feature/feature.xml b/features/org.eclipse.emf.diffmerge.feature/feature.xml
index a745bb17..94472adb 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.11.0.qualifier"
+ version="0.11.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml b/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
index 2d36e9ef..728ab2c5 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.11.0.qualifier"
+ version="0.11.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
index 82f4b363..0eb2386c 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.11.0.qualifier"
+ version="0.11.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
index c8cef9ac..a05b71ae 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.11.0.qualifier"
+ version="0.11.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml b/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
index 28ec2708..862d0d6f 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.11.0.qualifier"
+ version="0.11.1.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
diff --git a/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml b/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
index ae924ce7..f6d049bb 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.11.0.qualifier"
+ version="0.11.1.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 0786a3d6..f0d62655 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.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
</parent>
<build>
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 90363913..9058b6ce 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.11.0.qualifier
+Bundle-Version: 0.11.1.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 299fdbb3..7782d082 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.11.0.qualifier
+Bundle-Version: 0.11.1.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 e03e5f61..79663d97 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.11.0.qualifier
+Bundle-Version: 0.11.1.qualifier
Bundle-Localization: plugin
Bundle-Vendor: %providerName
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
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 fc57da51..9aac2664 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.11.0.qualifier
+Bundle-Version: 0.11.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.gmf.GMFDiffMergePlugin
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 ff2e1f88..d002c2ee 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.11.0.qualifier
+Bundle-Version: 0.11.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.sirius.SiriusDiffMergePlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.core.runtime,
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 231d1bdb..aab55681 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.11.0.qualifier
+Bundle-Version: 0.11.1.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 409b7063..c68212d5 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.11.0.qualifier
+Bundle-Version: 0.11.1.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 cff037a4..6e5aeb1a 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.11.0.qualifier
+Bundle-Version: 0.11.1.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.ui.sirius.SiriusDiffMergeUIPlugin
Bundle-Vendor: %providerName
Require-Bundle: org.eclipse.emf.diffmerge.sirius;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 ab42c605..0d85c806 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.11.0.qualifier
+Bundle-Version: 0.11.1.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 409722d7..a6052a98 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.11.0.qualifier
+Bundle-Version: 0.11.1.qualifier
Bundle-ClassPath: .
Bundle-Vendor: %providerName
Bundle-Activator: org.eclipse.emf.diffmerge.EMFDiffMergePlugin
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 9bc4728f..6c8d2ab3 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.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
</parent>
<build>
diff --git a/pom.xml b/pom.xml
index 0a6c422d..32fed012 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.configuration</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
<relativePath>./releng/org.eclipse.emf.diffmerge.configuration</relativePath>
</parent>
<modules>
@@ -26,5 +26,5 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-<version>0.11.0-SNAPSHOT</version>
+<version>0.11.1-SNAPSHOT</version>
</project>
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index c69bf950..8ec64040 100644
--- a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
@@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.configuration</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
@@ -31,7 +31,7 @@
<artifact>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.target</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
</artifact>
</target>
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 a1b11067..0490e120 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.11.0.qualifier
+Bundle-Version: 0.11.1.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
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 f448200b..283b5004 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.11.0-SNAPSHOT</version>
+ <version>0.11.1-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 bbe0cf5f..d7962756 100644
--- a/releng/org.eclipse.emf.diffmerge.target/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.target/pom.xml
@@ -6,6 +6,6 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product b/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
index a983a0c5..7f33bd1b 100644
--- a/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
+++ b/releng/org.eclipse.emf.diffmerge.tests.ui.product/diffmerge-gui-test.product
@@ -27,7 +27,7 @@
</plugins>
<features>
- <feature id="org.eclipse.emf.diffmerge.feature" version="0.11.0.qualifier"/>
+ <feature id="org.eclipse.emf.diffmerge.feature" version="0.11.1.qualifier"/>
<feature id="org.eclipse.emf"/>
<feature id="org.eclipse.platform"/>
<feature id="org.eclipse.jdt"/>
@@ -62,7 +62,7 @@
<feature id="org.eclipse.emf.databinding"/>
<feature id="org.eclipse.emf.ecore.edit"/>
<feature id="org.eclipse.e4.rcp"/>
- <feature id="org.eclipse.emf.diffmerge.tests.feature" version="0.11.0.qualifier"/>
+ <feature id="org.eclipse.emf.diffmerge.tests.feature" version="0.11.1.qualifier"/>
</features>
<configurations>
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 2dd168f6..1647eff2 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.11.0-SNAPSHOT</version>
+ <version>0.11.1-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 c901ce71..946f185a 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.11.0.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.11.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.feature_0.11.1.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.11.1.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.11.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.11.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.11.1.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.11.1.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.gmf.feature_0.11.0.qualifier.jar" id="org.eclipse.emf.diffmerge.gmf.feature" version="0.11.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.gmf.feature_0.11.1.qualifier.jar" id="org.eclipse.emf.diffmerge.gmf.feature" version="0.11.1.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sirius.feature_0.11.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sirius.feature" version="0.11.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sirius.feature_0.11.1.qualifier.jar" id="org.eclipse.emf.diffmerge.sirius.feature" version="0.11.1.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.11.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.11.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.11.1.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.11.1.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 be53dc18..c13a72be 100644
--- a/releng/org.eclipse.emf.diffmerge.update/pom.xml
+++ b/releng/org.eclipse.emf.diffmerge.update/pom.xml
@@ -6,6 +6,6 @@
<parent>
<groupId>org.eclipse.emf.diffmerge</groupId>
<artifactId>org.eclipse.emf.diffmerge.releng</artifactId>
- <version>0.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/pom.xml b/releng/pom.xml
index b185f525..85b180e7 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.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
</parent>
<modules>
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 098ee3df..6cfca0aa 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.11.0.qualifier
+Bundle-Version: 0.11.1.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 1b4ae98c..d449dca1 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.11.0.qualifier
+Bundle-Version: 0.11.1.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 ddd94187..e0ffb018 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.11.0.qualifier
+Bundle-Version: 0.11.1.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 2f26cfa0..8e620809 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.11.0.qualifier
+Bundle-Version: 0.11.1.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 0e1605ec..ff264f11 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.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/tests/pom.xml b/tests/pom.xml
index 81afa969..e5ed2211 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.11.0-SNAPSHOT</version>
+ <version>0.11.1-SNAPSHOT</version>
</parent>
<build>

Back to the top