diff --git a/.travis.yml b/.travis.yml
index 9e83867..8a0966b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
language: java
jdk:
- - openjdk7
- oraclejdk8
cache:
diff --git a/api/pom.xml b/api/pom.xml
index a72970a..5366ee7 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -8,7 +8,7 @@
com.spotify.metrics
semantic-metrics-parent
- 0.11.6-SNAPSHOT
+ 1.0.0-SNAPSHOT
..
diff --git a/core/pom.xml b/core/pom.xml
index d17cd6d..dde9fb3 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -8,7 +8,7 @@
com.spotify.metrics
semantic-metrics-parent
- 0.11.6-SNAPSHOT
+ 1.0.0-SNAPSHOT
..
@@ -23,12 +23,12 @@
- com.codahale.metrics
+ io.dropwizard.metrics
metrics-core
- com.codahale.metrics
+ io.dropwizard.metrics
metrics-jvm
diff --git a/examples/pom.xml b/examples/pom.xml
index fcf6668..8e38c92 100644
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@ -8,7 +8,7 @@
com.spotify.metrics
semantic-metrics-parent
- 0.11.6-SNAPSHOT
+ 1.0.0-SNAPSHOT
..
diff --git a/ffwd-http-reporter/pom.xml b/ffwd-http-reporter/pom.xml
index 9f05aa9..826dfff 100644
--- a/ffwd-http-reporter/pom.xml
+++ b/ffwd-http-reporter/pom.xml
@@ -8,7 +8,7 @@
com.spotify.metrics
semantic-metrics-parent
- 0.11.6-SNAPSHOT
+ 1.0.0-SNAPSHOT
..
diff --git a/ffwd-http-reporter/src/test/java/com/spotify/metrics/ffwd/FastForwardReporterTest.java b/ffwd-http-reporter/src/test/java/com/spotify/metrics/ffwd/FastForwardHttpReporterTest.java
similarity index 97%
rename from ffwd-http-reporter/src/test/java/com/spotify/metrics/ffwd/FastForwardReporterTest.java
rename to ffwd-http-reporter/src/test/java/com/spotify/metrics/ffwd/FastForwardHttpReporterTest.java
index 7c9a99a..fc17186 100644
--- a/ffwd-http-reporter/src/test/java/com/spotify/metrics/ffwd/FastForwardReporterTest.java
+++ b/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.just(null)).when(httpClient).sendBatch(any(Batch.class));
fixedClock.setCurrentTime(TIME);
@@ -140,7 +140,7 @@ public Double getValue() {
final ArgumentCaptor 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 = 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 commonTags = batch.getValue().getCommonTags();
diff --git a/ffwd-reporter/pom.xml b/ffwd-reporter/pom.xml
index 199005c..e808c3e 100644
--- a/ffwd-reporter/pom.xml
+++ b/ffwd-reporter/pom.xml
@@ -8,7 +8,7 @@
com.spotify.metrics
semantic-metrics-parent
- 0.11.6-SNAPSHOT
+ 1.0.0-SNAPSHOT
..
diff --git a/guava/pom.xml b/guava/pom.xml
index be295ef..14e0e63 100644
--- a/guava/pom.xml
+++ b/guava/pom.xml
@@ -8,7 +8,7 @@
com.spotify.metrics
semantic-metrics-parent
- 0.11.6-SNAPSHOT
+ 1.0.0-SNAPSHOT
..
diff --git a/pom.xml b/pom.xml
index 51fffee..ff60d8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.spotify.metrics
semantic-metrics-parent
- 0.11.6-SNAPSHOT
+ 1.0.0-SNAPSHOT
Semantic Metrics: Parent POM
pom
@@ -50,7 +50,7 @@
UTF-8
- 3.0.2
+ 4.0.2
@@ -77,13 +77,13 @@
- com.codahale.metrics
+ io.dropwizard.metrics
metrics-core
${metrics.version}
- com.codahale.metrics
+ io.dropwizard.metrics
metrics-jvm
${metrics.version}
@@ -193,8 +193,8 @@
maven-compiler-plugin
3.1
- 1.7
- 1.7
+ 1.8
+ 1.8
diff --git a/remote/pom.xml b/remote/pom.xml
index b9b8127..6169f47 100644
--- a/remote/pom.xml
+++ b/remote/pom.xml
@@ -8,7 +8,7 @@
com.spotify.metrics
semantic-metrics-parent
- 0.11.6-SNAPSHOT
+ 1.0.0-SNAPSHOT
..