svn commit: r1770118 - in /sling/trunk/bundles/commons/metrics: pom.xml src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java

[chetanm]

Author: chetanm
Date: Thu Nov 17 05:08:12 2016
New Revision: 1770118

URL: http://svn.apache.org/viewvc?rev=1770118&view=rev
Log:
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

Modified:
    sling/trunk/bundles/commons/metrics/pom.xml
    
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java

Modified: sling/trunk/bundles/commons/metrics/pom.xml
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/pom.xml?rev=1770118&r1=1770117&r2=1770118&view=diff
==============================================================================
--- sling/trunk/bundles/commons/metrics/pom.xml (original)
+++ sling/trunk/bundles/commons/metrics/pom.xml Thu Nov 17 05:08:12 2016
@@ -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>

Modified: 
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java?rev=1770118&r1=1770117&r2=1770118&view=diff
==============================================================================
--- 
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java
 (original)
+++ 
sling/trunk/bundles/commons/metrics/src/test/java/org/apache/sling/commons/metrics/internal/MetricServiceTest.java
 Thu Nov 17 05:08:12 2016
@@ -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()));