[sling-whiteboard] branch master updated: Convert Feature Service and Whitelister into framework extension

[davidb]

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

davidb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


The following commit(s) were added to refs/heads/master by this push:
     new 46874f7  Convert Feature Service and Whitelister into framework 
extension
46874f7 is described below

commit 46874f759f67bc71cb58b66a608518dd9b43edb7
Author: David Bosschaert <david.bosscha...@gmail.com>
AuthorDate: Fri Jul 13 10:17:18 2018 +0200

    Convert Feature Service and Whitelister into framework extension
    
    This so that they are always present early in the process
---
 featuremodel/feature-service/pom.xml                              | 3 ++-
 featuremodel/feature-whitelist/pom.xml                            | 8 ++------
 .../org/apache/sling/feature/whitelist/impl/ResolverHookImpl.java | 2 +-
 .../apache/sling/feature/whitelist/impl/WhitelistEnforcer.java    | 4 +---
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/featuremodel/feature-service/pom.xml 
b/featuremodel/feature-service/pom.xml
index 35fdcb4..82e798d 100644
--- a/featuremodel/feature-service/pom.xml
+++ b/featuremodel/feature-service/pom.xml
@@ -42,7 +42,8 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        
<Bundle-Activator>org.apache.sling.feature.service.impl.Activator</Bundle-Activator>
+                        
<ExtensionBundle-Activator>org.apache.sling.feature.service.impl.Activator</ExtensionBundle-Activator>
+                        
<Fragment-Host>system.bundle;extension:=framework</Fragment-Host>
                     </instructions>
                 
                     <!--  Skip baselining for 0.x version -->
diff --git a/featuremodel/feature-whitelist/pom.xml 
b/featuremodel/feature-whitelist/pom.xml
index 7840f27..6402ca9 100644
--- a/featuremodel/feature-whitelist/pom.xml
+++ b/featuremodel/feature-whitelist/pom.xml
@@ -42,7 +42,8 @@
                 <extensions>true</extensions>
                 <configuration>
                     <instructions>
-                        
<Bundle-Activator>org.apache.sling.feature.whitelist.impl.Activator</Bundle-Activator>
+                        
<ExtensionBundle-Activator>org.apache.sling.feature.whitelist.impl.Activator</ExtensionBundle-Activator>
+                        
<Fragment-Host>system.bundle;extension:=framework</Fragment-Host>
                     </instructions>
                 
                     <!--  Skip baselining for 0.x version -->
@@ -82,11 +83,6 @@
             <artifactId>osgi.cmpn</artifactId>
             <scope>provided</scope>
         </dependency>        
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
 
         <!-- Testing -->
         <dependency>
diff --git 
a/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/ResolverHookImpl.java
 
b/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/ResolverHookImpl.java
index 0637ec1..9f57a43 100644
--- 
a/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/ResolverHookImpl.java
+++ 
b/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/ResolverHookImpl.java
@@ -73,7 +73,7 @@ class ResolverHookImpl implements ResolverHook {
 
             // The Feature Service could not be found, skip candidate pruning
             if (fs == null) {
-                WhitelistEnforcer.LOG.warn("Could not obtain the feature 
service, no whitelist enforcement");
+                // WhitelistEnforcer.LOG.warn("Could not obtain the feature 
service, no whitelist enforcement");
                 return;
             }
 
diff --git 
a/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/WhitelistEnforcer.java
 
b/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/WhitelistEnforcer.java
index 3e5b550..f6fa331 100644
--- 
a/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/WhitelistEnforcer.java
+++ 
b/featuremodel/feature-whitelist/src/main/java/org/apache/sling/feature/whitelist/impl/WhitelistEnforcer.java
@@ -24,13 +24,11 @@ import org.osgi.framework.hooks.resolver.ResolverHook;
 import org.osgi.framework.hooks.resolver.ResolverHookFactory;
 import org.osgi.framework.wiring.BundleRevision;
 import org.osgi.util.tracker.ServiceTracker;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import java.util.Collection;
 
 class WhitelistEnforcer implements ResolverHookFactory {
-    static final Logger LOG = LoggerFactory.getLogger(WhitelistEnforcer.class);
+    // static final Logger LOG = 
LoggerFactory.getLogger(WhitelistEnforcer.class);
 
     final ServiceTracker<Features, Features> featureServiceTracker;
     final WhitelistService whitelistService;