From 1428d2e6030b3ff9b606a87d69bdaeffbace8bad Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@webtide.com>
Date: Fri, 18 Jun 2021 09:55:04 +1000
Subject: [PATCH] Issue #6418 jetty-webapp incorrect osgi manifest for
 serviceloader (#6422)

Signed-off-by: Jan Bartel <janb@webtide.com>
---
 jetty-webapp/pom.xml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/jetty-webapp/pom.xml b/jetty-webapp/pom.xml
index e379a40619db..a5d83ac59c08 100644
--- a/jetty-webapp/pom.xml
+++ b/jetty-webapp/pom.xml
@@ -54,8 +54,11 @@
         <configuration>
           <instructions>
             <Require-Capability>
-              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.webapp.Configuration)";cardinality:=multiple
+              osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)", osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.webapp.Configuration)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.registrar)"
             </Require-Capability>
+            <Provide-Capability>
+              osgi.serviceloader; osgi.serviceloader=org.eclipse.jetty.webapp.Configuration
+            </Provide-Capability>
           </instructions>
         </configuration>
       </plugin>