Bump versions

Log4j2 version wasn't bumped, 2.3's InstrumentedAppender implements Serializable, and MetricRegistry and all Metrics aren't serializable.
dropwizard · Jul 30, 2015 · 59e7c4a · 59e7c4a
1 parent ce66595
commit 59e7c4a
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 19 deletions.
diff --git a/metrics-benchmarks/pom.xml b/metrics-benchmarks/pom.xml
@@ -15,7 +15,7 @@
     </description>
 
     <properties>
-      <jmh.version>1.1.1</jmh.version>
+      <jmh.version>1.10.3</jmh.version>
     </properties>
 
     <dependencies>

diff --git a/metrics-ehcache/pom.xml b/metrics-ehcache/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>net.sf.ehcache</groupId>
             <artifactId>ehcache</artifactId>
-            <version>2.8.3</version>
+            <version>2.10.0</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.slf4j</groupId>

diff --git a/metrics-graphite/src/main/java/io/dropwizard/metrics/graphite/GraphiteRabbitMQ.java b/metrics-graphite/src/main/java/io/dropwizard/metrics/graphite/GraphiteRabbitMQ.java
@@ -8,6 +8,7 @@
 import java.io.IOException;
 import java.net.Socket;
 import java.nio.charset.Charset;
+import java.util.concurrent.TimeoutException;
 import java.util.regex.Pattern;
 
 /**
@@ -93,7 +94,7 @@ public GraphiteRabbitMQ(
 
         this.connectionFactory = new ConnectionFactory();
 
-	connectionFactory.setSocketConfigurator(new DefaultSocketConfigurator() {
+        connectionFactory.setSocketConfigurator(new DefaultSocketConfigurator() {
             @Override
             public void configure(Socket socket) throws IOException {
                 super.configure(socket);
@@ -115,7 +116,12 @@ public void connect() throws IllegalStateException, IOException {
             throw new IllegalStateException("Already connected");
         }
 
-        connection = connectionFactory.newConnection();
+        try {
+            connection = connectionFactory.newConnection();
+        } catch (TimeoutException e) {
+            throw new IOException(e);
+        }
+
         channel = connection.createChannel();
     }
 

diff --git a/metrics-httpasyncclient/pom.xml b/metrics-httpasyncclient/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpasyncclient</artifactId>
-            <version>4.0.2</version>
+            <version>4.1</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.httpcomponents</groupId>

diff --git a/metrics-httpclient/pom.xml b/metrics-httpclient/pom.xml
@@ -25,7 +25,7 @@
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
             <artifactId>httpclient</artifactId>
-            <version>4.3.5</version>
+            <version>4.5</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/metrics-jdbi/pom.xml b/metrics-jdbi/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>org.jdbi</groupId>
             <artifactId>jdbi</artifactId>
-            <version>2.55</version>
+            <version>2.63.1</version>
         </dependency>
     </dependencies>
 </project>
diff --git a/metrics-jersey2/pom.xml b/metrics-jersey2/pom.xml
@@ -17,7 +17,7 @@
     </description>
 
     <properties>
-	<jersey.version>2.11</jersey.version>
+	<jersey.version>2.19</jersey.version>
     </properties>
 
     <dependencies>

diff --git a/metrics-logback/pom.xml b/metrics-logback/pom.xml
@@ -16,7 +16,7 @@
     </description>
 
     <properties>
-        <logback.version>1.1.2</logback.version>
+        <logback.version>1.1.3</logback.version>
     </properties>
 
     <dependencies>

diff --git a/pom.xml b/pom.xml
@@ -40,12 +40,11 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <servlet.version>3.1.0</servlet.version>
-        <slf4j.version>1.7.9</slf4j.version>
-        <jackson.version>2.4.2</jackson.version>
-        <jetty8.version>8.1.11.v20130520</jetty8.version>
-        <jetty9.legacy.version>9.0.4.v20130625</jetty9.legacy.version>
-        <jetty9.version>9.2.2.v20140723</jetty9.version>
-        <rabbitmq.version>3.3.5</rabbitmq.version>
+        <slf4j.version>1.7.12</slf4j.version>
+        <jackson.version>2.6.0</jackson.version>
+        <jetty9.version>9.2.12.v20150709</jetty9.version>
+        <rabbitmq.version>3.5.4</rabbitmq.version>
+        <junit.version>4.12</junit.version>
     </properties>
 
     <developers>
@@ -107,6 +106,12 @@
                 <artifactId>slf4j-api</artifactId>
                 <version>${slf4j.version}</version>
             </dependency>
+            <dependency>
+                <groupId>junit</groupId>
+                <artifactId>junit</artifactId>
+                <version>${junit.version}</version>
+                <scope>test</scope>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -118,19 +123,17 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>4.11</version>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.assertj</groupId>
             <artifactId>assertj-core</artifactId>
-            <version>1.6.1</version>
+            <version>3.1.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-all</artifactId>
-            <version>1.9.5</version>
+            <version>1.10.19</version>
             <scope>test</scope>
         </dependency>
         <dependency>