Merge branch 'master' of
ssh://emueller@git.eclipse.org/gitroot/emfclient/org.eclipse.emf.ecp.releng.git
Conflicts:
org.eclipse.emf.ecp.common.feature/feature.xml
org.eclipse.emf.ecp.editor.feature/feature.xml
org.eclipse.emf.ecp.navigator.feature/feature.xml
org.eclipse.emf.ecp.navigatoreditorbridge.feature/feature.xml
org.eclipse.emf.ecp.validation.feature/feature.xml
diff --git a/org.eclipse.emf.ecp.common.feature/feature.xml b/org.eclipse.emf.ecp.common.feature/feature.xml
index bb4596e..3b436d6 100644
--- a/org.eclipse.emf.ecp.common.feature/feature.xml
+++ b/org.eclipse.emf.ecp.common.feature/feature.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.emf.ecp.common.feature"
- label="ECP Common (Incubation)"
- version="0.8.9.qualifier"
+ label="ECP Common"
+ version="0.9.0.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://emfcp.org">
diff --git a/org.eclipse.emf.ecp.editor.feature/feature.xml b/org.eclipse.emf.ecp.editor.feature/feature.xml
index 35c4796..1245669 100644
--- a/org.eclipse.emf.ecp.editor.feature/feature.xml
+++ b/org.eclipse.emf.ecp.editor.feature/feature.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.emf.ecp.editor.feature"
- label="ECP Editor (Incubation)"
- version="0.8.9.qualifier"
+ label="ECP Editor"
+ version="0.9.0.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://emfcp.org">
diff --git a/org.eclipse.emf.ecp.navigator.feature/feature.xml b/org.eclipse.emf.ecp.navigator.feature/feature.xml
index c9c3b57..9cd3c0b 100644
--- a/org.eclipse.emf.ecp.navigator.feature/feature.xml
+++ b/org.eclipse.emf.ecp.navigator.feature/feature.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.emf.ecp.navigator.feature"
- label="ECP Navigator (Incubation)"
- version="0.8.9.qualifier"
+ label="ECP Navigator"
+ version="0.9.0.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://emfcp.org">
diff --git a/org.eclipse.emf.ecp.navigatoreditorbridge.feature/feature.xml b/org.eclipse.emf.ecp.navigatoreditorbridge.feature/feature.xml
index c6dbaca..3f94253 100644
--- a/org.eclipse.emf.ecp.navigatoreditorbridge.feature/feature.xml
+++ b/org.eclipse.emf.ecp.navigatoreditorbridge.feature/feature.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.emf.ecp.navigatoreditorbridge.feature"
- label="ECP Navigator Editor Bridge (Incubation)"
- version="0.8.9.qualifier"
+ label="ECP Navigator Editor Bridge"
+ version="0.9.0.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://emfcp.org">
diff --git a/org.eclipse.emf.ecp.validation.feature/feature.xml b/org.eclipse.emf.ecp.validation.feature/feature.xml
index 32e32b0..19b511a 100644
--- a/org.eclipse.emf.ecp.validation.feature/feature.xml
+++ b/org.eclipse.emf.ecp.validation.feature/feature.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="org.eclipse.emf.ecp.validation.feature"
- label="ECP Validation (Incubation)"
- version="0.8.9.qualifier"
+ label="ECP Validation"
+ version="0.9.0.qualifier"
provider-name="Eclipse Modeling Project">
<description url="http://emfcp.org">
