From e252b52eb349eb010b62016b82739bdd8e06c49f Mon Sep 17 00:00:00 2001
From: Jan Bartel <janb@intalio.com>
Date: Sat, 12 Apr 2014 09:11:04 +1000
Subject: [PATCH] 432483 make osgi.serviceloader support for
 javax.servlet.ServletContainerInitializer optional (cherry picked from commit
 31043d25708edbea9ef31948093f4eaf2247919b)

Conflicts:
	jetty-annotations/pom.xml
---
 jetty-annotations/pom.xml          | 4 ++--
 jetty-osgi/jetty-osgi-boot/pom.xml | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/jetty-annotations/pom.xml b/jetty-annotations/pom.xml
index 80ba3aa246a..bb6d838321c 100644
--- a/jetty-annotations/pom.xml
+++ b/jetty-annotations/pom.xml
@@ -43,8 +43,8 @@
             </goals>
             <configuration>
               <instructions>
-                <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",*</Import-Package>
-                <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)"</Require-Capability>
+                <Import-Package>javax.servlet.*;version="[2.6.0,3.2)",org.objectweb.asm.*;version=4,*</Import-Package>
+                <Require-Capability>osgi.serviceloader; filter:="(osgi.serviceloader=javax.servlet.ServletContainerInitializer)";resolution:=optional;cardinality:=multiple, osgi.extender; filter:="(osgi.extender=osgi.serviceloader.processor)"</Require-Capability>
               </instructions>
             </configuration>
           </execution>
diff --git a/jetty-osgi/jetty-osgi-boot/pom.xml b/jetty-osgi/jetty-osgi-boot/pom.xml
index 0c1dbf56790..a52ebfabcd2 100644
--- a/jetty-osgi/jetty-osgi-boot/pom.xml
+++ b/jetty-osgi/jetty-osgi-boot/pom.xml
@@ -102,7 +102,6 @@
                     <instructions>
                         <Bundle-SymbolicName>org.eclipse.jetty.osgi.boot;singleton:=true</Bundle-SymbolicName>
                         <Bundle-Activator>org.eclipse.jetty.osgi.boot.JettyBootstrapActivator</Bundle-Activator>
-                        <Provide-Capability>osgi.serviceloader; osgi.serviceloader=javax.servlet.ServletContainerInitializer</Provide-Capability> 
                         <DynamicImport-Package>org.eclipse.jetty.*;version="[9.1,10.0)"</DynamicImport-Package>
                         <Import-Package>javax.mail;version="1.4.0";resolution:=optional,
  javax.mail.event;version="1.4.0";resolution:=optional,