From f615f94671616fb91e27da3fb395afb5f7325021 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 --- .../org.eclipse.xtend.lib.macro/META-INF/MANIFEST.MF | 8 ++++---- plugins/org.eclipse.xtend.lib/META-INF/MANIFEST.MF | 2 +- plugins/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF | 3 ++- plugins/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF | 7 ++++--- plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF | 11 ++++++----- 5 files changed, 17 insertions(+), 14 deletions(-) diff --git a/plugins/org.eclipse.xtend.lib.macro/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtend.lib.macro/META-INF/MANIFEST.MF index bfbb38fbdbe..67f9e9114bc 100644 --- a/plugins/org.eclipse.xtend.lib.macro/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtend.lib.macro/META-INF/MANIFEST.MF @@ -5,12 +5,12 @@ Bundle-Name: Xtend Macro Interfaces Bundle-Vendor: Eclipse Xtend Bundle-Version: 2.9.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Export-Package: org.eclipse.xtend.lib.macro;version="2.9.0";uses:="org.eclipse.xtend.lib.macro.services,org.eclipse.xtend.lib.macro.declaration,org.eclipse.xtend.lib.macro.file", +Export-Package: org.eclipse.xtend.lib.macro;version="2.9.0";uses:="org.eclipse.xtend.lib.macro.file,org.eclipse.xtend.lib.macro.services,org.eclipse.xtend.lib.macro.declaration", org.eclipse.xtend.lib.macro.declaration;version="2.9.0"; - uses:="org.eclipse.xtend2.lib, + uses:="org.eclipse.xtend.lib.macro.file, + org.eclipse.xtend2.lib, org.eclipse.xtend.lib.macro.expression, - org.eclipse.xtext.xbase.lib, - org.eclipse.xtend.lib.macro.file", + org.eclipse.xtext.xbase.lib", org.eclipse.xtend.lib.macro.expression;version="2.9.0";uses:="org.eclipse.xtend.lib.macro.declaration", org.eclipse.xtend.lib.macro.file;version="2.9.0", org.eclipse.xtend.lib.macro.services;version="2.9.0";uses:="org.eclipse.xtend.lib.macro.declaration,org.eclipse.xtext.xbase.lib" diff --git a/plugins/org.eclipse.xtend.lib/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtend.lib/META-INF/MANIFEST.MF index 5532809f183..5c164de9bfa 100644 --- a/plugins/org.eclipse.xtend.lib/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtend.lib/META-INF/MANIFEST.MF @@ -6,6 +6,6 @@ Bundle-Vendor: Eclipse Xtend Bundle-Version: 2.9.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.xtend.lib;version="2.9.0";uses:="org.eclipse.xtend.lib.macro.declaration,org.eclipse.xtend.lib.macro", - org.eclipse.xtend.lib.annotations;version="2.9.0";uses:="org.eclipse.xtend.lib.macro.declaration,org.eclipse.xtend.lib.macro" + org.eclipse.xtend.lib.annotations;version="2.9.0";uses:="org.eclipse.xtend.lib.macro.declaration,org.eclipse.xtend2.lib,org.eclipse.xtend.lib.macro" Require-Bundle: org.eclipse.xtext.xbase.lib;visibility:=reexport, org.eclipse.xtend.lib.macro;visibility:=reexport diff --git a/plugins/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF index 67870b8250e..b1473b55cda 100644 --- a/plugins/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtend.m2e/META-INF/MANIFEST.MF @@ -9,8 +9,9 @@ Require-Bundle: org.eclipse.m2e.core;bundle-version="1.0.0";resolution:=optional org.eclipse.core.resources;bundle-version="3.6.0", org.eclipse.equinox.registry;bundle-version="3.4.0", org.eclipse.xtext.ui, - org.eclipse.m2e.maven.runtime;bundle-version="1.0.0";resolution:=optional, org.eclipse.xtext.builder, org.eclipse.xtend.core Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.xtend.m2e;x-internal:=true +Import-Package: org.apache.maven.plugin;resolution:=optional, + org.apache.maven.project;resolution:=optional diff --git a/plugins/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF index 564429a5f6e..89d1ea65d1d 100644 --- a/plugins/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.xtext.m2e/META-INF/MANIFEST.MF @@ -8,10 +8,11 @@ Bundle-Vendor: %providerName Require-Bundle: org.eclipse.m2e.core;bundle-version="1.0.0";resolution:=optional, org.eclipse.core.resources;bundle-version="3.6.0", org.eclipse.equinox.registry;bundle-version="3.4.0", - org.eclipse.xtext.ui, - org.eclipse.m2e.maven.runtime;bundle-version="1.0.0";resolution:=optional, org.eclipse.xtext.xbase.lib, org.eclipse.xtend.lib, - org.eclipse.xtext.builder + org.eclipse.xtext.builder, + org.eclipse.xtext.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Export-Package: org.eclipse.xtext.m2e;x-internal:=true +Import-Package: org.apache.maven.plugin;resolution:=optional, + org.apache.maven.project;resolution:=optional diff --git a/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF b/plugins/org.eclipse.xtext.util/META-INF/MANIFEST.MF index e20c3fb28a4..477b90eeaa0 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, + uses:="org.eclipse.emf.ecore.resource, + org.apache.log4j, + org.eclipse.emf.common.util, com.google.common.base, - com.google.inject, org.eclipse.emf.common.notify, - org.eclipse.emf.ecore.resource, - org.apache.log4j, 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"