update metrics library to 4.0

.travis.yml

@@ -1,7 +1,6 @@
 language: java
 
 jdk:
-  - openjdk7
   - oraclejdk8
 
 cache:

api/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.spotify.metrics</groupId>
     <artifactId>semantic-metrics-parent</artifactId>
-    <version>0.11.6-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

core/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.spotify.metrics</groupId>
     <artifactId>semantic-metrics-parent</artifactId>
-    <version>0.11.6-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 
@@ -23,12 +23,12 @@
     </dependency>
 
     <dependency>
-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>
     </dependency>
 
     <dependency>
-      <groupId>com.codahale.metrics</groupId>
+      <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-jvm</artifactId>
     </dependency>
 

examples/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.spotify.metrics</groupId>
     <artifactId>semantic-metrics-parent</artifactId>
-    <version>0.11.6-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

ffwd-http-reporter/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.spotify.metrics</groupId>
     <artifactId>semantic-metrics-parent</artifactId>
-    <version>0.11.6-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

ffwd-http-reporter/src/test/java/com/spotify/metrics/ffwd/FastForwardReporterTest.java → ffwd-http-reporter/src/test/java/com/spotify/metrics/ffwd/FastForwardHttpReporterTest.java

@@ -32,9 +32,9 @@
 import rx.Observable;
 
 @RunWith(MockitoJUnitRunner.class)
-public class FastForwardReporterTest {
+public class FastForwardHttpReporterTest {
     private static final int REPORTING_PERIOD = 50;
-    public static final long TIME = 42L;
+    private static final long TIME = 42L;
     private FastForwardHttpReporter reporter;
 
     private SemanticMetricRegistry registry;
@@ -60,7 +60,7 @@ public void setUp() throws Exception {
     }
 
     @Test
-    public void someReporting() throws Exception {
+    public void someReporting() {
         doReturn(Observable.<Void>just(null)).when(httpClient).sendBatch(any(Batch.class));
         fixedClock.setCurrentTime(TIME);
 
@@ -140,7 +140,7 @@ public Double getValue() {
 
         final ArgumentCaptor<Batch> batch = ArgumentCaptor.forClass(Batch.class);
 
-        verify(httpClient, timeout(REPORTING_PERIOD * 2 + 20).atLeast(2)).sendBatch(
+        verify(httpClient, timeout(REPORTING_PERIOD * 2 + 20).atLeastOnce()).sendBatch(
             batch.capture());
 
         for (final Batch b : batch.getAllValues()) {
@@ -173,7 +173,7 @@ public void shouldAddExtractedTags() throws Exception {
 
         final ArgumentCaptor<Batch> batch = ArgumentCaptor.forClass(Batch.class);
 
-        verify(httpClient, timeout(REPORTING_PERIOD * 2 + 20).atLeast(2)).sendBatch(
+        verify(httpClient, timeout(REPORTING_PERIOD * 2 + 20).atLeastOnce()).sendBatch(
             batch.capture());
 
         final Map<String, String> commonTags = batch.getValue().getCommonTags();

ffwd-reporter/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.spotify.metrics</groupId>
     <artifactId>semantic-metrics-parent</artifactId>
-    <version>0.11.6-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

guava/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.spotify.metrics</groupId>
     <artifactId>semantic-metrics-parent</artifactId>
-    <version>0.11.6-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>
 

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>com.spotify.metrics</groupId>
   <artifactId>semantic-metrics-parent</artifactId>
-  <version>0.11.6-SNAPSHOT</version>
+  <version>1.0.0-SNAPSHOT</version>
   <name>Semantic Metrics: Parent POM</name>
   <packaging>pom</packaging>
 
@@ -50,7 +50,7 @@
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <metrics.version>3.0.2</metrics.version>
+    <metrics.version>4.0.2</metrics.version>
   </properties>
 
   <dependencyManagement>
@@ -77,13 +77,13 @@
       </dependency>
 
       <dependency>
-        <groupId>com.codahale.metrics</groupId>
+        <groupId>io.dropwizard.metrics</groupId>
         <artifactId>metrics-core</artifactId>
         <version>${metrics.version}</version>
       </dependency>
 
       <dependency>
-        <groupId>com.codahale.metrics</groupId>
+        <groupId>io.dropwizard.metrics</groupId>
         <artifactId>metrics-jvm</artifactId>
         <version>${metrics.version}</version>
       </dependency>
@@ -193,8 +193,8 @@
         <artifactId>maven-compiler-plugin</artifactId>
         <version>3.1</version>
         <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
+          <source>1.8</source>
+          <target>1.8</target>
         </configuration>
       </plugin>
       <plugin>

remote/pom.xml

@@ -8,7 +8,7 @@
   <parent>
     <groupId>com.spotify.metrics</groupId>
     <artifactId>semantic-metrics-parent</artifactId>
-    <version>0.11.6-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>..</relativePath>
   </parent>