[tor-commits] [collector/master] Upgrade to latest metrics-base.

[karsten at torproject.org]

commit 02b709b65eb8679020e9af67905640a46c362fec
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Wed Jul 24 19:08:55 2019 +0200

    Upgrade to latest metrics-base.
    
    Also include change log entries and fix a few Checkstyle complaints.
---
 CHANGELOG.md                                             | 16 ++++++++++++++++
 src/build                                                |  2 +-
 .../java/org/torproject/metrics/collector/conf/Key.java  |  4 +++-
 .../metrics/collector/webstats/SanitizeWeblogs.java      |  2 +-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4682fef..55118c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# Changes in version 1.10.0 - 2019-0?-??
+
+ * Medium changes
+   * Update build-time and run-time dependencies to versions found in
+     Debian buster, including: commons-codec-1.11.jar,
+     commons-compress-1.18.jar, jackson-annotations-2.9.8.jar,
+     jackson-core-2.9.8.jar, jackson-databind-2.9.8.jar,
+     logback-core-1.2.3.jar, logback-classic-1.2.3.jar,
+     slf4j-api-1.7.25.jar, and xz-1.8.jar.
+   * Update Checkstyle dependencies to versions found in Debian
+     buster, including: antlr-2.7.7.jar, antlr4-runtime-4.7.2.jar,
+     checkstyle-8.15.jar, commons-beanutils-1.9.3.jar,
+     commons-collections3-3.2.2.jar, commons-logging-1.2.jar,
+     guava-19.0.jar, java-atk-wrapper.jar, and picocli-3.9.2.jar.
+
+
 # Changes in version 1.9.1 - 2019-05-29
 
  * Medium changes
diff --git a/src/build b/src/build
index e12ba96..42ee1fc 160000
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit e12ba96aa0708b20375cf7cf5d20dfa19940d18a
+Subproject commit 42ee1fc086b0e86cddf56475124a547465484321
diff --git a/src/main/java/org/torproject/metrics/collector/conf/Key.java b/src/main/java/org/torproject/metrics/collector/conf/Key.java
index ba4bcd9..32e20ce 100644
--- a/src/main/java/org/torproject/metrics/collector/conf/Key.java
+++ b/src/main/java/org/torproject/metrics/collector/conf/Key.java
@@ -72,7 +72,9 @@ public enum Key {
   private static Set<String> keys;
 
   /**
-   * @param Class of key value.
+   * Instantiate a new {@code Key} using the given class for the key value.
+   *
+   * @param clazz Class of key value.
    */
   Key(Class clazz) {
     this.clazz = clazz;
diff --git a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
index 027cfde..539194e 100644
--- a/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
+++ b/src/main/java/org/torproject/metrics/collector/webstats/SanitizeWeblogs.java
@@ -166,7 +166,7 @@ public class SanitizeWeblogs extends CollecTorMain {
   private static final int BATCH = 100_000;
 
   static byte[] toCompressedBytes(Map<String, Long> lines)
-    throws DescriptorParseException {
+      throws DescriptorParseException {
     try (ByteArrayOutputStream baos =  new ByteArrayOutputStream();
          OutputStream os = FileType.XZ.outputStream(baos)) {
       for (Map.Entry<String, Long> entry : lines.entrySet()) {