This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-commons-metrics.git
commit b945e6633d8cd06027399674c7faf55b0b911d0f Author: Chetan Mehrotra <[email protected]> AuthorDate: Thu Nov 17 05:08:12 2016 +0000 SLING-5443 - Review the naming conventions used by JMXReporter to register the Metric MBeans Update the osgi-mock version to make use of ServiceFactory support git-svn-id: https://svn.apache.org/repos/asf/sling/trunk@1770118 13f79535-47bb-0310-9956-ffa450edef68 --- pom.xml | 10 +++++----- .../sling/commons/metrics/internal/MetricServiceTest.java | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 8ca2ac8..3a45b75 100644 --- a/pom.xml +++ b/pom.xml @@ -90,14 +90,14 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.core</artifactId> - <version>4.3.1</version> + <artifactId>osgi.core</artifactId> + <version>6.0.0</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>org.osgi.compendium</artifactId> - <version>4.3.1</version> + <artifactId>osgi.cmpn</artifactId> + <version>6.0.0</version> <scope>provided</scope> </dependency> @@ -134,7 +134,7 @@ <dependency> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.testing.osgi-mock</artifactId> - <version>1.3.0</version> + <version>2.1.0</version> <scope>test</scope> </dependency> <dependency> diff --git a/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java b/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java index 5885426..ca76690 100644 --- a/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java +++ b/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java @@ -58,7 +58,7 @@ public class MetricServiceTest { @After public void deactivate(){ - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); } @Test @@ -70,7 +70,7 @@ public class MetricServiceTest { assertNotNull(service.adaptTo(MetricRegistry.class)); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); assertNull(context.getService(MetricRegistry.class)); assertNull(context.getService(MetricsService.class)); @@ -137,7 +137,7 @@ public class MetricServiceTest { Set<ObjectName> names = server.queryNames(new ObjectName("org.apache.sling:name=*"), q); assertThat(names, is(not(empty()))); - MockOsgi.deactivate(service); + MockOsgi.deactivate(service, context.bundleContext()); names = server.queryNames(new ObjectName("org.apache.sling:name=*"), q); assertThat(names, is(empty())); -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>.
