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.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.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/org.eclipse.emf.diffmerge.target.target32
-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.xml12
-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.tests.ui/pom.xml2
-rw-r--r--tests/pom.xml2
34 files changed, 57 insertions, 57 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 8feff695..887897ee 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.8.0.qualifier
+Bundle-Version: 0.9.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 a7a3e8bf..8ee35307 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.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/doc/pom.xml b/doc/pom.xml
index 50f3c992..0bbb4de3 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.8.0-SNAPSHOT</version>
+ <version>0.9.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 2cf4f345..b2979cfc 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.diffmerge.egit.feature"
label="%featureName"
- version="0.8.0.qualifier"
+ version="0.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1">
diff --git a/features/org.eclipse.emf.diffmerge.feature/feature.xml b/features/org.eclipse.emf.diffmerge.feature/feature.xml
index 4c07770a..ee677ad3 100644
--- a/features/org.eclipse.emf.diffmerge.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.diffmerge.feature"
label="%featureName"
- version="0.8.0.qualifier"
+ version="0.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1">
diff --git a/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml b/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
index cd46a5f6..e4ec7e8b 100644
--- a/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.gmf.feature/feature.xml
@@ -16,7 +16,7 @@
<feature
id="org.eclipse.emf.diffmerge.gmf.feature"
label="%featureName"
- version="0.8.0.qualifier"
+ version="0.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1">
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
index f5736e81..c5e54c09 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.diffmerge.sdk.feature"
label="%featureName"
- version="0.8.0.qualifier"
+ version="0.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1">
diff --git a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
index a500b46e..45ccd4ec 100644
--- a/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.sirius.feature/feature.xml
@@ -16,7 +16,7 @@
<feature
id="org.eclipse.emf.diffmerge.sirius.feature"
label="%featureName"
- version="0.8.0.qualifier"
+ version="0.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1">
diff --git a/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml b/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
index bd9a48c2..79f26979 100644
--- a/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.diffmerge.svn.feature"
label="%featureName"
- version="0.8.0.qualifier"
+ version="0.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1">
diff --git a/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml b/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
index 7bd04c58..e239a48c 100644
--- a/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.tests.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.diffmerge.tests.feature"
label="%featureName"
- version="0.8.0.qualifier"
+ version="0.9.0.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1">
diff --git a/features/pom.xml b/features/pom.xml
index cd9ebff4..2340f375 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.8.0-SNAPSHOT</version>
+ <version>0.9.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 af54acdc..dd7ba8d7 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.8.0.qualifier
+Bundle-Version: 0.9.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 db05252b..a01ce01d 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.8.0.qualifier
+Bundle-Version: 0.9.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 db80b537..791be166 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.8.0.qualifier
+Bundle-Version: 0.9.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 5cd71c79..f9d4fcea 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.8.0.qualifier
+Bundle-Version: 0.9.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 0fc7c655..5fd4a4bf 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.8.0.qualifier
+Bundle-Version: 0.9.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.ui.gmf/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge.ui.gmf/META-INF/MANIFEST.MF
index 7dac9878..7126b230 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.8.0.qualifier
+Bundle-Version: 0.9.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 0f81bf77..d85155cc 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.8.0.qualifier
+Bundle-Version: 0.9.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 12b150a6..f7335a2a 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.8.0.qualifier
+Bundle-Version: 0.9.0.qualifier
Bundle-Activator: org.eclipse.emf.diffmerge.ui.EMFDiffMergeUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.diffmerge/META-INF/MANIFEST.MF
index 72e4618c..4b7c2452 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.8.0.qualifier
+Bundle-Version: 0.9.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 0a690954..1c9498c6 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.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/pom.xml b/pom.xml
index 07d310a4..3cd48968 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.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
<relativePath>./releng/org.eclipse.emf.diffmerge.configuration</relativePath>
</parent>
<modules>
@@ -26,5 +26,5 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-<version>0.8.0-SNAPSHOT</version>
+<version>0.9.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 52a75ce9..3dd2b82b 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.8.0-SNAPSHOT</version>
+ <version>0.9.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.8.0-SNAPSHOT</version>
+ <version>0.9.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 b1eaee79..1a3f82b1 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,5 +2,5 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Javadoc for DiffMerge Core
Bundle-SymbolicName: org.eclipse.emf.diffmerge.core.javadoc
-Bundle-Version: 0.8.0.qualifier
+Bundle-Version: 0.9.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml b/releng/org.eclipse.emf.diffmerge.core.javadoc/pom.xml
index e6a1c8ea..c484832c 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.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<build>
diff --git a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
index 54d382ae..0d4c03a5 100644
--- a/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
+++ b/releng/org.eclipse.emf.diffmerge.target/org.eclipse.emf.diffmerge.target.target
@@ -1,28 +1,28 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target includeMode="feature" name="org.eclipse.emf.diffmerge" sequenceNumber="6">
+<?pde version="3.8"?><target includeMode="feature" name="org.eclipse.emf.diffmerge" sequenceNumber="12">
<locations>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.egit.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.emf.feature.group" version="0.0.0"/>
-<unit id="org.eclipse.team.svn.feature.group" version="0.0.0"/>
-<repository location="http://download.eclipse.org/releases/mars"/>
+<unit id="org.eclipse.sirius.runtime.feature.group" version="5.1.0.201709011420"/>
+<unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="5.1.0.201709011420"/>
+<unit id="org.eclipse.sirius.specifier.feature.group" version="5.1.0.201709011420"/>
+<unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="5.1.0.201709011420"/>
+<repository location="http://download.eclipse.org/sirius/updates/stable/5.1.0-S20170901-101720/neon"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
-<repository location="http://download.eclipse.org/cbi/updates/license/"/>
+<unit id="org.eclipse.equinox.sdk.feature.group" version="3.12.0.v20170209-1843"/>
+<unit id="org.eclipse.jdt.feature.group" version="3.12.3.v20170301-0400"/>
+<unit id="org.eclipse.platform.sdk" version="4.6.3.M20170301-0400"/>
+<repository location="http://download.eclipse.org/eclipse/updates/4.6"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.sirius.runtime.feature.group" version="4.1.3.201701271300"/>
-<unit id="org.eclipse.sirius.runtime.ide.ui.feature.group" version="4.1.3.201701271300"/>
-<unit id="org.eclipse.sirius.specifier.feature.group" version="4.1.3.201701271300"/>
-<unit id="org.eclipse.sirius.specifier.ide.ui.feature.group" version="4.1.3.201701271300"/>
-<repository location="http://download.eclipse.org/sirius/updates/releases/4.1.3/mars"/>
+<unit id="org.eclipse.egit.feature.group" version="4.6.1.201703071140-r"/>
+<unit id="org.eclipse.emf.sdk.feature.group" version="2.12.0.v20160526-0356"/>
+<unit id="org.eclipse.team.svn.feature.group" version="4.0.4.I20170216-1700"/>
+<repository location="http://download.eclipse.org/releases/neon"/>
</location>
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.sdk" version="4.5.2.M20160212-1500"/>
-<unit id="org.eclipse.equinox.sdk.feature.group" version="3.11.2.v20160202-2102"/>
-<unit id="org.eclipse.jdt.feature.group" version="3.11.2.v20160212-1500"/>
-<repository location="http://download.eclipse.org/eclipse/updates/4.5/R-4.5.2-201602121500"/>
+<unit id="org.eclipse.license.feature.group" version="1.0.1.v20140414-1359"/>
+<repository location="http://download.eclipse.org/cbi/updates/license/"/>
</location>
</locations>
</target>
diff --git a/releng/org.eclipse.emf.diffmerge.target/pom.xml b/releng/org.eclipse.emf.diffmerge.target/pom.xml
index d77fdb9d..59d2fa16 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.8.0-SNAPSHOT</version>
+ <version>0.9.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 dfe5595d..4d6b5af8 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.8.0.qualifier"/>
+ <feature id="org.eclipse.emf.diffmerge.feature" version="0.9.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.8.0.qualifier"/>
+ <feature id="org.eclipse.emf.diffmerge.tests.feature" version="0.9.0.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 80fc7d90..e500f3d6 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.8.0-SNAPSHOT</version>
+ <version>0.9.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 97f44cbe..91a50e9e 100644
--- a/releng/org.eclipse.emf.diffmerge.update/category.xml
+++ b/releng/org.eclipse.emf.diffmerge.update/category.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.emf.diffmerge.feature_0.8.0.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.8.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.feature_0.9.0.qualifier.jar" id="org.eclipse.emf.diffmerge.feature" version="0.9.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.8.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.8.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.9.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.9.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.svn.feature_0.8.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.feature" version="0.8.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.svn.feature_0.9.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.feature" version="0.9.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.gmf.feature_0.8.0.qualifier.jar" id="org.eclipse.emf.diffmerge.gmf.feature" version="0.8.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.gmf.feature_0.9.0.qualifier.jar" id="org.eclipse.emf.diffmerge.gmf.feature" version="0.9.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sirius.feature_0.8.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sirius.feature" version="0.8.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sirius.feature_0.9.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sirius.feature" version="0.9.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.8.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.8.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature.source_0.9.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature.source" version="0.9.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 2b865831..9ea6c38a 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.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
</project> \ No newline at end of file
diff --git a/releng/pom.xml b/releng/pom.xml
index 4edde962..b8095c51 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.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<modules>
diff --git a/tests/org.eclipse.emf.diffmerge.tests.ui/pom.xml b/tests/org.eclipse.emf.diffmerge.tests.ui/pom.xml
index 45868725..a4e02900 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.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<dependencies>
diff --git a/tests/pom.xml b/tests/pom.xml
index c5aad19c..a7fa284a 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.8.0-SNAPSHOT</version>
+ <version>0.9.0-SNAPSHOT</version>
</parent>
<build>

Back to the top