Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormgolubev2012-05-23 09:12:36 -0400
committermgolubev2012-05-23 09:12:36 -0400
commitdfa7aa6d7c09577dc8ef87fff2c047f5d9b0cb05 (patch)
tree068fd8c3c61ea12fbeab2744f86b936d604a87bd
parent7a42be17a5bc9bddd06adaa1857322ba635a1896 (diff)
downloadorg.eclipse.gmf-tooling-dfa7aa6d7c09577dc8ef87fff2c047f5d9b0cb05.tar.gz
org.eclipse.gmf-tooling-dfa7aa6d7c09577dc8ef87fff2c047f5d9b0cb05.tar.xz
org.eclipse.gmf-tooling-dfa7aa6d7c09577dc8ef87fff2c047f5d9b0cb05.zip
[3.0.RC1] fix for build #215
-rw-r--r--doc/org.eclipse.gmf.doc.ui/META-INF/MANIFEST.MF2
-rw-r--r--features/org.eclipse.gmf.europa-feature/feature.xml14
-rw-r--r--features/org.eclipse.gmf.sdk.experimental.source-feature/.project17
-rw-r--r--features/org.eclipse.gmf.sdk.experimental.source-feature/feature.xml2
-rw-r--r--features/org.eclipse.gmf.tooling-feature/feature.xml8
-rw-r--r--features/org.eclipse.gmf.tooling.source-feature/feature.xml14
-rw-r--r--plugins/org.eclipse.gmf.codegen.lite.ui/META-INF/MANIFEST.MF2
-rw-r--r--plugins/org.eclipse.gmf.codegen.lite/META-INF/MANIFEST.MF2
-rw-r--r--repository/category.xml6
-rw-r--r--repository/site.xml6
10 files changed, 45 insertions, 28 deletions
diff --git a/doc/org.eclipse.gmf.doc.ui/META-INF/MANIFEST.MF b/doc/org.eclipse.gmf.doc.ui/META-INF/MANIFEST.MF
index be4b32da2..e331c65d4 100644
--- a/doc/org.eclipse.gmf.doc.ui/META-INF/MANIFEST.MF
+++ b/doc/org.eclipse.gmf.doc.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui;bundle-version="[3.2.0,4.0.0)",
org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
org.eclipse.ui.cheatsheets;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.gmf.graphdef.edit;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.graphdef.edit;bundle-version="[3.0.0,4.0.0)",
org.eclipse.gmf.bridge.ui;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.codegen.ecore.ui;bundle-version="[2.2.0,3.0.0)",
org.eclipse.gmf.tooldef.edit;bundle-version="[2.0.0,3.0.0)"
diff --git a/features/org.eclipse.gmf.europa-feature/feature.xml b/features/org.eclipse.gmf.europa-feature/feature.xml
index 1c24e0b6c..935abe170 100644
--- a/features/org.eclipse.gmf.europa-feature/feature.xml
+++ b/features/org.eclipse.gmf.europa-feature/feature.xml
@@ -52,27 +52,27 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.draw2d" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.gmf.common" version="1.1.0" match="compatible"/>
<import plugin="org.eclipse.gmf.validate" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.codegen" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.codegen" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.edit" version="2.3.0" match="compatible"/>
<import plugin="org.eclipse.emf.edit.ui" version="2.3.0" match="compatible"/>
<import plugin="org.eclipse.emf.codegen.ecore.ui" version="2.3.0" match="compatible"/>
<import plugin="org.eclipse.ui" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.gmf.bridge" version="1.1.0" match="compatible"/>
<import plugin="org.eclipse.gmf.bridge.ui.dashboard" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.codegen.edit" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.codegen.edit" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.gmf.graphdef.codegen.ui" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.importer" version="2.3.0" match="compatible"/>
<import plugin="org.eclipse.gmf.bridge.ui" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.graphdef" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.graphdef" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.gmf.tooldef" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.map" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.graphdef.edit" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.map" version="3.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.graphdef.edit" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.gmf.tooldef.edit" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore.edit" version="2.3.0" match="compatible"/>
<import plugin="org.eclipse.gmf.runtime.notation" version="1.0.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.graphdef.codegen" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.graphdef.codegen" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.common" version="2.3.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.map.edit" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.map.edit" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore.editor" version="2.3.0" match="compatible"/>
<import plugin="org.eclipse.pde.ui" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.pde.core" version="3.3.0" match="compatible"/>
diff --git a/features/org.eclipse.gmf.sdk.experimental.source-feature/.project b/features/org.eclipse.gmf.sdk.experimental.source-feature/.project
new file mode 100644
index 000000000..9cffa9d67
--- /dev/null
+++ b/features/org.eclipse.gmf.sdk.experimental.source-feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.gmf.sdk.experimental.source-feature</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.pde.FeatureBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.pde.FeatureNature</nature>
+ </natures>
+</projectDescription>
diff --git a/features/org.eclipse.gmf.sdk.experimental.source-feature/feature.xml b/features/org.eclipse.gmf.sdk.experimental.source-feature/feature.xml
index b4bc0a83d..00895ce19 100644
--- a/features/org.eclipse.gmf.sdk.experimental.source-feature/feature.xml
+++ b/features/org.eclipse.gmf.sdk.experimental.source-feature/feature.xml
@@ -38,7 +38,7 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.core.runtime" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.emf.codegen.ecore" version="2.3.0" match="compatible"/>
<import plugin="org.eclipse.gmf.common" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.codegen" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.codegen" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.gmf.xpand" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.core.resources" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.ui" version="3.3.0" match="compatible"/>
diff --git a/features/org.eclipse.gmf.tooling-feature/feature.xml b/features/org.eclipse.gmf.tooling-feature/feature.xml
index c12600f2b..34e90a9fc 100644
--- a/features/org.eclipse.gmf.tooling-feature/feature.xml
+++ b/features/org.eclipse.gmf.tooling-feature/feature.xml
@@ -108,10 +108,10 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.swt" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.gmf.xpand" version="2.1.0" match="compatible"/>
<import plugin="org.eclipse.gmf.common" version="1.3.0" match="compatible"/>
- <import plugin="org.eclipse.m2m.qvt.oml.runtime" version="2.0.0"/>
- <import plugin="org.eclipse.m2m.qvt.oml.common" version="2.1.0"/>
- <import plugin="org.eclipse.m2m.qvt.oml.project" version="2.1.0"/>
- <import plugin="org.eclipse.m2m.qvt.oml.runtime" version="2.1.0"/>
+ <import plugin="org.eclipse.m2m.qvt.oml.runtime" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.m2m.qvt.oml.common" version="2.1.0" match="compatible"/>
+ <import plugin="org.eclipse.m2m.qvt.oml.project" version="2.1.0" match="compatible"/>
+ <import plugin="org.eclipse.m2m.qvt.oml.runtime" version="2.1.0" match="compatible"/>
<import plugin="lpg.runtime.java" version="2.0.17" match="compatible"/>
</requires>
diff --git a/features/org.eclipse.gmf.tooling.source-feature/feature.xml b/features/org.eclipse.gmf.tooling.source-feature/feature.xml
index 77b302321..db2de0ab2 100644
--- a/features/org.eclipse.gmf.tooling.source-feature/feature.xml
+++ b/features/org.eclipse.gmf.tooling.source-feature/feature.xml
@@ -46,7 +46,7 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.draw2d" version="3.2.0" match="compatible"/>
<import plugin="org.eclipse.gmf.validate" version="1.1.0" match="compatible"/>
<import plugin="org.eclipse.m2m.qvt.oml" version="3.0.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.codegen" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.codegen" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.edit" version="2.4.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore.xmi" version="2.4.0" match="compatible"/>
<import plugin="org.eclipse.emf.edit.ui" version="2.4.0" match="compatible"/>
@@ -54,22 +54,22 @@ http://www.eclipse.org/legal/epl-v10.html
<import plugin="org.eclipse.ui" version="3.3.0" match="compatible"/>
<import plugin="org.eclipse.gmf.bridge" version="1.1.0" match="compatible"/>
<import plugin="org.eclipse.gmf.bridge.ui.dashboard" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.codegen.edit" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.codegen.edit" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.gmf.graphdef.codegen.ui" version="1.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.importer" version="2.3.0" match="compatible"/>
<import plugin="org.eclipse.gmf.bridge.ui" version="1.1.0" match="compatible"/>
<import plugin="org.eclipse.gmf.common" version="1.1.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.graphdef" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.graphdef" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.gmf.tooldef" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.map" version="2.0.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.graphdef.edit" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.map" version="3.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.graphdef.edit" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.gmf.tooldef.edit" version="2.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore.edit" version="2.4.0" match="compatible"/>
<import plugin="org.eclipse.gmf.runtime.notation" version="1.0.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.graphdef.codegen" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.graphdef.codegen" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.common" version="2.3.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore.edit" version="2.3.0" match="compatible"/>
- <import plugin="org.eclipse.gmf.map.edit" version="2.0.0" match="compatible"/>
+ <import plugin="org.eclipse.gmf.map.edit" version="3.0.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore.editor" version="2.3.0" match="compatible"/>
<import plugin="org.eclipse.emf.ecore" version="2.3.0" match="compatible"/>
<import plugin="org.eclipse.pde.ui" version="3.3.0" match="compatible"/>
diff --git a/plugins/org.eclipse.gmf.codegen.lite.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.codegen.lite.ui/META-INF/MANIFEST.MF
index af1ff1391..741c7e8d8 100644
--- a/plugins/org.eclipse.gmf.codegen.lite.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.codegen.lite.ui/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
org.eclipse.core.resources;bundle-version="[3.3.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.3.0,4.0.0)",
- org.eclipse.gmf.codegen;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.codegen;bundle-version="[3.0.0,4.0.0)",
org.eclipse.gmf.codegen.lite;bundle-version="[1.1.0,2.0.0)",
org.eclipse.gmf.codegen.ui;bundle-version="[1.1.0,2.0.0)",
org.eclipse.gmf.bridge.ui.dashboard;bundle-version="[2.0.0,3.0.0)"
diff --git a/plugins/org.eclipse.gmf.codegen.lite/META-INF/MANIFEST.MF b/plugins/org.eclipse.gmf.codegen.lite/META-INF/MANIFEST.MF
index f8d7696e0..cbd31a352 100644
--- a/plugins/org.eclipse.gmf.codegen.lite/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.gmf.codegen.lite/META-INF/MANIFEST.MF
@@ -8,7 +8,7 @@ Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.3.0,4.0.0)",
org.eclipse.emf.codegen.ecore;bundle-version="[2.3.0,3.0.0)",
org.eclipse.gmf.common;bundle-version="[1.1.0,2.0.0)",
- org.eclipse.gmf.codegen;bundle-version="[2.0.0,3.0.0)",
+ org.eclipse.gmf.codegen;bundle-version="[3.0.0,4.0.0)",
org.eclipse.gmf.xpand;bundle-version="[2.1.0,3.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.gmf.internal.codegen.lite.Activator
diff --git a/repository/category.xml b/repository/category.xml
index 94f788933..3f787b5f6 100644
--- a/repository/category.xml
+++ b/repository/category.xml
@@ -4,13 +4,13 @@
<description url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones">
A generative framework and runtime for developing graphical applications which leverage both the Eclipse Modeling Framework (EMF) and Graphical Editing Framework (GEF).
</description>
- <feature url="features/org.eclipse.gmf.tooling_2.4.1.qualifier.jar" id="org.eclipse.gmf.tooling" version="2.4.1.qualifier">
+ <feature url="features/org.eclipse.gmf.tooling_3.0.0.qualifier.jar" id="org.eclipse.gmf.tooling" version="3.0.0.qualifier">
<category name="GMF Tooling"/>
</feature>
- <feature url="features/org.eclipse.gmf.sdk_2.4.1.qualifier.jar" id="org.eclipse.gmf.sdk" version="2.4.1.qualifier">
+ <feature url="features/org.eclipse.gmf.sdk_3.0.0.qualifier.jar" id="org.eclipse.gmf.sdk" version="3.0.0.qualifier">
<category name="GMF Tooling"/>
</feature>
- <feature url="features/org.eclipse.gmf.sdk.experimental_1.2.0.qualifier.jar" id="org.eclipse.gmf.sdk.experimental" version="1.2.0.qualifier">
+ <feature url="features/org.eclipse.gmf.sdk.experimental_1.2.0.qualifier.jar" id="org.eclipse.gmf.sdk.experimental" version="1.2.0.qualifier">
<category name="GMF Tooling"/>
</feature>
<feature url="features/org.eclipse.gmf.examples_1.4.0.qualifier.jar" id="org.eclipse.gmf.examples" version="1.4.0.qualifier">
diff --git a/repository/site.xml b/repository/site.xml
index 94f788933..3f787b5f6 100644
--- a/repository/site.xml
+++ b/repository/site.xml
@@ -4,13 +4,13 @@
<description url="http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones">
A generative framework and runtime for developing graphical applications which leverage both the Eclipse Modeling Framework (EMF) and Graphical Editing Framework (GEF).
</description>
- <feature url="features/org.eclipse.gmf.tooling_2.4.1.qualifier.jar" id="org.eclipse.gmf.tooling" version="2.4.1.qualifier">
+ <feature url="features/org.eclipse.gmf.tooling_3.0.0.qualifier.jar" id="org.eclipse.gmf.tooling" version="3.0.0.qualifier">
<category name="GMF Tooling"/>
</feature>
- <feature url="features/org.eclipse.gmf.sdk_2.4.1.qualifier.jar" id="org.eclipse.gmf.sdk" version="2.4.1.qualifier">
+ <feature url="features/org.eclipse.gmf.sdk_3.0.0.qualifier.jar" id="org.eclipse.gmf.sdk" version="3.0.0.qualifier">
<category name="GMF Tooling"/>
</feature>
- <feature url="features/org.eclipse.gmf.sdk.experimental_1.2.0.qualifier.jar" id="org.eclipse.gmf.sdk.experimental" version="1.2.0.qualifier">
+ <feature url="features/org.eclipse.gmf.sdk.experimental_1.2.0.qualifier.jar" id="org.eclipse.gmf.sdk.experimental" version="1.2.0.qualifier">
<category name="GMF Tooling"/>
</feature>
<feature url="features/org.eclipse.gmf.examples_1.4.0.qualifier.jar" id="org.eclipse.gmf.examples" version="1.4.0.qualifier">

Back to the top