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

[metrics-lib/release] Add test for #22912.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit d00a28fe2d7d451b2c4e3d033e259e5c786294e6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Jul 14 11:19:45 2017 +0200 Add test for #22912. --- .../torproject/descriptor/impl/TorperfResultImplTest.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java index f648c7b..d9e134d 100644 --- a/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java +++ b/src/test/java/org/torproject/descriptor/impl/TorperfResultImplTest.java @@ -6,12 +6,14 @@ package org.torproject.descriptor.impl; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; import org.torproject.descriptor.Descriptor; import org.torproject.descriptor.DescriptorParseException; import org.junit.Test; +import java.nio.charset.StandardCharsets; import java.util.List; public class TorperfResultImplTest { @@ -63,6 +65,19 @@ public class TorperfResultImplTest { ((TorperfResultImpl)(result.get(2))).getAnnotations().size()); } + @Test + public void testTrailingNewlinesRetained() throws Exception { + byte[] asciiBytes = (torperfAnnotation + input + + torperfAnnotation + input).getBytes("US-ASCII"); + List<Descriptor> result = TorperfResultImpl.parseTorperfResults( + asciiBytes, null); + for (Descriptor descriptor : result) { + assertTrue("Expected trailing newline.", + new String(descriptor.getRawDescriptorBytes(), + StandardCharsets.US_ASCII).endsWith("\n")); + } + } + private static long[] deciles = new long[] { 1441065602980L, 1441065603030L, 1441065603090L, 1441065603120L, 1441065603230L, 1441065603250L, 1441065603310L, 1441065603370L,

1 0

[metrics-lib/release] Fix javadoc in Descriptor.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit e0aa5eb81daa6d22d542cf24cce34081247174b6 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Jul 28 07:53:31 2017 +0000 Fix javadoc in Descriptor. --- src/main/java/org/torproject/descriptor/Descriptor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/torproject/descriptor/Descriptor.java b/src/main/java/org/torproject/descriptor/Descriptor.java index ca2a4cf..35ef38b 100644 --- a/src/main/java/org/torproject/descriptor/Descriptor.java +++ b/src/main/java/org/torproject/descriptor/Descriptor.java @@ -53,7 +53,7 @@ public interface Descriptor { * empty list if there were no unrecognized lines. * * Some implementations might not support this operation and will throw an - * {@code UnsupportedOperationException}, * e.g., + * {@code UnsupportedOperationException}, e.g., * {@link UnparseableDescriptor}. * * @since 1.0.0

1 0

[metrics-lib/release] Removed javadoc links to removed interfaces.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit e2246804e366920c9c334d774575217be0c644f8 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Jul 28 07:53:29 2017 +0000 Removed javadoc links to removed interfaces. --- src/main/java/org/torproject/descriptor/package-info.java | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/torproject/descriptor/package-info.java b/src/main/java/org/torproject/descriptor/package-info.java index e5f36d2..5827115 100644 --- a/src/main/java/org/torproject/descriptor/package-info.java +++ b/src/main/java/org/torproject/descriptor/package-info.java @@ -20,15 +20,11 @@ * {@link org.torproject.descriptor.DescriptorSourceFactory} which is the * main entry point into using this library. This factory is used to * create the descriptor sources for obtaining remote descriptor data - * ({@link org.torproject.descriptor.DescriptorDownloader} and - * {@link org.torproject.descriptor.DescriptorCollector}) and descriptor + * ({@link org.torproject.descriptor.DescriptorCollector}) and descriptor * sources for processing local descriptor data * ({@link org.torproject.descriptor.DescriptorReader} and * {@link org.torproject.descriptor.DescriptorParser}). General-purpose - * types also include descriptor containers - * ({@link org.torproject.descriptor.DescriptorRequest} and - * {@link org.torproject.descriptor.DescriptorFile}) and the - * superinterface for all provided descriptors + * types also include the superinterface for all provided descriptors * ({@link org.torproject.descriptor.Descriptor}).</li> * * <li>The first group of descriptors is published by relays and servers

1 0

[metrics-lib/release] Avoid internal packages' javadoc in public javadoc API.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit f533c3d91de39857a0fc0fd5b7cae6239dfeb411 Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Jul 28 07:53:35 2017 +0000 Avoid internal packages' javadoc in public javadoc API. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 0eba3ff..832f29a 100644 --- a/build.xml +++ b/build.xml @@ -8,7 +8,7 @@ <property name="release.version" value="2.0.0-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> - <property name="javadoc-excludes" value="**/impl/** **/index/**" /> + <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" /> <property name="name" value="metrics-lib" /> <property name="jarpatternprop" value="empty" />

1 0

[metrics-lib/release] Update to latest metrics-base.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit 13a22d9ebef304a37179f65f0f00e3c71c3e2523 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Sep 5 14:03:51 2017 +0200 Update to latest metrics-base. But override the switch from Java 7 to 8 until all metrics libraries depending on metrics-lib have upgraded to Java 8 first. --- build.xml | 1 + src/build | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 832f29a..3d712a1 100644 --- a/build.xml +++ b/build.xml @@ -12,6 +12,7 @@ <property name="implementation-title" value="Tor Metrics Library" /> <property name="name" value="metrics-lib" /> <property name="jarpatternprop" value="empty" /> + <property name="source-and-target-java-version" value="1.7" /> <patternset id="runtime" > <include name="commons-compress-1.13.jar"/> 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

1 0

[metrics-lib/release] Bump version to 2.1.0-dev.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit 6b8de66d171dd85d8244a7d326ca436ce68e0d78 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 16:07:05 2017 +0200 Bump version to 2.1.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 6ad5a18..6f493fa 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.1.0" /> + <property name="release.version" value="2.1.0-dev" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/release] Prepare for 2.1.1 release.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit a8c9232e9f689944da861af22b81f7431cdb86eb Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Oct 9 14:04:00 2017 +0200 Prepare for 2.1.1 release. --- CHANGELOG.md | 4 ++-- build.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b7021d8..cd0dc6a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ -# Changes in version 2.?.? - 2017-??-?? +# Changes in version 2.1.1 - 2017-10-09 - * Medium changes + * Minor changes - Add new optional "build_revision" field to index.json with the Git revision supplied by the calling software. diff --git a/build.xml b/build.xml index 6f493fa..badaf37 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.1.0-dev" /> + <property name="release.version" value="2.1.1" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/release] Prepare for 2.1.0 release.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit 27e1ff049781f8b7f80370e00462e3f061ef9c6f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 11:25:29 2017 +0200 Prepare for 2.1.0 release. --- CHANGELOG.md | 2 +- build.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cb314dc..2c40c10 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 2.?.? - 2017-??-?? +# Changes in version 2.1.0 - 2017-09-15 * Major changes - Update dependencies to versions available in Debian stretch: diff --git a/build.xml b/build.xml index 832f29a..6ad5a18 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.0.0-dev" /> + <property name="release.version" value="2.1.0" /> <property name="javadoc-title" value="Tor Metrics Library API Documentation"/> <property name="javadoc-excludes" value="**/impl/** **/index/** **/internal/** **/log/**" /> <property name="implementation-title" value="Tor Metrics Library" />

1 0

[metrics-lib/release] Update to Java 8.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit 65c266a8f9fdf57d306d12d1d63a6cf624905f47 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Sep 15 11:20:43 2017 +0200 Update to Java 8. --- CHANGELOG.md | 1 + build.xml | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a294c62..cb314dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Update dependencies to versions available in Debian stretch: Apache Commons Compress 1.13, Apache Commons Lang 3.5, Google Gson 2.4, JUnit 4.12, Logback 1.1.9, SLF4J 1.7.22, and XZ 1.6. + - Update to Java 8. * Minor changes - Retain trailing newline in Torperf results. diff --git a/build.xml b/build.xml index 3d712a1..832f29a 100644 --- a/build.xml +++ b/build.xml @@ -12,7 +12,6 @@ <property name="implementation-title" value="Tor Metrics Library" /> <property name="name" value="metrics-lib" /> <property name="jarpatternprop" value="empty" /> - <property name="source-and-target-java-version" value="1.7" /> <patternset id="runtime" > <include name="commons-compress-1.13.jar"/>

1 0

[metrics-lib/release] Adapt all links in overview.html.
by karsten＠torproject.org 10 Oct '17

10 Oct '17

commit 992bf36ad2157c39e7f61014de3c7c364f0d45df Author: iwakeh <iwakeh(a)torproject.org> Date: Fri Sep 15 14:07:06 2017 +0000 Adapt all links in overview.html. Implement task-23597. Reflect changes of links in Trac module names and Metrics' website. --- src/main/resources/overview.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/resources/overview.html b/src/main/resources/overview.html index a565536..f983410 100644 --- a/src/main/resources/overview.html +++ b/src/main/resources/overview.html @@ -13,7 +13,7 @@ directory protocol, version 3</a> or in the earlier <a href="https://gitweb.torproject.org/torspec.git/tree/attic/dir-spec-v1.txt">version 1</a> of that document. Other descriptors are specified on the -<a href="https://collector.torproject.org/">CollecTor website</a>. +<a href="https://metrics.torproject.org/collector.html#available-descriptors">CollecTor website</a>. The interfaces in <a href="./org/torproject/descriptor/package-summary.html">{@code org.torproject.descriptor}</a> @@ -25,7 +25,7 @@ accessible for statistical analysis: <ul> <li>Complete coverage: This library is supposed to cover the complete range of Tor descriptors made available by the -<a href="https://collector.torproject.org">CollecTor</a> service.</li> +<a href="https://metrics.torproject.org/collector.html">CollecTor</a> service.</li> <li>Runtime and memory efficiency: Processing large amounts of descriptors in bulk is supposed to be efficient in terms of runtime and required memory.</li> @@ -60,9 +60,10 @@ would correspond to the provided descriptor sources.</li> Contact and further information: <ul> -<li><a href="https://trac.torproject.org/projects/tor/query?status=!closed&component=Met…">Tor Metrics Library Bug Tracker</a></li> +<li><a href="https://trac.torproject.org/projects/tor/query?status=!closed&component=Met…">Tor Metrics Library Bug Tracker</a></li> <li><a href="https://lists.torproject.org/cgi-bin/mailman/listinfo/metrics-team">Metrics Team Mailing List</a></li> -<li><a href="https://trac.torproject.org/projects/tor/wiki/org/teams/MetricsTeam">Metrics Team Website</a></li> +<li><a href="https://metrics.torproject.org">Metrics Website</a></li> +<li><a href="https://trac.torproject.org/projects/tor/wiki/org/teams/MetricsTeam">Metrics Team Wiki</a></li> </ul> </body> </html>

1 0