Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2019-07-17 04:04:10 -0400
committerOlivier Constant2019-07-17 04:14:01 -0400
commitdfb61d39c1c4c24e95d213bd71e1dd05437d23af (patch)
treea9498c24261ddc3fe83668c06ee18fade86e1b53
parentc7ccb7dbabb1fd9a98572a0bb915f44739969d42 (diff)
downloadorg.eclipse.emf.diffmerge.core-dfb61d39c1c4c24e95d213bd71e1dd05437d23af.tar.gz
org.eclipse.emf.diffmerge.core-dfb61d39c1c4c24e95d213bd71e1dd05437d23af.tar.xz
org.eclipse.emf.diffmerge.core-dfb61d39c1c4c24e95d213bd71e1dd05437d23af.zip
[releng] Upgrade version to 0.12.0
Change-Id: I9047c624a97ce799ff82ae259d14c738417bf2e6 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.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
37 files changed, 44 insertions, 44 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 738a66d0..a30e735f 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.2.qualifier
+Bundle-Version: 0.12.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 ef939131..0379e7f3 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.2-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/doc/pom.xml b/doc/pom.xml
index e4cd81f5..3cb700a2 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.2-SNAPSHOT</version>
+ <version>0.12.0-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 39ac2a2a..befaac45 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.2.qualifier"
+ version="0.12.0.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 5489cf4c..85bbb468 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.2.qualifier"
+ version="0.12.0.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 f780690b..12579147 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.2.qualifier"
+ version="0.12.0.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 03225e71..2d0d5371 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.2.qualifier"
+ version="0.12.0.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 1f429896..5102f717 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.2.qualifier"
+ version="0.12.0.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 50790ed4..3834653d 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.2.qualifier"
+ version="0.12.0.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 b00553eb..60acbcf6 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.2.qualifier"
+ version="0.12.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 5500c202..5c75e183 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.2-SNAPSHOT</version>
+ <version>0.12.0-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 99a735d6..c2d8ae1a 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.2.qualifier
+Bundle-Version: 0.12.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 c04c01a5..a7511ae7 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.2.qualifier
+Bundle-Version: 0.12.0.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 92c79610..24b37a8f 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.2.qualifier
+Bundle-Version: 0.12.0.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 1eb5fdfa..fb552725 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.2.qualifier
+Bundle-Version: 0.12.0.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 4c995630..a343cbdc 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.2.qualifier
+Bundle-Version: 0.12.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 f5e6a56f..b8cc8878 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.2.qualifier
+Bundle-Version: 0.12.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 5a24dca6..56b80fe9 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.2.qualifier
+Bundle-Version: 0.12.0.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 1f3a3bf8..7d76d6ff 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.2.qualifier
+Bundle-Version: 0.12.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 dc5a43eb..2618b4e3 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.2.qualifier
+Bundle-Version: 0.12.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 7970c01d..d1e415b1 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.2-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/pom.xml b/pom.xml
index a89f81b4..d6daf8d2 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.2-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
<relativePath>./releng/org.eclipse.emf.diffmerge.configuration</relativePath>
</parent>
<modules>
@@ -26,5 +26,5 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-<version>0.11.2-SNAPSHOT</version>
+<version>0.12.0-SNAPSHOT</version>
</project>
diff --git a/releng/org.eclipse.emf.diffmerge.configuration/pom.xml b/releng/org.eclipse.emf.diffmerge.configuration/pom.xml
index 011abbc6..fb6ed045 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.2-SNAPSHOT</version>
+ <version>0.12.0-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.2-SNAPSHOT</version>
+ <version>0.12.0-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 a15365fe..82836e98 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.2.qualifier
+Bundle-Version: 0.12.0.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 2c3cb627..9d802078 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.2-SNAPSHOT</version>
+ <version>0.12.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 e9b5c097..2e8ffc7b 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.2-SNAPSHOT</version>
+ <version>0.12.0-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 ff02db4d..17a50554 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.2.qualifier"/>
+ <feature id="org.eclipse.emf.diffmerge.feature" version="0.12.0.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.2.qualifier"/>
+ <feature id="org.eclipse.emf.diffmerge.tests.feature" version="0.12.0.qualifier"/>
<feature id="org.eclipse.emf.workspace"/>
<feature id="org.eclipse.emf.transaction"/>
<feature id="org.eclipse.emf.validation"/>
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 bba89cf9..6b3259fa 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.2-SNAPSHOT</version>
+ <version>0.12.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 6795210e..d1d516e5 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.2.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.11.2.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.feature_0.12.0.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.12.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.11.2.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.11.2.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.12.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.12.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.gmf.feature_0.11.2.qualifier.jar" id="org.eclipse.emf.diffmerge.gmf.feature" version="0.11.2.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.gmf.feature_0.12.0.qualifier.jar" id="org.eclipse.emf.diffmerge.gmf.feature" version="0.12.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sirius.feature_0.11.2.qualifier.jar" id="org.eclipse.emf.diffmerge.sirius.feature" version="0.11.2.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sirius.feature_0.12.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sirius.feature" version="0.12.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.11.2.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.11.2.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.12.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.12.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 8d7f1422..b129777d 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.2-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/pom.xml b/releng/pom.xml
index 02010c7a..55de0672 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.2-SNAPSHOT</version>
+ <version>0.12.0-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 8f7aa60d..7314c547 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.2.qualifier
+Bundle-Version: 0.12.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 cbbc07a3..e3daf87c 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.2.qualifier
+Bundle-Version: 0.12.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 dbc4223e..04b45569 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.2.qualifier
+Bundle-Version: 0.12.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 025291c7..1cfb00d3 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.2.qualifier
+Bundle-Version: 0.12.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 45a17aac..29d8af76 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.2-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/tests/pom.xml b/tests/pom.xml
index aaa78719..8ae35200 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.2-SNAPSHOT</version>
+ <version>0.12.0-SNAPSHOT</version>
</parent>
<build>

Back to the top