Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2017-05-15 20:28:05 +0000
committerMarkus Knauer2017-05-15 21:47:00 +0000
commitef90a6d061199abc502669db5640a2966b54da39 (patch)
tree1a164c067d7ad4c243e6dd2c583fbac8a72b30a7
parent7b90c930f90ebbe9e038d5fa13c13f9ebfbd1cf5 (diff)
downloadorg.eclipse.rap-ef90a6d061199abc502669db5640a2966b54da39.tar.gz
org.eclipse.rap-ef90a6d061199abc502669db5640a2966b54da39.tar.xz
org.eclipse.rap-ef90a6d061199abc502669db5640a2966b54da39.zip
[e4] Fix compile problems for Eclipse Oxygen
- Use 0.15 of org.eclipse.e4.core.di.extensions - Add org.eclipse.e4.core.di.extensions.supplier bundle - Update EventUtils package name - Remove version constraint from org.w3c.dom.css Change-Id: Ife41e1b1ec629eeed55183a31ad3f6253c5433f1 Signed-off-by: Markus Knauer <mknauer@eclipsesource.com>
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF2
-rw-r--r--bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF3
-rw-r--r--bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPEventObjectSupplier.java2
4 files changed, 5 insertions, 4 deletions
diff --git a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF
index cbbdef3783..76c7717125 100644
--- a/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.workbench.renderers.swt/META-INF/MANIFEST.MF
@@ -32,5 +32,5 @@ Export-Package: org.eclipse.e4.ui.internal.workbench.renderers.swt;x-friends:="o
Bundle-ActivationPolicy: lazy
Import-Package: javax.annotation;version="1.0.0",
javax.inject;version="1.0.0",
- org.w3c.dom.css;version="2.0.0"
+ org.w3c.dom.css
Bundle-Activator: org.eclipse.e4.ui.internal.workbench.renderers.swt.SWTRenderersActivator
diff --git a/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
index db9c90e1d3..c6bcc80b9f 100644
--- a/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.workbench.swt/META-INF/MANIFEST.MF
@@ -46,6 +46,6 @@ Import-Package: com.ibm.icu.text;version="4.2.1",
org.osgi.framework;version="1.5.0",
org.osgi.service.packageadmin;version="1.2.0",
org.osgi.util.tracker;version="1.4.0",
- org.w3c.dom.css;version="2.0.0"
+ org.w3c.dom.css
Service-Component: OSGI-INF/testableobject.xml, OSGI-INF/statusreporter.xml,
OSGI-INF/menuservice.xml
diff --git a/bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF b/bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF
index 9bff028daa..98578df824 100644
--- a/bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.rap.e4/META-INF/MANIFEST.MF
@@ -14,7 +14,8 @@ Require-Bundle: org.eclipse.rap.rwt,
org.eclipse.e4.core.services,
org.eclipse.osgi.services;bundle-version="3.4.0",
org.eclipse.e4.ui.di,
- org.eclipse.e4.core.di.extensions;bundle-version="0.12.0",
+ org.eclipse.e4.core.di.extensions;bundle-version="0.15.0",
+ org.eclipse.e4.core.di.extensions.supplier;bundle-version="0.15.0",
org.eclipse.equinox.preferences,
org.eclipse.equinox.common;bundle-version="3.6.200"
Export-Package: org.eclipse.rap.e4,
diff --git a/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPEventObjectSupplier.java b/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPEventObjectSupplier.java
index 590a59ba49..24874338cc 100644
--- a/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPEventObjectSupplier.java
+++ b/bundles/org.eclipse.rap.e4/src/org/eclipse/rap/e4/internal/RAPEventObjectSupplier.java
@@ -17,7 +17,7 @@ import javax.inject.Named;
import org.eclipse.e4.core.di.IInjector;
import org.eclipse.e4.core.di.InjectionException;
import org.eclipse.e4.core.di.extensions.EventTopic;
-import org.eclipse.e4.core.di.extensions.EventUtils;
+import org.eclipse.e4.core.di.internal.extensions.util.EventUtils;
import org.eclipse.e4.core.di.suppliers.ExtendedObjectSupplier;
import org.eclipse.e4.core.di.suppliers.IObjectDescriptor;
import org.eclipse.e4.core.di.suppliers.IRequestor;

Back to the top