commit 27f3bbb62c994be06235073c6eddf6f1e6470492 Author: Karsten Loesing karsten.loesing@gmx.net Date: Thu Feb 20 14:52:48 2020 +0100

Prepare for 8.0-1.25.0 release. --- CHANGELOG.md | 2 +- build.xml | 4 ++-- .../java/org/torproject/metrics/onionoo/server/ResponseBuilder.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md index 9b7eaf7..12be2f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 8.0-1.2?.? - 20??-??-?? +# Changes in version 8.0-1.25.0 - 2020-02-20

* Major changes - Include graph history objects even if the time period they cover diff --git a/build.xml b/build.xml index 4063ce8..6cf8a76 100644 --- a/build.xml +++ b/build.xml @@ -9,9 +9,9 @@

<property name="javadoc-title" value="Onionoo API Documentation"/> <property name="implementation-title" value="Onionoo" /> - <property name="onionoo.protocol.version" value="7.1"/> + <property name="onionoo.protocol.version" value="8.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.24.1-dev"/> + value="${onionoo.protocol.version}-1.25.0"/> <property name="metricslibversion" value="2.10.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java b/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java index 108790d..f6453ae 100644 --- a/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java +++ b/src/main/java/org/torproject/metrics/onionoo/server/ResponseBuilder.java @@ -123,9 +123,9 @@ public class ResponseBuilder { return this.charsWritten; }

- private static final String PROTOCOL_VERSION = "7.1"; + private static final String PROTOCOL_VERSION = "8.0";

- private static final String NEXT_MAJOR_VERSION_SCHEDULED = "2020-02-20"; + private static final String NEXT_MAJOR_VERSION_SCHEDULED = null;

private void writeRelays(List<SummaryDocument> relays, PrintWriter pw) { this.write(pw, "{"version":"%s",\n", PROTOCOL_VERSION);