Upgrade Felix to 6.0.1

- Exclude artifact that is not needed nor provided runtime.

2 files changed, 14 insertions, 0 deletions

diff --git a/jdisc_core/pom.xml b/jdisc_core/pom.xml
index f0f293ac3b7..3268029eef3 100644
--- a/jdisc_core/pom.xml
+++ b/jdisc_core/pom.xml
@@ -112,6 +112,12 @@
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.framework</artifactId>
             <scope>compile</scope>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>animal-sniffer-annotations</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.felix</groupId>
diff --git a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java
index e72df8fc7e1..d774b857b49 100644
--- a/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java
+++ b/jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java
@@ -6,7 +6,9 @@ import org.osgi.framework.Bundle;
 import org.osgi.framework.ServiceReference;
 import org.osgi.service.log.LogService;
 
+import java.util.Dictionary;
 import java.util.HashMap;
+import java.util.Hashtable;
 import java.util.Map;
 import java.util.logging.Handler;
 import java.util.logging.Level;
@@ -160,5 +162,11 @@ class OsgiLogHandler extends Handler {
         public int compareTo(Object o) {
             return 0;
         }
+
+        @Override
+        public Dictionary<String, Object> getProperties() {
+            return new Hashtable<>();
+        }
+
     }
 }