Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Fedorenko2011-09-09 10:42:32 -0400
committerIgor Fedorenko2011-09-09 10:42:32 -0400
commit62a26d5fbbd0b1be3c7a410f58fb573c79cd15e4 (patch)
treebf918d839fc60cb98ce64b3061829fdaefa5c9f9 /org.eclipse.m2e.editor
parent133a9bad606ced21d81c4eecfc83baa18229c300 (diff)
parent4ca16a591d79e47a4f56d5a7b2886b9814110ba0 (diff)
downloadm2e-core-62a26d5fbbd0b1be3c7a410f58fb573c79cd15e4.tar.gz
m2e-core-62a26d5fbbd0b1be3c7a410f58fb573c79cd15e4.tar.xz
m2e-core-62a26d5fbbd0b1be3c7a410f58fb573c79cd15e4.zip
Merge branch 'master' into m2e-self-hosting
Conflicts: org.eclipse.m2e.usagedata/build.properties
Diffstat (limited to 'org.eclipse.m2e.editor')
-rw-r--r--org.eclipse.m2e.editor/META-INF/MANIFEST.MF8
-rw-r--r--org.eclipse.m2e.editor/build.properties1
2 files changed, 7 insertions, 2 deletions
diff --git a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
index 93d57382..00ae48b5 100644
--- a/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
+++ b/org.eclipse.m2e.editor/META-INF/MANIFEST.MF
@@ -13,13 +13,17 @@ Require-Bundle: org.eclipse.core.runtime,
org.eclipse.wst.sse.core,
org.eclipse.wst.sse.ui,
org.eclipse.wst.xml.core,
- org.eclipse.emf.edit.ui;resolution:=optional,
+ org.eclipse.ui.workbench,
org.eclipse.m2e.core;bundle-version="[1.0.0,1.1.0)",
org.eclipse.m2e.maven.runtime;bundle-version="[1.0.0,1.1.0)",
org.eclipse.m2e.editor.xml;bundle-version="[1.0.0,1.1.0)",
org.eclipse.m2e.core.ui;bundle-version="[1.0.0,1.1.0)",
org.slf4j.api;bundle-version="1.6.1",
- org.eclipse.wst.common.emf
+ org.eclipse.wst.common.emf,
+ org.eclipse.swt,
+ org.eclipse.jface,
+ org.eclipse.emf.common,
+ org.eclipse.emf.ecore
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5,
JavaSE-1.6
diff --git a/org.eclipse.m2e.editor/build.properties b/org.eclipse.m2e.editor/build.properties
index 11e00027..d70d4164 100644
--- a/org.eclipse.m2e.editor/build.properties
+++ b/org.eclipse.m2e.editor/build.properties
@@ -19,3 +19,4 @@ bin.includes = plugin.xml,\
schema/,\
OSGI-INF/l10n/bundle.properties,\
about.html
+jars.extra.classpath=platform:/plugin/org.eclipse.emf.edit.ui

Back to the top