Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Constant2016-06-27 13:25:12 +0000
committerOlivier Constant2016-06-27 13:25:12 +0000
commit65d2c19a6a32914b4f7b23a9948e9930c4d218de (patch)
tree4841ff53676ad0ac8638c268df651af4057783ce /features
parentad84ddc5724ad35544a1a0d04d7f8eda6b7ab64b (diff)
downloadorg.eclipse.emf.diffmerge.core-65d2c19a6a32914b4f7b23a9948e9930c4d218de.tar.gz
org.eclipse.emf.diffmerge.core-65d2c19a6a32914b4f7b23a9948e9930c4d218de.tar.xz
org.eclipse.emf.diffmerge.core-65d2c19a6a32914b4f7b23a9948e9930c4d218de.zip
Clean-up and renaming for 0.7.0
Change-Id: I9a5e5890160294be8afc908afca63f588c52b65d Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/category.xml8
-rw-r--r--features/org.eclipse.emf.diffmerge.egit.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.scm.feature/category.xml12
-rw-r--r--features/org.eclipse.emf.diffmerge.scm.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/category.xml4
-rw-r--r--features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml2
-rw-r--r--features/org.eclipse.emf.diffmerge.svn.feature/category.xml8
-rw-r--r--features/org.eclipse.emf.diffmerge.svn.feature/feature.xml70
8 files changed, 54 insertions, 54 deletions
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/category.xml b/features/org.eclipse.emf.diffmerge.egit.feature/category.xml
index cbfaf75b..987ed690 100644
--- a/features/org.eclipse.emf.diffmerge.egit.feature/category.xml
+++ b/features/org.eclipse.emf.diffmerge.egit.feature/category.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.egit.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.egit.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.egit.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.egit.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.source.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.egit.source.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.source.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.egit.category"/>
</feature>
<category-def name="org.eclipse.emf.diffmerge.egit.category" label="EMF Diff/Merge (Incubation)"/>
diff --git a/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml b/features/org.eclipse.emf.diffmerge.egit.feature/feature.xml
index be93aa24..3e270801 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="EMF Diff/Merge EGit Integration Feature (Incubation)"
- version="0.6.0.qualifier"
+ version="0.7.0.qualifier"
provider-name="Eclipse Modeling Project">
<description>
diff --git a/features/org.eclipse.emf.diffmerge.scm.feature/category.xml b/features/org.eclipse.emf.diffmerge.scm.feature/category.xml
index 108135b6..f8870b9b 100644
--- a/features/org.eclipse.emf.diffmerge.scm.feature/category.xml
+++ b/features/org.eclipse.emf.diffmerge.scm.feature/category.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.scm.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.scm.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.egit.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.scm.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.egit.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.source.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.egit.source.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.egit.source.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.scm.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.svn.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.svn.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.scm.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.svn.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.source.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.svn.source.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.source.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.scm.category"/>
</feature>
<category-def name="org.eclipse.emf.diffmerge.scm.category" label="EMF Diff/Merge (Incubation)"/>
diff --git a/features/org.eclipse.emf.diffmerge.scm.feature/feature.xml b/features/org.eclipse.emf.diffmerge.scm.feature/feature.xml
index 68ba7a22..683c0298 100644
--- a/features/org.eclipse.emf.diffmerge.scm.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.scm.feature/feature.xml
@@ -2,7 +2,7 @@
<feature
id="org.eclipse.emf.diffmerge.scm.feature"
label="EMF Diff/Merge SCM Integration Feature (Incubation)"
- version="0.6.0.qualifier"
+ version="0.7.0.qualifier"
provider-name="Eclipse Modeling Project">
<description>
diff --git a/features/org.eclipse.emf.diffmerge.sdk.feature/category.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/category.xml
index bda65b7a..8d050dad 100644
--- a/features/org.eclipse.emf.diffmerge.sdk.feature/category.xml
+++ b/features/org.eclipse.emf.diffmerge.sdk.feature/category.xml
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.7.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/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml b/features/org.eclipse.emf.diffmerge.sdk.feature/feature.xml
index 80e82528..315ebf3a 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="EMF Diff/Merge SDK Feature (Incubation)"
- version="0.6.0.qualifier"
+ version="0.7.0.qualifier"
provider-name="Eclipse Modeling Project">
<description>
diff --git a/features/org.eclipse.emf.diffmerge.svn.feature/category.xml b/features/org.eclipse.emf.diffmerge.svn.feature/category.xml
index 966aaec3..e6c1193d 100644
--- a/features/org.eclipse.emf.diffmerge.svn.feature/category.xml
+++ b/features/org.eclipse.emf.diffmerge.svn.feature/category.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<site>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.svn.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.sdk.source.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.sdk.source.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.svn.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.svn.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.svn.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.svn.category"/>
</feature>
- <feature url="features/org.eclipse.emf.diffmerge.svn.source.feature_0.6.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.source.feature" version="0.6.0.qualifier">
+ <feature url="features/org.eclipse.emf.diffmerge.svn.source.feature_0.7.0.qualifier.jar" id="org.eclipse.emf.diffmerge.svn.source.feature" version="0.7.0.qualifier">
<category name="org.eclipse.emf.diffmerge.svn.category"/>
</feature>
<category-def name="org.eclipse.emf.diffmerge.svn.category" label="EMF Diff/Merge (Incubation)"/>
diff --git a/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml b/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
index 199e597c..cd5df19d 100644
--- a/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
+++ b/features/org.eclipse.emf.diffmerge.svn.feature/feature.xml
@@ -1,39 +1,39 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.emf.diffmerge.svn.feature"
- label="EMF Diff/Merge SVN Integration Feature (Incubation)"
- version="0.6.0.qualifier"
- provider-name="Eclipse Modeling Project">
-
- <description>
- An integration of EMF Diff/Merge with SVN.
- </description>
-
- <copyright>
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+ id="org.eclipse.emf.diffmerge.svn.feature"
+ label="EMF Diff/Merge SVN Integration Feature (Incubation)"
+ version="0.7.0.qualifier"
+ provider-name="Eclipse Modeling Project">
+
+ <description>
+ An integration of EMF Diff/Merge with SVN.
+ </description>
+
+ <copyright>
Copyright (c) 2016 Thales Global Services S.A.S. and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
- </copyright>
-
- <license url="%licenseURL">
- %license
- </license>
-
- <includes
- id="org.eclipse.emf.diffmerge.svn.source.feature"
- version="0.0.0"/>
-
- <includes
- id="org.eclipse.emf.diffmerge.sdk.feature"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.emf.diffmerge.connector.svn"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
+http://www.eclipse.org/legal/epl-v10.html
+ </copyright>
+
+ <license url="%licenseURL">
+ %license
+ </license>
+
+ <includes
+ id="org.eclipse.emf.diffmerge.svn.source.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.emf.diffmerge.sdk.feature"
+ version="0.0.0"/>
+
+ <plugin
+ id="org.eclipse.emf.diffmerge.connector.svn"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+</feature>

Back to the top