Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgolubev2012-05-29 17:54:56 -0400
committermgolubev2012-05-29 17:54:56 -0400
commit58ac43f652b8eded180f67c22ff655b66f790ae1 (patch)
treecfbe75015fcec438666229f18f9421d3503a69a1
parent1d33cecb04ca7639131dcacd6c8032e4cc4800e8 (diff)
parenta5e2779af0de5c552b41bb6e5b17697a6a193403 (diff)
downloadorg.eclipse.gmf-tooling-3.0.RC2.build.tar.gz
org.eclipse.gmf-tooling-3.0.RC2.build.tar.xz
org.eclipse.gmf-tooling-3.0.RC2.build.zip
Merge branch '380186-bridge-trace-version-conflict'3.0.RC2.build
-rw-r--r--features/org.eclipse.gmf.sdk-feature/feature.xml4
-rw-r--r--features/org.eclipse.gmf.sdk.experimental-feature/feature.xml7
-rw-r--r--features/org.eclipse.gmf.tooling-feature/feature.xml7
3 files changed, 9 insertions, 9 deletions
diff --git a/features/org.eclipse.gmf.sdk-feature/feature.xml b/features/org.eclipse.gmf.sdk-feature/feature.xml
index 5d8e5d1d9..f8391afe5 100644
--- a/features/org.eclipse.gmf.sdk-feature/feature.xml
+++ b/features/org.eclipse.gmf.sdk-feature/feature.xml
@@ -55,8 +55,8 @@ http://www.eclipse.org/legal/epl-v10.html
<import feature="org.eclipse.emf" version="2.6.0" match="compatible"/>
<import feature="org.eclipse.gef" version="3.6.0" match="compatible"/>
<import feature="org.eclipse.ocl" version="3.0.0" match="compatible"/>
- <import feature="org.eclipse.emf.validation" version="1.4.0" match="compatible"/>
- <import feature="org.eclipse.gmf.runtime.sdk" version="1.4.0" match="compatible"/>
+ <import feature="org.eclipse.emf.validation" version="1.5.0" match="compatible"/>
+ <import feature="org.eclipse.gmf.runtime.sdk" version="1.5.0" match="compatible"/>
</requires>
<plugin
diff --git a/features/org.eclipse.gmf.sdk.experimental-feature/feature.xml b/features/org.eclipse.gmf.sdk.experimental-feature/feature.xml
index ef728c22e..9fdfa92b3 100644
--- a/features/org.eclipse.gmf.sdk.experimental-feature/feature.xml
+++ b/features/org.eclipse.gmf.sdk.experimental-feature/feature.xml
@@ -119,13 +119,6 @@ http://www.eclipse.org/legal/epl-v10.html
unpack="false"/>
<plugin
- id="org.eclipse.gmf.bridge.trace"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.eclipse.gmf.runtime.lite"
download-size="0"
install-size="0"
diff --git a/features/org.eclipse.gmf.tooling-feature/feature.xml b/features/org.eclipse.gmf.tooling-feature/feature.xml
index 56e55a5a5..add312af9 100644
--- a/features/org.eclipse.gmf.tooling-feature/feature.xml
+++ b/features/org.eclipse.gmf.tooling-feature/feature.xml
@@ -262,4 +262,11 @@ http://www.eclipse.org/legal/epl-v10.html
version="0.0.0"
unpack="false"/>
+ <plugin
+ id="org.eclipse.gmf.bridge.trace"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
</feature>

Back to the top