From 9c9942c0e71dabd7ba973237617c73e14db0b6d9 Mon Sep 17 00:00:00 2001 From: Christoph Rueger Date: Mon, 7 Oct 2024 21:27:08 +0200 Subject: [PATCH] Revert "make 'auto' the new default" This reverts commit bca02d08abd36e9ee797cb9a95340e6c2bc91884. Signed-off-by: Christoph Rueger --- .../src/aQute/bnd/osgi/metainf/MetaInfServiceParser.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) 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 9c5c5eb7c55..40194f711a9 100644 --- a/biz.aQute.bndlib/src/aQute/bnd/osgi/metainf/MetaInfServiceParser.java +++ b/biz.aQute.bndlib/src/aQute/bnd/osgi/metainf/MetaInfServiceParser.java @@ -39,11 +39,6 @@ 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; } } @@ -85,6 +80,6 @@ private void doAnnotationsforMetaInf(Analyzer analyzer, Implementation impl, Str } private String strategy(Analyzer analyzer) { - return analyzer.getProperty(METAINF_SERVICES, METAINF_SERVICES_STRATEGY_AUTO); + return analyzer.getProperty(METAINF_SERVICES, METAINF_SERVICES_STRATEGY_ANNOTATION); } }