[tor-commits] [collector/release] Update to metrics-lib 2.1.0 and to Java 8.

[karsten at torproject.org]

commit e6d14962867f02408c704edac078ca9c512a4d21
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Fri Sep 15 11:32:12 2017 +0200

    Update to metrics-lib 2.1.0 and to Java 8.
---
 CHANGELOG.md                                                      | 3 +++
 build.xml                                                         | 2 +-
 src/build                                                         | 2 +-
 src/main/java/org/torproject/collector/index/CreateIndexJson.java | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ada02ae..7d70bbd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changes in version 1.?.? - 2017-??-??
 
+ * Major changes
+   - Update to metrics-lib 2.1.0 and to Java 8.
+
  * Medium changes
    - When synchronizing descriptors from another CollecTor instance,
      keep annotations provided by the descriptor and only add the
diff --git a/build.xml b/build.xml
index 279cd2f..3e162f0 100644
--- a/build.xml
+++ b/build.xml
@@ -11,7 +11,7 @@
   <property name="release.version" value="1.2.1-dev" />
   <property name="project-main-class" value="org.torproject.collector.Main" />
   <property name="name" value="collector"/>
-  <property name="metricslibversion" value="2.0.0" />
+  <property name="metricslibversion" value="2.1.0" />
   <property name="jarincludes" value="collector.properties logback.xml" />
 
   <patternset id="runtime" >
diff --git a/src/build b/src/build
index b491c84..a64b94a 160000
--- a/src/build
+++ b/src/build
@@ -1 +1 @@
-Subproject commit b491c845ab81027d2f29fe541f8303ff151d3d0b
+Subproject commit a64b94a635e5396266d5c5b5cf88850b9f4b6a24
diff --git a/src/main/java/org/torproject/collector/index/CreateIndexJson.java b/src/main/java/org/torproject/collector/index/CreateIndexJson.java
index 4b55d51..e10109b 100644
--- a/src/main/java/org/torproject/collector/index/CreateIndexJson.java
+++ b/src/main/java/org/torproject/collector/index/CreateIndexJson.java
@@ -9,8 +9,8 @@ import org.torproject.collector.conf.Key;
 import org.torproject.collector.cron.CollecTorMain;
 import org.torproject.descriptor.index.DirectoryNode;
 import org.torproject.descriptor.index.FileNode;
-import org.torproject.descriptor.index.FileType;
 import org.torproject.descriptor.index.IndexNode;
+import org.torproject.descriptor.internal.FileType;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;