From c316cf1cfe08db1628e5d80d4183e082b7056aab Mon Sep 17 00:00:00 2001
From: Mat Booth <mbooth@apache.org>
Date: Tue, 3 Apr 2018 03:25:50 +0100
Subject: [PATCH] Make the requirement on "osgi.serviceloader.processor"
 optional (#2377)

This allows Eclipse to continue to make use of jetty-* bundles
without requiring the presence of Apache Aries.

This fixes a problem introduced by the resolution to #2164 and
the same solution is used as in 10cdf16

See also the discussion at Eclipse:
https://bugs.eclipse.org/bugs/show_bug.cgi?id=532294

Signed-off-by: Mat Booth <mat.booth@redhat.com>
---
 jetty-util/pom.xml | 2 +-
 jetty-xml/pom.xml  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jetty-util/pom.xml b/jetty-util/pom.xml
index 5813e02d52b..936d545aa57 100644
--- a/jetty-util/pom.xml
+++ b/jetty-util/pom.xml
@@ -50,7 +50,7 @@
         <extensions>true</extensions>
         <configuration>
           <instructions>
-            <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.util.security.CredentialProvider)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)"</Require-Capability>
+            <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.util.security.CredentialProvider)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional</Require-Capability>
           </instructions>
         </configuration>
       </plugin>
diff --git a/jetty-xml/pom.xml b/jetty-xml/pom.xml
index 15cefddcaab..43b8ddbc848 100644
--- a/jetty-xml/pom.xml
+++ b/jetty-xml/pom.xml
@@ -27,7 +27,7 @@
         <extensions>true</extensions>
             <configuration>
               <instructions>
-                <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.xml.ConfigurationProcessorFactory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)"</Require-Capability>
+                <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=org.eclipse.jetty.xml.ConfigurationProcessorFactory)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)";resolution:=optional</Require-Capability>
               </instructions>
             </configuration>
       </plugin>