From 9fe642e318107f0478f43f53256f18bf45326581 Mon Sep 17 00:00:00 2001 From: Mark Hoffmann Date: Thu, 15 Feb 2024 16:16:07 +0100 Subject: [PATCH 1/2] fixes #6033 - Added EXPORT mode - Tested the export Signed-off-by: Mark Hoffmann --- bndtools.m2e/src/bndtools/m2e/MavenRunProvider.java | 1 + 1 file changed, 1 insertion(+) diff --git a/bndtools.m2e/src/bndtools/m2e/MavenRunProvider.java b/bndtools.m2e/src/bndtools/m2e/MavenRunProvider.java index 7569e6130a..580cad28f3 100644 --- a/bndtools.m2e/src/bndtools/m2e/MavenRunProvider.java +++ b/bndtools.m2e/src/bndtools/m2e/MavenRunProvider.java @@ -121,6 +121,7 @@ private Bndrun create0(IResource targetResource, IMavenProjectFacade projectFaca switch (mode) { case LAUNCH : case EDIT : + case EXPORT : case SOURCES : if ((mojoExecution = getBndResolverMojoExecution(maven, projectFacade, bndrunMatchs, monitor)) != null) { From 4d4d94ab5a13f42ffd1ddb738c9c3001d6ba9d7f Mon Sep 17 00:00:00 2001 From: Mark Hoffmann Date: Fri, 16 Feb 2024 11:53:15 +0100 Subject: [PATCH 2/2] fixes #6036 - added target PACKAGE Signed-off-by: Mark Hoffmann --- .../src/aQute/bnd/annotation/spi/ServiceProviders.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/biz.aQute.bnd.annotation/src/aQute/bnd/annotation/spi/ServiceProviders.java b/biz.aQute.bnd.annotation/src/aQute/bnd/annotation/spi/ServiceProviders.java index 287e5f9cbd..f115f61f28 100644 --- a/biz.aQute.bnd.annotation/src/aQute/bnd/annotation/spi/ServiceProviders.java +++ b/biz.aQute.bnd.annotation/src/aQute/bnd/annotation/spi/ServiceProviders.java @@ -1,5 +1,6 @@ package aQute.bnd.annotation.spi; +import static java.lang.annotation.ElementType.PACKAGE; import static java.lang.annotation.ElementType.TYPE; import static java.lang.annotation.RetentionPolicy.CLASS; @@ -7,7 +8,9 @@ import java.lang.annotation.Target; @Retention(CLASS) -@Target(TYPE) +@Target({ + PACKAGE, TYPE +}) public @interface ServiceProviders { ServiceProvider[] value(); }