removed optional rap dependencies and fixed version ranges due to build
error on build server
diff --git a/ECP2/org.eclipse.emf.ecp.editor/META-INF/MANIFEST.MF b/ECP2/org.eclipse.emf.ecp.editor/META-INF/MANIFEST.MF
index 90dc178..b8bc223 100644
--- a/ECP2/org.eclipse.emf.ecp.editor/META-INF/MANIFEST.MF
+++ b/ECP2/org.eclipse.emf.ecp.editor/META-INF/MANIFEST.MF
@@ -5,15 +5,13 @@
Bundle-Version: 0.8.1
Bundle-Activator: org.eclipse.emf.ecp.editor.Activator
Bundle-Vendor: Eclipse Modeling Project
-Require-Bundle: org.eclipse.emf.ecp.ui,
+Require-Bundle: org.eclipse.emf.ecp.ui;bundle-version="[1.0.0,2.0.0)",
org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.databinding;bundle-version="[1.4.1,2.0.0)",
org.eclipse.emf.databinding;bundle-version="[1.2.0,2.0.0)",
org.eclipse.emf.databinding.edit;bundle-version="[1.2.0,2.0.0)",
org.eclipse.ui.forms;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)";resolution:=optional,
- org.eclipse.rap.jface.databinding;bundle-version="[1.5.0,2.0.0)";resolution:=optional,
- org.eclipse.rap.ui.forms;bundle-version="[1.5.0,2.0.0)";resolution:=optional
+ org.eclipse.jface.databinding;bundle-version="[1.6.0,2.0.0)";resolution:=optional
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ActivationPolicy: lazy
Export-Package: org.eclipse.emf.ecp.editor,
diff --git a/ECP2/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF b/ECP2/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
index dd72f7f..c7207f9 100644
--- a/ECP2/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
+++ b/ECP2/org.eclipse.emf.ecp.emfstore.core/META-INF/MANIFEST.MF
@@ -6,10 +6,9 @@
Bundle-Activator: org.eclipse.emf.ecp.emfstore.core.internal.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.emf.ecp.core;bundle-version="[1.0.0,2.0.0)",
- org.eclipse.emf.emfstore.client;bundle-version="[0.8.9,0.9.0)",
- org.eclipse.net4j.util;bundle-version="3.2.0",
- org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional,
- org.eclipse.rap.ui;bundle-version="1.5.0";resolution:=optional
+ org.eclipse.emf.emfstore.client;bundle-version="[0.8.9,1.0.0)",
+ org.eclipse.net4j.util;bundle-version="[3.2.0,4.0.0)",
+ org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.ecp.emfstore.core.internal;version="1.0.0";x-friends:="org.eclipse.emf.ecp.emfstore.ui"
diff --git a/ECP2/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF b/ECP2/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
index aa29a6c..12c415c 100644
--- a/ECP2/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
+++ b/ECP2/org.eclipse.emf.ecp.emfstore.ui/META-INF/MANIFEST.MF
@@ -6,9 +6,9 @@
Bundle-Activator: org.eclipse.emf.ecp.emfstore.internal.ui.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.core.expressions;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.emfstore.core;bundle-version="1.0.0",
- org.eclipse.emf.ecp.ui;bundle-version="1.0.0",
- org.eclipse.emf.emfstore.client;bundle-version="0.8.9",
+ org.eclipse.emf.ecp.emfstore.core;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.ecp.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.emfstore.client;bundle-version="[0.8.9,1.0.0)",
org.eclipse.emf.emfstore.client.ui;bundle-version="[0.8.9,1.0.0)",
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)"
Bundle-ActivationPolicy: lazy
diff --git a/ECP2/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF b/ECP2/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
index f2ef0f8..19f5421 100644
--- a/ECP2/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
+++ b/ECP2/org.eclipse.emf.ecp.explorereditorbridge/META-INF/MANIFEST.MF
@@ -5,8 +5,8 @@
Bundle-Version: 1.0.0.qualifier
Bundle-Activator: org.eclipse.emf.ecp.explorereditorbridge.Activator
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
- org.eclipse.emf.ecp.ui;bundle-version="1.0.0",
- org.eclipse.emf.ecp.editor;bundle-version="0.8.1"
+ org.eclipse.emf.ecp.ui;bundle-version="[1.0.0,2.0.0)",
+ org.eclipse.emf.ecp.editor;bundle-version="[0.8.1,1.0.0)"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.ecp.explorereditorbridge;version="1.0.0";x-internal:=true
diff --git a/ECP2/org.eclipse.emf.ecp.ui.rap/build.properties b/ECP2/org.eclipse.emf.ecp.ui.rap/build.properties
index 41eb6ad..55c3555 100644
--- a/ECP2/org.eclipse.emf.ecp.ui.rap/build.properties
+++ b/ECP2/org.eclipse.emf.ecp.ui.rap/build.properties
@@ -1,4 +1,5 @@
source.. = src/
output.. = bin/
bin.includes = META-INF/,\
- .
+ .,\
+ bin/
diff --git a/ECP2/org.eclipse.emf.ecp.ui.rcp/build.properties b/ECP2/org.eclipse.emf.ecp.ui.rcp/build.properties
index 419181b..55c3555 100644
--- a/ECP2/org.eclipse.emf.ecp.ui.rcp/build.properties
+++ b/ECP2/org.eclipse.emf.ecp.ui.rcp/build.properties
@@ -2,8 +2,4 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
- bin/,\
- fragment.jar
-jars.compile.order = .,\
- fragment.jar
-source.fragment.jar =
+ bin/
diff --git a/ECP2/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF b/ECP2/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
index 5647a44..531c3b0 100644
--- a/ECP2/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
+++ b/ECP2/org.eclipse.emf.ecp.ui/META-INF/MANIFEST.MF
@@ -8,12 +8,7 @@
org.eclipse.emf.ecp.core;bundle-version="[1.0.0,2.0.0)";visibility:=reexport,
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
org.eclipse.ui;bundle-version="[3.4.0,4.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.emf.edit.ui;bundle-version="[2.5.0,3.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.rap.rwt;bundle-version="[1.5.0,2.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.emf.rap.edit.ui;bundle-version="[2.7.0,3.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.rap.jface;bundle-version="[1.5.0,2.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.rap.ui.views;bundle-version="[1.5.0,2.0.0)";resolution:=optional;visibility:=reexport,
- org.eclipse.rap.ui.workbench;bundle-version="[1.5.0,2.0.0)";resolution:=optional;visibility:=reexport
+ org.eclipse.emf.edit.ui;bundle-version="[2.5.0,3.0.0)";resolution:=optional;visibility:=reexport
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.ecp.internal.ui;version="1.0.0";x-internal:=true,
diff --git a/ECP2/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF b/ECP2/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
index c587498..140b964 100644
--- a/ECP2/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
+++ b/ECP2/org.eclipse.emf.ecp.workspace.ui/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@
org.eclipse.emf.ecp.workspace.core;bundle-version="[1.0.0,2.0.0)",
org.eclipse.emf.ecp.ui;bundle-version="[1.0.0,2.0.0)",
org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)",
- org.eclipse.ui.ide;bundle-version="3.8.0";resolution:=optional
+ org.eclipse.ui.ide;bundle-version="[3.8.0,4.0.0)";resolution:=optional
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Export-Package: org.eclipse.emf.ecp.workspace.internal.ui;version="1.0.0";x-internal:=true
