Upgrade metrics to fix reconnect when reporting metrics. (backported)

Patch by dr3s and Jeff Jirsa; Reviewed by Mick Semb Wever for CASSANDRA-12924
2017-06-20 13:23:17 -04:00 · 2017-06-20 13:23:17 -04:00 · 14bfc94937
parent df9475086d
commit 14bfc94937
10 changed files with 3 additions and 2 deletions
--- a/CHANGES.txt
+++ b/CHANGES.txt
@ -1,4 +1,5 @@
 3.11.3
+ * Update metrics to 3.1.5 (CASSANDRA-12924)
 * Detect OpenJDK jvm type and architecture (CASSANDRA-12793)
 * Don't use guava collections in the non-system keyspace jmx attributes (CASSANDRA-12271)
 * Allow existing nodes to use all peers in shadow round (CASSANDRA-13851)
--- a/build.xml
+++ b/build.xml
@ -427,8 +427,8 @@

          <dependency groupId="org.apache.cassandra" artifactId="cassandra-all" version="${version}" />
          <dependency groupId="org.apache.cassandra" artifactId="cassandra-thrift" version="${version}" />
-          <dependency groupId="io.dropwizard.metrics" artifactId="metrics-core" version="3.1.0" />
-          <dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm" version="3.1.0" />
+          <dependency groupId="io.dropwizard.metrics" artifactId="metrics-core" version="3.1.5" />
+          <dependency groupId="io.dropwizard.metrics" artifactId="metrics-jvm" version="3.1.5" />
          <dependency groupId="com.addthis.metrics" artifactId="reporter-config3" version="3.0.3" />
          <dependency groupId="org.mindrot" artifactId="jbcrypt" version="0.3m" />
          <dependency groupId="io.airlift" artifactId="airline" version="0.6" />
--- a/lib/licenses/metrics-core-3.1.5.txt
+++ b/lib/licenses/metrics-core-3.1.5.txt
--- a/lib/licenses/metrics-jvm-3.1.5.txt
+++ b/lib/licenses/metrics-jvm-3.1.5.txt
--- a/lib/licenses/metrics-logback-3.1.5.txt
+++ b/lib/licenses/metrics-logback-3.1.5.txt
--- a/lib/metrics-core-3.1.0.jar
+++ b/lib/metrics-core-3.1.0.jar
--- a/lib/metrics-core-3.1.5.jar
+++ b/lib/metrics-core-3.1.5.jar
--- a/lib/metrics-jvm-3.1.5.jar
+++ b/lib/metrics-jvm-3.1.5.jar
--- a/lib/metrics-logback-3.1.0.jar
+++ b/lib/metrics-logback-3.1.0.jar
--- a/lib/metrics-logback-3.1.5.jar
+++ b/lib/metrics-logback-3.1.5.jar