From bebd1287b80bb1facf8649eb8fcb9dc0a44efb52 Mon Sep 17 00:00:00 2001 From: Dennis Huebner Date: Mon, 24 Aug 2015 15:48:07 +0200 Subject: [PATCH] [osgi] xtext.m2e and xtend.m2e can not be started Package uses conflict: Require-Bundle: org.eclipse.xtext.ui; bundle-version="0.0.0" Because m2e.maven.runtime exports com.google.inject 1.4 and we consume juice 3 (com.google.inject 1.3.0), both package 1.3 and 1.4 were accessible in org.eclipse.xtext.m2e. The uses Directive in xtext.util for com.google.inject finally causes the 'uses' diagnosis to fail. Fixed the issue by changing from require bundle to package import. Instead requiring the whole huge m2e.maven.runtime we import just the two packages we need. Signed-off-by: Dennis Huebner --- plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF index e20c3fb28..477b90eea 100644 --- a/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF @@ -7,14 +7,15 @@ Bundle-Version: 2.9.0.qualifier Bundle-Vendor: %providerName Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.xtext.util; - uses:="org.eclipse.emf.ecore, - com.google.common.base, - com.google.inject, - org.eclipse.emf.common.notify, - org.eclipse.emf.ecore.resource, + uses:="org.eclipse.emf.ecore.resource, org.apache.log4j, + org.eclipse.emf.common.util, + com.google.common.base, + org.eclipse.emf.common.notify, org.eclipse.xtext.util.concurrent, - org.eclipse.emf.ecore.util", + org.eclipse.emf.ecore.util, + org.eclipse.emf.ecore, + com.google.inject", org.eclipse.xtext.util.concurrent;uses:="org.eclipse.xtext.util", org.eclipse.xtext.util.formallang;x-internal:=true, org.eclipse.xtext.util.internal;x-friends:="org.eclipse.xtext.xtext.generator,org.eclipse.xtend.ide"