From fb8fd77fa5c554f3c1a120cc6e180dab6d0b9bad Mon Sep 17 00:00:00 2001
From: Andrzej Bialecki <ab@apache.org>
Date: Thu, 20 Apr 2017 15:09:14 +0200
Subject: [PATCH] SOLR-10514 Upgrade Metrics library to 3.2.2.

---
 lucene/ivy-versions.properties                | 2 +-
 solr/CHANGES.txt                              | 2 ++
 solr/licenses/metrics-core-3.1.2.jar.sha1     | 1 -
 solr/licenses/metrics-core-3.2.2.jar.sha1     | 1 +
 solr/licenses/metrics-ganglia-3.1.2.jar.sha1  | 1 -
 solr/licenses/metrics-ganglia-3.2.2.jar.sha1  | 1 +
 solr/licenses/metrics-graphite-3.1.2.jar.sha1 | 1 -
 solr/licenses/metrics-graphite-3.2.2.jar.sha1 | 1 +
 solr/licenses/metrics-jetty9-3.1.2.jar.sha1   | 1 -
 solr/licenses/metrics-jetty9-3.2.2.jar.sha1   | 1 +
 solr/licenses/metrics-jvm-3.1.2.jar.sha1      | 1 -
 solr/licenses/metrics-jvm-3.2.2.jar.sha1      | 1 +
 12 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 solr/licenses/metrics-core-3.1.2.jar.sha1
 create mode 100644 solr/licenses/metrics-core-3.2.2.jar.sha1
 delete mode 100644 solr/licenses/metrics-ganglia-3.1.2.jar.sha1
 create mode 100644 solr/licenses/metrics-ganglia-3.2.2.jar.sha1
 delete mode 100644 solr/licenses/metrics-graphite-3.1.2.jar.sha1
 create mode 100644 solr/licenses/metrics-graphite-3.2.2.jar.sha1
 delete mode 100644 solr/licenses/metrics-jetty9-3.1.2.jar.sha1
 create mode 100644 solr/licenses/metrics-jetty9-3.2.2.jar.sha1
 delete mode 100644 solr/licenses/metrics-jvm-3.1.2.jar.sha1
 create mode 100644 solr/licenses/metrics-jvm-3.2.2.jar.sha1

diff --git a/lucene/ivy-versions.properties b/lucene/ivy-versions.properties
index 86f8cc10d16..60abe9a5622 100644
--- a/lucene/ivy-versions.properties
+++ b/lucene/ivy-versions.properties
@@ -55,7 +55,7 @@ com.sun.jersey.version = 1.9
 /hsqldb/hsqldb = 1.8.0.10
 /info.ganglia.gmetric4j/gmetric4j = 1.0.7
 
-io.dropwizard.metrics.version = 3.1.2
+io.dropwizard.metrics.version = 3.2.2
 /io.dropwizard.metrics/metrics-core = ${io.dropwizard.metrics.version}
 /io.dropwizard.metrics/metrics-ganglia = ${io.dropwizard.metrics.version}
 /io.dropwizard.metrics/metrics-graphite = ${io.dropwizard.metrics.version}
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 6d55a3e6ee2..3da5dd4a9a9 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -267,6 +267,8 @@ Other Changes
 
 * SOLR-10151: Use monotonically incrementing counter for doc ids in TestRecovery. (Peter Szantai-Kis, Mano Kovacs via Mark Miller)
 
+* SOLR-10514: Upgrade Metrics library to 3.2.2. (ab)
+
 ==================  6.5.1 ==================
 
 Bug Fixes
diff --git a/solr/licenses/metrics-core-3.1.2.jar.sha1 b/solr/licenses/metrics-core-3.1.2.jar.sha1
deleted file mode 100644
index ca9ac38c3a1..00000000000
--- a/solr/licenses/metrics-core-3.1.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-224f03afd2521c6c94632f566beb1bb5ee32cf07
diff --git a/solr/licenses/metrics-core-3.2.2.jar.sha1 b/solr/licenses/metrics-core-3.2.2.jar.sha1
new file mode 100644
index 00000000000..d14a04ef7a7
--- /dev/null
+++ b/solr/licenses/metrics-core-3.2.2.jar.sha1
@@ -0,0 +1 @@
+cd9886f498ee2ab2d994f0c779e5553b2c450416
diff --git a/solr/licenses/metrics-ganglia-3.1.2.jar.sha1 b/solr/licenses/metrics-ganglia-3.1.2.jar.sha1
deleted file mode 100644
index 337754bf00a..00000000000
--- a/solr/licenses/metrics-ganglia-3.1.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2a4e2fcd6436f9b1771f0f9b6bab445dddcf704f
diff --git a/solr/licenses/metrics-ganglia-3.2.2.jar.sha1 b/solr/licenses/metrics-ganglia-3.2.2.jar.sha1
new file mode 100644
index 00000000000..e5d8496ca50
--- /dev/null
+++ b/solr/licenses/metrics-ganglia-3.2.2.jar.sha1
@@ -0,0 +1 @@
+d5bb1883e9b0daf0e4187e558746f5058f4585c1
diff --git a/solr/licenses/metrics-graphite-3.1.2.jar.sha1 b/solr/licenses/metrics-graphite-3.1.2.jar.sha1
deleted file mode 100644
index 34f01615d95..00000000000
--- a/solr/licenses/metrics-graphite-3.1.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-15a68399652c6123fe6e4c82ac4f0749e2eb6583
diff --git a/solr/licenses/metrics-graphite-3.2.2.jar.sha1 b/solr/licenses/metrics-graphite-3.2.2.jar.sha1
new file mode 100644
index 00000000000..5d11db4d518
--- /dev/null
+++ b/solr/licenses/metrics-graphite-3.2.2.jar.sha1
@@ -0,0 +1 @@
+908e8cbec1bbdb2f4023334e424c7de2832a95af
diff --git a/solr/licenses/metrics-jetty9-3.1.2.jar.sha1 b/solr/licenses/metrics-jetty9-3.1.2.jar.sha1
deleted file mode 100644
index 0722b0b42ec..00000000000
--- a/solr/licenses/metrics-jetty9-3.1.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-7f2fe1039424ca687bea5d09ec0bfa372bf7d062
diff --git a/solr/licenses/metrics-jetty9-3.2.2.jar.sha1 b/solr/licenses/metrics-jetty9-3.2.2.jar.sha1
new file mode 100644
index 00000000000..92d35089db6
--- /dev/null
+++ b/solr/licenses/metrics-jetty9-3.2.2.jar.sha1
@@ -0,0 +1 @@
+3fc94d99f41dc3f5be5483c81828138104df4449
diff --git a/solr/licenses/metrics-jvm-3.1.2.jar.sha1 b/solr/licenses/metrics-jvm-3.1.2.jar.sha1
deleted file mode 100644
index 519fcddfc4d..00000000000
--- a/solr/licenses/metrics-jvm-3.1.2.jar.sha1
+++ /dev/null
@@ -1 +0,0 @@
-ed364e77218e50fdcdebce4d982cb4d1f4a8c187
diff --git a/solr/licenses/metrics-jvm-3.2.2.jar.sha1 b/solr/licenses/metrics-jvm-3.2.2.jar.sha1
new file mode 100644
index 00000000000..0c02f93213b
--- /dev/null
+++ b/solr/licenses/metrics-jvm-3.2.2.jar.sha1
@@ -0,0 +1 @@
+9cbf2030242f7ffb97fae23f8a81421eb8d4ad45