Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorOlivier Constant2019-07-17 08:04:10 +0000
committerOlivier Constant2019-07-17 08:14:01 +0000
commitdfb61d39c1c4c24e95d213bd71e1dd05437d23af (patch)
treea9498c24261ddc3fe83668c06ee18fade86e1b53 /releng
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>
Diffstat (limited to 'releng')
-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
9 files changed, 15 insertions, 15 deletions
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>

Back to the top