From 162eb7d182183f021a63cbf22ad6daf540f1f630 Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Mon, 7 Oct 2024 20:21:01 +0200 Subject: [PATCH] make 'auto' the new default and also addClasspathDefault(ServiceProvider.class) for 'auto' and 'annotation' Signed-off-by: Christoph Rueger --- .../src/aQute/bnd/osgi/metainf/MetaInfServiceParser.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/biz.aQute.bndlib/src/aQute/bnd/osgi/metainf/MetaInfServiceParser.java b/biz.aQute.bndlib/src/aQute/bnd/osgi/metainf/MetaInfServiceParser.java index 40194f711a..9c5c5eb7c5 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/metainf/MetaInfServiceParser.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/metainf/MetaInfServiceParser.java @@ -39,6 +39,11 @@ public boolean analyzeJar(Analyzer analyzer) throws Exception { return false; case METAINF_SERVICES_STRATEGY_AUTO : { analyzer.addClasspathDefault(ServiceProvider.class); + break; + } + case METAINF_SERVICES_STRATEGY_ANNOTATION : { + analyzer.addClasspathDefault(ServiceProvider.class); + // break; } } @@ -80,6 +85,6 @@ private void doAnnotationsforMetaInf(Analyzer analyzer, Implementation impl, Str } private String strategy(Analyzer analyzer) { - return analyzer.getProperty(METAINF_SERVICES, METAINF_SERVICES_STRATEGY_ANNOTATION); + return analyzer.getProperty(METAINF_SERVICES, METAINF_SERVICES_STRATEGY_AUTO); } }