No longer need explicit core.runtime, osgi. A previous intgration build required it.
diff --git a/plugins/org.eclipse.jem.beaninfo/plugin.xml b/plugins/org.eclipse.jem.beaninfo/plugin.xml index 36512fe..6b6564c 100644 --- a/plugins/org.eclipse.jem.beaninfo/plugin.xml +++ b/plugins/org.eclipse.jem.beaninfo/plugin.xml
@@ -25,8 +25,6 @@ <import plugin="org.eclipse.emf.ecore.xmi"/> <import plugin="com.ibm.wtp.common.util"/> <import plugin="com.ibm.wtp.emf.workbench"/> - <import plugin="org.eclipse.osgi"/> - <import plugin="org.eclipse.core.runtime"/> </requires>
diff --git a/plugins/org.eclipse.jem.proxy/plugin.xml b/plugins/org.eclipse.jem.proxy/plugin.xml index 4c6cd05..964c846 100644 --- a/plugins/org.eclipse.jem.proxy/plugin.xml +++ b/plugins/org.eclipse.jem.proxy/plugin.xml
@@ -39,9 +39,6 @@ <import plugin="org.eclipse.debug.core" export="true"/> <import plugin="com.ibm.wtp.common.util"/> <import plugin="org.eclipse.pde.core"/> - <import plugin="org.eclipse.core.runtime.compatibility"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.osgi"/> </requires>
diff --git a/plugins/org.eclipse.jem.ui/plugin.xml b/plugins/org.eclipse.jem.ui/plugin.xml index 12d19df..5774cd3 100644 --- a/plugins/org.eclipse.jem.ui/plugin.xml +++ b/plugins/org.eclipse.jem.ui/plugin.xml
@@ -25,8 +25,6 @@ <import plugin="org.eclipse.jdt.debug.ui"/> <import plugin="com.ibm.wtp.common.util"/> <import plugin="org.eclipse.jem.workbench"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.osgi"/> </requires> @@ -72,8 +70,8 @@ label="%Action.proxyLaunch" pulldown="true" icon="icons/full/ctool16/run_exc.gif" - class="org.eclipse.jem.internal.ui.proxy.ProxyLaunchToolbarDelegate" tooltip="%Action.proxyLaunchTip" + class="org.eclipse.jem.internal.ui.proxy.ProxyLaunchToolbarDelegate" toolbarPath="org.eclipse.debug.ui.launchActionSet/proxyLaunch" id="org.eclipse.jem.ui.proxy.ProxyLaunchToolbarDelegateAction"> </action> @@ -97,8 +95,8 @@ <action label="%Action.proxyLaunch" icon="icons/full/ctool16/run_exc.gif" - class="org.eclipse.jem.internal.ui.proxy.ProxyLaunchMenuDelegate" tooltip="%Action.proxyLaunchTip" + class="org.eclipse.jem.internal.ui.proxy.ProxyLaunchMenuDelegate" menubarPath="org.eclipse.ui.run/" id="org.eclipse.jem.ui.proxy.ProxyLaunchMenuDelegateAction"> </action>
diff --git a/plugins/org.eclipse.jem.workbench/plugin.xml b/plugins/org.eclipse.jem.workbench/plugin.xml index fb9139f..7b2f9f8 100644 --- a/plugins/org.eclipse.jem.workbench/plugin.xml +++ b/plugins/org.eclipse.jem.workbench/plugin.xml
@@ -20,8 +20,6 @@ <import plugin="org.eclipse.jem.proxy"/> <import plugin="com.ibm.wtp.common.util"/> <import plugin="com.ibm.wtp.emf.workbench"/> - <import plugin="org.eclipse.core.runtime"/> - <import plugin="org.eclipse.osgi"/> </requires>
diff --git a/plugins/org.eclipse.jem/plugin.xml b/plugins/org.eclipse.jem/plugin.xml index a46e8a8..6968031 100644 --- a/plugins/org.eclipse.jem/plugin.xml +++ b/plugins/org.eclipse.jem/plugin.xml
@@ -18,11 +18,8 @@ </runtime> <requires> <import plugin="org.eclipse.emf.ecore.xmi"/> - <import plugin="org.eclipse.osgi"/> <import plugin="com.ibm.wtp.common.util"/> <import plugin="org.eclipse.jem.proxy" optional="true"/> - <import plugin="org.eclipse.core.runtime.compatibility"/> - <import plugin="org.eclipse.core.runtime"/> </requires>