October 2019 - tor-commits - lists.torproject.org

[onionoo/release] Bump version to 7.0-1.19.1-dev.
by karsten＠torproject.org 04 Oct '19

04 Oct '19

commit 6ff4af1d6ce370f1f676715cef084704927c0ceb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Nov 20 17:05:20 2018 +0100 Bump version to 7.0-1.19.1-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index d066bcb..1f6b69c 100644 --- a/build.xml +++ b/build.xml @@ -10,7 +10,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.19.1"/> + value="${onionoo.protocol.version}-1.19.1-dev"/> <property name="metricslibversion" value="2.4.0"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile"

1 0

[onionoo/release] Stop signing jars.
by karsten＠torproject.org 04 Oct '19

04 Oct '19

commit 43ad7e350a4a2c0ec822636a78db8d669f871686 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Nov 28 10:19:00 2018 +0100 Stop signing jars. Implements #28584. --- CERT | 21 --------------------- src/build | 2 +- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/CERT b/CERT deleted file mode 100644 index b90b397..0000000 --- a/CERT +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN CERTIFICATE----- -MIIDaTCCAlGgAwIBAgIELle0dTANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV -UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU -b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTgw -ODI4MDcwNjM2WhcNMTgxMTI2MDcwNjM2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE -CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj -dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB -AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU -6aTpAjDMeaT4ctUwxH4+56Sbcf/wB0vEFBbX8MyRd1eY02PKwMVJ6VBhjOQcIlrd -Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE -MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD -oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX -lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud -DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAkXZs -3T3GTkZ+EGvZG5puzKdgZiSsLgIy25xdWsIx147AIZEJFKjEAtbu0osMpkTa96B6 -a+BHf7PTjQUuH3YOEmeW9ab8pwu5SRijCq2qkuvjjSLBcJzWnalcKDYYvoQte1// -Di8JqpRXCw20WY2bldTiafyG80E0RGfiX2I8vbDiPIhjwz9Wox8Q1rw1c9T/vRn9 -pI8FrHgTnDO6R54yD25QSpsj+hC+IDkFKO17vGCIaJrPG5o6th438ijEwJsG+LRB -4zKKKsFTby7UJI3Ag8xolIhsBkRZO2j4Na35i15SZ7QJNj9J5g171z8RyOmyIQbg -q7OXN2iiRIxiIJwoQw== ------END CERTIFICATE----- diff --git a/src/build b/src/build index 08514a3..e639c69 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 08514a32afefbeef848b80f9a338ee840c282604 +Subproject commit e639c697e9e94c6dbb26e946e5247c20a62c0661

1 0

[onionoo/release] Remove Cobertura from the build process.
by karsten＠torproject.org 04 Oct '19

04 Oct '19

commit 301841c8e97602fe8106cb1bbd1c46a19a767a63 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Aug 14 11:42:59 2019 +0200 Remove Cobertura from the build process. --- CHANGELOG.md | 1 + src/build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9c8062b..696b33d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ copied to the `lib/` directory manually. Current dependency versions resolved by Ivy are the same as in Debian stretch with few exceptions. + - Remove Cobertura from the build process. # Changes in version 7.0-1.19.1 - 2018-11-20 diff --git a/src/build b/src/build index 256e619..75cda35 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 256e6192ad0066e48c6abb0ee9ac71714c7a3a0f +Subproject commit 75cda35ba7375ab0f5b12fa214620c3a29917097

1 0

[onionoo/release] Make unit test locale-independent.
by karsten＠torproject.org 04 Oct '19

04 Oct '19

commit 860228c58f294429a44793aa91b30a93010ad8f1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 6 17:17:05 2019 +0200 Make unit test locale-independent. Spotted while working on #31326, but unrelated. --- src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java b/src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java index d0f50b6..121ec87 100644 --- a/src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java +++ b/src/main/java/org/torproject/metrics/onionoo/docs/WeightsStatus.java @@ -7,6 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.util.Comparator; +import java.util.Locale; import java.util.Map; import java.util.Scanner; import java.util.SortedMap; @@ -206,7 +207,7 @@ public class WeightsStatus extends Document { for (int i = 0; i < weights.length; i++) { sb.append(" "); if (i != 0 && i != 5 && !Double.valueOf(weights[i]).isNaN()) { - sb.append(String.format("%.12f", weights[i])); + sb.append(String.format(Locale.US, "%.12f", weights[i])); } } sb.append("\n");

1 0

[onionoo/release] Use metrics-base ant task to fetch metrics-lib.
by karsten＠torproject.org 04 Oct '19

04 Oct '19

commit bbc5c16d7b748ab05707a31779849f216a89f1b5 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 27 10:06:13 2019 +0200 Use metrics-base ant task to fetch metrics-lib. Implements part of #31649. --- .gitlab-ci.yml | 7 +------ src/build | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b67b5a4..897c9da 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,5 @@ variables: GIT_STRATEGY: clone - METRICS_LIB_VERSION: "2.6.2" JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" stages: @@ -15,11 +14,7 @@ test: - git submodule init - git submodule update - mkdir lib - - mkdir tmp - - pushd tmp - - curl https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$M… | tar xzf - - - popd - - mv tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar lib + - ant fetch-metrics-lib - ant -lib /usr/share/java resolve - ant test - ant checks diff --git a/src/build b/src/build index 75cda35..07c2a00 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 75cda35ba7375ab0f5b12fa214620c3a29917097 +Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4

1 0

[onionoo/release] Adds GitLab CI for tests and checks
by karsten＠torproject.org 04 Oct '19

04 Oct '19

commit 5173fe1d73c32342be937160d4974bd446c45e57 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Sep 5 12:26:45 2019 +0100 Adds GitLab CI for tests and checks Configuration is held in the .gitlab-ci.yml file. Fixes: #31400 --- .gitlab-ci.yml | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..b67b5a4 --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,25 @@ +variables: + GIT_STRATEGY: clone + METRICS_LIB_VERSION: "2.6.2" + JAVA_TOOL_OPTIONS: "-Dfile.encoding=UTF-8" + +stages: + - test + +test: + stage: test + image: debian:buster + script: + - apt update + - apt -y install default-jdk ant ivy git curl + - git submodule init + - git submodule update + - mkdir lib + - mkdir tmp + - pushd tmp + - curl https://dist.torproject.org/metrics-lib/$METRICS_LIB_VERSION/metrics-lib-$M… | tar xzf - + - popd + - mv tmp/metrics-lib-$METRICS_LIB_VERSION/generated/dist/metrics-lib-$METRICS_LIB_VERSION-thin.jar lib + - ant -lib /usr/share/java resolve + - ant test + - ant checks

1 0

[onionoo/release] Increase timeout for testCountryDeDe
by karsten＠torproject.org 04 Oct '19

04 Oct '19

commit 4ba7b00c6f4080955af907e1dbf9dd0c79fb9a58 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Thu Sep 5 14:10:44 2019 +0100 Increase timeout for testCountryDeDe The timeout was being reached in the GitLab CI environment, which is not super powerful. --- .../java/org/torproject/metrics/onionoo/server/ResourceServletTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java index 7c3c52e..935c06e 100644 --- a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java @@ -1134,7 +1134,7 @@ public class ResourceServletTest { null); } - @Test(timeout = 200) + @Test(timeout = 400) public void testCountryDeDe() { this.assertSummaryDocument( "/summary?country=de&country=de", 1, new String[] { "TorkaZ" }, 0,

1 0

[onionoo/release] Prepare for 7.0-1.20.0 release.
by karsten＠torproject.org 04 Oct '19

04 Oct '19

commit aa6889d44bd06c4e5b9b5b86c3d2f3dd0fae5b5b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 4 10:46:44 2019 +0200 Prepare for 7.0-1.20.0 release. --- build.xml | 2 +- src/build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index b0f30f8..360dc8b 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.19.1-dev"/> + value="${onionoo.protocol.version}-1.20.0"/> <property name="metricslibversion" value="2.6.2"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/build b/src/build index 07c2a00..62a964a 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4 +Subproject commit 62a964a7702086ca6ba0e2307809d4f983163b47

1 0

[onionoo/master] Increase timeout for testCountryDeDe even more.
by karsten＠torproject.org 04 Oct '19

04 Oct '19

commit 1579c1e2c103880129271daf30f49cb2e52f7b10 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 4 11:01:52 2019 +0200 Increase timeout for testCountryDeDe even more. The timeout was again being reached in the GitLab CI environment. --- .../java/org/torproject/metrics/onionoo/server/ResourceServletTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java index 935c06e..7df56ea 100644 --- a/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java +++ b/src/test/java/org/torproject/metrics/onionoo/server/ResourceServletTest.java @@ -1134,7 +1134,7 @@ public class ResourceServletTest { null); } - @Test(timeout = 400) + @Test(timeout = 800) public void testCountryDeDe() { this.assertSummaryDocument( "/summary?country=de&country=de", 1, new String[] { "TorkaZ" }, 0,

1 0

[onionoo/master] Prepare for 7.0-1.20.0 release.
by karsten＠torproject.org 04 Oct '19

04 Oct '19

commit aa6889d44bd06c4e5b9b5b86c3d2f3dd0fae5b5b Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Oct 4 10:46:44 2019 +0200 Prepare for 7.0-1.20.0 release. --- build.xml | 2 +- src/build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build.xml b/build.xml index b0f30f8..360dc8b 100644 --- a/build.xml +++ b/build.xml @@ -11,7 +11,7 @@ <property name="implementation-title" value="Onionoo" /> <property name="onionoo.protocol.version" value="7.0"/> <property name="release.version" - value="${onionoo.protocol.version}-1.19.1-dev"/> + value="${onionoo.protocol.version}-1.20.0"/> <property name="metricslibversion" value="2.6.2"/> <property name="jetty.version" value="-9.2.21.v20170120" /> <property name="warfile" diff --git a/src/build b/src/build index 07c2a00..62a964a 160000 --- a/src/build +++ b/src/build @@ -1 +1 @@ -Subproject commit 07c2a00c27f0d536223f8b5a61fc91e60eb524d4 +Subproject commit 62a964a7702086ca6ba0e2307809d4f983163b47

1 0