diff options
3 files changed, 3 insertions, 21 deletions
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 3f61442e7e4..8fad9a48376 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,22 +45,6 @@ public class RestrictedBundleContext implements BundleContext { } @Override - public <S> ServiceObjects<S> getServiceObjects(ServiceReference<S> serviceReference) { - if (wrapped == null) { - return null; - } - return wrapped.getServiceObjects(serviceReference); - } - - @Override - public <S> ServiceRegistration<S> registerService(Class<S> aClass, ServiceFactory<S> serviceFactory, Dictionary<String, ?> dictionary) { - if (wrapped == null) { - return null; - } - return wrapped.registerService(aClass, serviceFactory, dictionary); - } - - @Override public ServiceReference<?>[] getServiceReferences(String localHostname, String localHostname2) throws InvalidSyntaxException { if (wrapped == null) { return new ServiceReference<?>[0]; @@ -71,7 +71,7 @@ <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> - <version>3.3.0</version> + <version>2.4.0</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> @@ -767,7 +767,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.framework</artifactId> - <version>4.6.1</version> + <version>4.2.1</version> </dependency> <dependency> <groupId>org.apache.felix</groupId> @@ -777,7 +777,7 @@ <dependency> <groupId>org.apache.felix</groupId> <artifactId>org.apache.felix.main</artifactId> - <version>4.6.1</version> + <version>4.2.1</version> </dependency> <dependency> <groupId>org.apache.httpcomponents</groupId> 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 3f3164a6059..5a41462cb48 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 @@ -198,8 +198,6 @@ 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; } } |