This is an automated email from the ASF dual-hosted git repository.

ghenzler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git

commit d53c738140e14a9ce34e374169e125f2403e3321
Author: georg.henzler <georg.henz...@netcentric.biz>
AuthorDate: Tue Jun 30 08:42:21 2020 +0200

    FELIX-6289 Make Servlet API optional
---
 healthcheck/core/bnd.bnd | 5 ++++-
 healthcheck/core/pom.xml | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/healthcheck/core/bnd.bnd b/healthcheck/core/bnd.bnd
index 44ae747..ceba184 100644
--- a/healthcheck/core/bnd.bnd
+++ b/healthcheck/core/bnd.bnd
@@ -8,7 +8,10 @@ Bundle-License: Apache License, Version 2.0
 
 Bundle-Vendor: The Apache Software Foundation
 
-Import-Package: org.quartz*;resolution:="optional", *
+Import-Package:\
+  org.quartz*;resolution:=optional,\
+  javax.servlet*;resolution:=optional,\
+  *
 
 Conditional-Package: org.apache.felix.utils.*
 
diff --git a/healthcheck/core/pom.xml b/healthcheck/core/pom.xml
index 6363f32..283cb73 100644
--- a/healthcheck/core/pom.xml
+++ b/healthcheck/core/pom.xml
@@ -177,6 +177,8 @@
             <artifactId>javax.servlet-api</artifactId>
             <version>3.1.0</version>
             <scope>provided</scope>
+            <!-- servlet api optional: only add configs for servlets/filters 
your setup includes the servlet runtime! -->
+            <optional>true</optional>
         </dependency>
 
         <!-- used for JSONWriter, included in bundle via Conditional-Package 
-->

Reply via email to