[tor-commits] [metrics-web/master] Update metrics-lib and ExoneraTor versions.

[karsten at torproject.org]

commit af1af0a911da24b38d69b38f3ed8cc1da9dd6a11
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Thu Jan 16 09:35:29 2020 +0100

    Update metrics-lib and ExoneraTor versions.
    
    Also configure a base URL in order to turn ExoneraTor's permanent
    links into https:// links.
---
 CHANGELOG.md               | 2 ++
 build.xml                  | 4 ++--
 src/main/resources/web.xml | 4 ++++
 src/submods/metrics-lib    | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2682cfc..d5e6188 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@
 
  * Minor changes
    - Make Jetty host configurable.
+   - Configure a base URL in order to turn ExoneraTor's permanent
+     links into https:// links.
 
 
 # Changes in version 1.3.0 - 2019-11-09
diff --git a/build.xml b/build.xml
index 83e69e7..aef5f1b 100644
--- a/build.xml
+++ b/build.xml
@@ -10,8 +10,8 @@
   <property name="javadoc-title" value="MetricsWeb API Documentation"/>
   <property name="implementation-title" value="metrics-web" />
   <property name="release.version" value="1.3.0-dev" />
-  <property name="metricslibversion" value="2.9.1" />
-  <property name="exoneratorversion" value="4.2.0" />
+  <property name="metricslibversion" value="2.10.0" />
+  <property name="exoneratorversion" value="4.3.0" />
   <property name="jetty.version" value="-9.2.21.v20170120" />
   <property name="warfile"
             value="metrics-web-${release.version}.war"/>
diff --git a/src/main/resources/web.xml b/src/main/resources/web.xml
index 08a3bcd..66cc3da 100644
--- a/src/main/resources/web.xml
+++ b/src/main/resources/web.xml
@@ -482,6 +482,10 @@
       /srv/metrics.torproject.org/metrics/website/rserve/graphs/
     </param-value>
   </context-param>
+  <context-param>
+    <param-name>baseUrl</param-name>
+    <param-value>https://metrics.torproject.org</param-value>
+  </context-param>
 
   <listener>
     <listener-class>
diff --git a/src/submods/metrics-lib b/src/submods/metrics-lib
index 5fb36b7..6408bd9 160000
--- a/src/submods/metrics-lib
+++ b/src/submods/metrics-lib
@@ -1 +1 @@
-Subproject commit 5fb36b70c884073963af8e9cb3a37fa907eb35b8
+Subproject commit 6408bd9a85890f06a74f5f077e49dffe33acc36e