update to latest osgi-mock
diff --git a/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
index a220299..2518527 100644
--- a/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
+++ b/core/src/main/java/org/apache/sling/testing/mock/sling/ResourceResolverFactoryInitializer.java
@@ -34,7 +34,6 @@
import org.apache.sling.resourceresolver.impl.ResourceResolverFactoryActivator;
import org.apache.sling.serviceusermapping.ServiceUserMapper;
import org.apache.sling.serviceusermapping.impl.ServiceUserMapperImpl;
-import org.apache.sling.spi.resource.provider.ResourceProvider;
import org.apache.sling.testing.mock.osgi.MockEventAdmin;
import org.apache.sling.testing.mock.osgi.MockOsgi;
import org.jetbrains.annotations.NotNull;
@@ -122,9 +121,7 @@
private static void initializeJcrResourceProvider(@NotNull BundleContext bundleContext) {
Dictionary<String, Object> config = new Hashtable<>();
JcrResourceProvider provider = new JcrResourceProvider();
- MockOsgi.injectServices(provider, bundleContext);
- MockOsgi.activate(provider, bundleContext, config);
- bundleContext.registerService(ResourceProvider.class, provider, config);
+ MockOsgi.registerInjectActivateService(provider, bundleContext, config);
}
/**
@@ -193,9 +190,7 @@
private static <T> void registerServiceIfNotPresent(@NotNull BundleContext bundleContext, @NotNull Class<T> serviceClass,
@NotNull T instance, Dictionary<String, Object> config) {
if (bundleContext.getServiceReference(serviceClass.getName()) == null) {
- MockOsgi.injectServices(instance, bundleContext);
- MockOsgi.activate(instance, bundleContext, config);
- bundleContext.registerService(serviceClass, instance, config);
+ MockOsgi.registerInjectActivateService(instance, bundleContext, config);
}
}
diff --git a/parent/pom.xml b/parent/pom.xml
index 81c1bee..0771563 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -35,7 +35,7 @@
<description>Mock implementation of selected Sling APIs.</description>
<properties>
- <osgi-mock.version>3.1.4</osgi-mock.version>
+ <osgi-mock.version>3.1.5-SNAPSHOT</osgi-mock.version>
<jcr-mock.version>1.5.4</jcr-mock.version>
<resourceresolver-mock.version>1.2.2</resourceresolver-mock.version>
<logging-mock.version>2.0.0</logging-mock.version>
