diff options
| -rw-r--r-- | container-dependency-versions/pom.xml | 2 | ||||
| -rw-r--r-- | jdisc_core/pom.xml | 6 | ||||
| -rw-r--r-- | jdisc_core/src/main/java/com/yahoo/jdisc/core/OsgiLogHandler.java | 8 |
3 files changed, 15 insertions, 1 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index fe37c08a947..f1bc9b88b3a 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -461,7 +461,7 @@ <apache.httpclient.version>4.4.1</apache.httpclient.version> <apache.httpcore.version>4.4.1</apache.httpcore.version> <bouncycastle.version>1.58</bouncycastle.version> - <felix.version>5.6.10</felix.version> + <felix.version>6.0.1</felix.version> <findbugs.version>1.3.9</findbugs.version> <guava.version>18.0</guava.version> <guice.version>3.0</guice.version> 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<>(); + } + } } |