Upgrade felix from 4.4 to 4.6

3 files changed, 13 insertions, 1 deletions

diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml
index 008062a64e0..912ccf7e963 100644
--- a/container-dependency-versions/pom.xml
+++ b/container-dependency-versions/pom.xml
@@ -435,7 +435,7 @@
 
     <properties>
         <bouncycastle.version>1.58</bouncycastle.version>
-        <felix.version>4.4.1</felix.version>
+        <felix.version>4.6.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/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java b/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java
index 313e26ba8d4..c9cc8dfdfa4 100644
--- a/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java
+++ b/container-disc/src/main/java/com/yahoo/container/jdisc/RestrictedBundleContext.java
@@ -45,6 +45,11 @@ public class RestrictedBundleContext implements BundleContext {
     }
 
     @Override
+    public <S> ServiceRegistration<S> registerService(Class<S> aClass, ServiceFactory<S> serviceFactory, Dictionary<String, ?> dictionary) {
+        return null;
+    }
+
+    @Override
     public ServiceReference<?>[] getServiceReferences(String localHostname, String localHostname2) throws InvalidSyntaxException {
         if (wrapped == null) {
             return new ServiceReference<?>[0];
@@ -100,6 +105,11 @@ public class RestrictedBundleContext implements BundleContext {
         return wrapped.ungetService(serviceReference);
     }
 
+    @Override
+    public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> serviceReference) {
+        return null;
+    }
+
 
     //---------------------
 
diff --git a/standalone-container/src/main/scala/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.scala b/standalone-container/src/main/scala/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.scala
index 02ff2c60ce6..ac8636de2cb 100644
--- a/standalone-container/src/main/scala/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.scala
+++ b/standalone-container/src/main/scala/com/yahoo/application/container/impl/ClassLoaderOsgiFramework.scala
@@ -199,6 +199,8 @@ final class ClassLoaderOsgiFramework extends OsgiFramework {
     override def getDataFile(filename: String) = throw new UnsupportedOperationException
     override def createFilter(filter: String) = throw new UnsupportedOperationException
 
+    override def registerService[S](aClass: Class[S], serviceFactory: ServiceFactory[S], dictionary: Dictionary[String, _]): ServiceRegistration[S] = throw new UnsupportedOperationException
+    override def getServiceObjects[S](serviceReference: ServiceReference[S]): ServiceObjects[S] = throw new UnsupportedOperationException
   }
 
 }