tor-commits May 2018

tor-commits@lists.torproject.org

17 participants
1514 discussions

[metrics-lib/master] Bump version to 2.4.0-dev.
by karsten＠torproject.org 25 May '18

25 May '18

commit feabf88fff34465134da9ea61592f7f9c30415b7 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri May 25 14:46:09 2018 +0200 Bump version to 2.4.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index c69da65..3c4bf28 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.4.0" /> + <property name="release.version" value="2.4.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] Replace Gson with Jackson.
by karsten＠torproject.org 25 May '18

25 May '18

commit 16c6984ab971f3f617713985a8b94ff8ed3f6525 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue May 22 15:23:57 2018 +0200 Replace Gson with Jackson. Implements #26159. --- CHANGELOG.md | 8 ++++ build.xml | 4 +- .../torproject/descriptor/index/DirectoryNode.java | 13 ++----- .../org/torproject/descriptor/index/FileNode.java | 8 +--- .../org/torproject/descriptor/index/IndexNode.java | 43 ++++++++++------------ .../torproject/descriptor/index/IndexNodeTest.java | 4 +- 6 files changed, 40 insertions(+), 40 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1e9069e..a1266e5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +# Changes in version 2.4.0 - 2018-05-?? + + * Medium changes + - Replace Gson with Jackson. Applications must provide Jackson + 2.8.6 or compatible as dependency and do not need to provide Gson + as dependency anymore. + + # Changes in version 2.3.0 - 2018-04-18 * Medium changes diff --git a/build.xml b/build.xml index 61cd45d..29db555 100644 --- a/build.xml +++ b/build.xml @@ -15,7 +15,9 @@ <patternset id="runtime" > <include name="commons-compress-1.13.jar"/> - <include name="gson-2.4.jar"/> + <include name="jackson-annotations-2.8.6.jar"/> + <include name="jackson-core-2.8.6.jar"/> + <include name="jackson-databind-2.8.6.jar"/> <include name="slf4j-api-1.7.22.jar" /> <include name="xz-1.6.jar"/> </patternset> diff --git a/src/main/java/org/torproject/descriptor/index/DirectoryNode.java b/src/main/java/org/torproject/descriptor/index/DirectoryNode.java index 859493b..9ed5784 100644 --- a/src/main/java/org/torproject/descriptor/index/DirectoryNode.java +++ b/src/main/java/org/torproject/descriptor/index/DirectoryNode.java @@ -3,8 +3,6 @@ package org.torproject.descriptor.index; -import com.google.gson.annotations.Expose; - import java.util.SortedSet; /** @@ -15,22 +13,19 @@ import java.util.SortedSet; public class DirectoryNode implements Comparable<DirectoryNode> { /** Path (i.e. directory name) is exposed in JSON. */ - @Expose public final String path; /** The file list is exposed in JSON. Sorted according to path. */ - @Expose public final SortedSet<FileNode> files; /** The directory list is exposed in JSON. Sorted according to path. */ - @Expose public final SortedSet<DirectoryNode> directories; - /* Added to satisfy Gson. */ + /* Added to satisfy Jackson. */ private DirectoryNode() { - path = null; - files = null; - directories = null; + this.path = null; + this.files = null; + this.directories = null; } /** A directory for the JSON structure. */ diff --git a/src/main/java/org/torproject/descriptor/index/FileNode.java b/src/main/java/org/torproject/descriptor/index/FileNode.java index eb34131..f505f16 100644 --- a/src/main/java/org/torproject/descriptor/index/FileNode.java +++ b/src/main/java/org/torproject/descriptor/index/FileNode.java @@ -3,8 +3,7 @@ package org.torproject.descriptor.index; -import com.google.gson.annotations.Expose; -import com.google.gson.annotations.SerializedName; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,18 +24,15 @@ public class FileNode implements Comparable<FileNode> { private static Logger log = LoggerFactory.getLogger(FileNode.class); /** Path (i.e. file name) is exposed in JSON. */ - @Expose public final String path; /** The file size is exposed in JSON. */ - @Expose public final long size; /** The last modified date-time string is exposed in JSON. */ - @Expose - @SerializedName("last_modified") public final String lastModified; + @JsonIgnore private long lastModifiedMillis; /* Added to satisfy Gson. */ diff --git a/src/main/java/org/torproject/descriptor/index/IndexNode.java b/src/main/java/org/torproject/descriptor/index/IndexNode.java index 19a5aa4..02b5972 100644 --- a/src/main/java/org/torproject/descriptor/index/IndexNode.java +++ b/src/main/java/org/torproject/descriptor/index/IndexNode.java @@ -5,19 +5,20 @@ package org.torproject.descriptor.index; import org.torproject.descriptor.internal.FileType; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.annotations.Expose; -import com.google.gson.annotations.SerializedName; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.fasterxml.jackson.annotation.PropertyAccessor; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.PropertyNamingStrategy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; import java.io.OutputStream; -import java.io.Reader; import java.net.URL; import java.net.URLConnection; import java.nio.file.Files; @@ -34,6 +35,7 @@ import java.util.TreeSet; * * @since 1.4.0 */ +@JsonPropertyOrder({ "created", "revision", "path", "directories", "files" }) public class IndexNode { private static Logger log = LoggerFactory.getLogger(IndexNode.class); @@ -48,29 +50,30 @@ public class IndexNode { public static final IndexNode emptyNode = new IndexNode("", "", new TreeSet<FileNode>(), new TreeSet<DirectoryNode>()); + private static ObjectMapper objectMapper = new ObjectMapper() + .setPropertyNamingStrategy(PropertyNamingStrategy.SNAKE_CASE) + .setSerializationInclusion(JsonInclude.Include.NON_EMPTY) + .setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.NONE) + .setVisibility(PropertyAccessor.FIELD, JsonAutoDetect.Visibility.ANY); + /** The created date-time is exposed in JSON as 'index_created' field. */ - @Expose - @SerializedName("index_created") + @JsonProperty("index_created") public final String created; /** The software's build revision JSON as 'build_revision' field. */ - @Expose - @SerializedName("build_revision") + @JsonProperty("build_revision") public final String revision; /** Path (i.e. base url) is exposed in JSON. */ - @Expose public final String path; /** The directory list is exposed in JSON. Sorted according to path. */ - @Expose public final SortedSet<DirectoryNode> directories; /** The file list is exposed in JSON. Sorted according to path. */ - @Expose public final SortedSet<FileNode> files; - /* Added to satisfy Gson. */ + /* Added to satisfy Jackson. */ private IndexNode() { this.created = null; this.revision = null; @@ -119,11 +122,7 @@ public class IndexNode { * Returns an empty IndexNode in case of an error. */ public static IndexNode fetchIndex(InputStream is) throws IOException { - Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation() - .create(); - try (Reader reader = new InputStreamReader(is)) { - return gson.fromJson(reader, IndexNode.class); - } + return objectMapper.readValue(is, IndexNode.class); } /** Return a map of file paths for the given directories. */ @@ -185,10 +184,8 @@ public class IndexNode { } /** Write JSON representation of the given index node to a string. */ - public static String makeJsonString(IndexNode indexNode) { - Gson gson = new GsonBuilder().excludeFieldsWithoutExposeAnnotation() - .create(); - return gson.toJson(indexNode); + public static String makeJsonString(IndexNode indexNode) throws IOException { + return objectMapper.writeValueAsString(indexNode); } /** For debugging purposes. */ diff --git a/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java b/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java index c733e47..b5c01e3 100644 --- a/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java +++ b/src/test/java/org/torproject/descriptor/index/IndexNodeTest.java @@ -7,6 +7,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; +import com.fasterxml.jackson.core.JsonParseException; + import org.junit.Rule; import org.junit.Test; import org.junit.rules.TemporaryFolder; @@ -114,7 +116,7 @@ public class IndexNodeTest { IndexNode.fetchIndex(indexUrl.toString()); } - @Test(expected = com.google.gson.JsonSyntaxException.class) + @Test(expected = JsonParseException.class) public void testWrongJson() throws Exception { URL indexUrl = getClass().getClassLoader().getResource("index1.json.gz"); IndexNode.fetchIndex(indexUrl.openStream());

1 0

[metrics-lib/release] Bump version to 2.3.0-dev.
by karsten＠torproject.org 25 May '18

25 May '18

commit 77bbd742b63fd9708694d7d8623d82a9654b770e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Apr 18 16:43:13 2018 +0200 Bump version to 2.3.0-dev. --- build.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.xml b/build.xml index 9bff4b2..61cd45d 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.3.0" /> + <property name="release.version" value="2.3.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.4.0 release.
by karsten＠torproject.org 25 May '18

25 May '18

commit 94a7403e62d59619dbdc9952736d9b8b68948a05 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed May 23 17:16:19 2018 +0200 Prepare for 2.4.0 release. --- CERT | 18 +++++++++--------- CHANGELOG.md | 2 +- build.xml | 2 +- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CERT b/CERT index 43be56e..61fa7c6 100644 --- a/CERT +++ b/CERT @@ -1,8 +1,8 @@ -----BEGIN CERTIFICATE----- -MIIDaTCCAlGgAwIBAgIEIk6NnzANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV +MIIDaTCCAlGgAwIBAgIENNGkczANBgkqhkiG9w0BAQsFADBlMQswCQYDVQQGEwJV UzELMAkGA1UECBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBU b3IgUHJvamVjdCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwHhcNMTgw -MjI2MTQwMzUzWhcNMTgwNTI3MTQwMzUzWjBlMQswCQYDVQQGEwJVUzELMAkGA1UE +NTIzMTUxNDU2WhcNMTgwODIxMTUxNDU2WjBlMQswCQYDVQQGEwJVUzELMAkGA1UE CBMCV0ExEDAOBgNVBAcTB1NlYXR0bGUxHTAbBgNVBAoTFFRoZSBUb3IgUHJvamVj dCwgSW5jMRgwFgYDVQQDEw9LYXJzdGVuIExvZXNpbmcwggEiMA0GCSqGSIb3DQEB AQUAA4IBDwAwggEKAoIBAQChXn+IUp+o6G+k4ffxk3TkxZb3iXfiG7byNsG63olU @@ -11,11 +11,11 @@ Qw+VAhKTcEIv4yiR0BWapQyR07pgmKirYVjN6s6ef8NJzUptpxLlaYJ3ZfQfc4aE MXzScgaccwDFIWQ661lzLGCfeSxxa3Xy4wWsGwzNzLITYrrABcbg7yogLo2btNvD oEwGL3/baQdhl0dra6biVCZr9ydn3Hg57S55pUU0rBY25id78zUO8xrfNHw54wwX lOblGt75OOkahP/ZZSBxxoiknJ6y5VQV8y+noA4vigXFAgMBAAGjITAfMB0GA1Ud -DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAlUkU -qqf+4yfXwAWFr2q6iijr54NDDEQwybCblIzVnsuGHPUDuie3ZWSHirtblBs/uJ9x -RxmwkBrJr9IGMmGhN2GKXIPeUH0EZBYo7bsgo5d+E61OCnd/O+1JZzdG9dK+0kfq -MLfo6ltFZZouHIIXfvOm8sLLRrdkXPrLQ/E8fTHB7dL6T8Hqg6pHRrRZDtuSM9CO -zSYropxqlFzzlzciOdTU05D8Cnx2j/RtaycxHxFS7QtriDB0uOfqvyiVeqpr72wG -qetlu3h46fXj3ALGVSXy+YZpYxcRNZsQyiBXdlXbgY0OfOVPFOH3HiZuv3zhfRJW -2DiJiA8BLxZToe2XDA== +DgQWBBSeh60M+/wMYyYhlxtuff2Hk9n7bzANBgkqhkiG9w0BAQsFAAOCAQEAJtEQ +B2AVpVtjTGU7uujUtEjSn1ICv7QLW/37TmHn+m1SWvXOVlSG81eb5JwX449Pn3w5 +K1Bx0JJmJ6Kec2kHtoR1r5/DUlTMtRqKQ5ZHQbvYMx+Ifq8TRALHjcw8p5Vw+gep +0zYbSQycklzFaFqLB8Cus0ICb+UY54HTddpezQ3IXS/vc4Vy07ocm8rUCz1s8L/r +ehTOxSym7G7+kcRzNplFOLL5iO8o6uHPyLR1TIAIXa0XZ41ogNl2q+6CvXG+UI/j +qkzSXD6FJK1Px2nxNFIe/w9NL+chSytIGnV3CImyiORuV+1OxMglyQspSGEbl1XP +OfiTEYHnp12BYMeRyw== -----END CERTIFICATE----- diff --git a/CHANGELOG.md b/CHANGELOG.md index a1266e5..39257fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -# Changes in version 2.4.0 - 2018-05-?? +# Changes in version 2.4.0 - 2018-05-23 * Medium changes - Replace Gson with Jackson. Applications must provide Jackson diff --git a/build.xml b/build.xml index 29db555..c69da65 100644 --- a/build.xml +++ b/build.xml @@ -6,7 +6,7 @@ <project default="usage" name="metrics-lib" basedir="."> - <property name="release.version" value="2.3.0-dev" /> + <property name="release.version" value="2.4.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/master] Replace Gson with Jackson.
by karsten＠torproject.org 25 May '18

25 May '18

1 0

[metrics-lib/master] Prepare for 2.4.0 release.
by karsten＠torproject.org 25 May '18

25 May '18

1 0

[translation/tails-perl5lib_completed] Update translations for tails-perl5lib_completed
by translation＠torproject.org 25 May '18

25 May '18

commit 6ea11cd36c58ebfccc6e7320cc547a5ea9fee17e Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 11:47:37 2018 +0000 Update translations for tails-perl5lib_completed --- ru.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/ru.po b/ru.po index 7e1f23b0e..4a0da28b1 100644 --- a/ru.po +++ b/ru.po @@ -7,13 +7,14 @@ # Misha Dyachuk <Wikia(a)scryptmail.com>, 2016 # Roberto Brigante, 2017 # Uho Lot <yavinav(a)gmail.com>, 2016 +# Виктор Ерухин <folkraft(a)rambler.ru>, 2018 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" -"POT-Creation-Date: 2017-05-20 10:59+0200\n" -"PO-Revision-Date: 2017-11-09 19:07+0000\n" -"Last-Translator: Roberto Brigante\n" +"POT-Creation-Date: 2018-03-15 12:15+0000\n" +"PO-Revision-Date: 2018-05-25 11:29+0000\n" +"Last-Translator: Виктор Ерухин <folkraft(a)rambler.ru>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,12 +28,12 @@ msgstr "Ошибка" #: ../lib/Tails/RunningSystem.pm:161 msgid "" -"The device Tails is running from cannot be found. Maybe you used the `toram'" +"The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" -msgstr "Невозможно найти устройство, с которого запущена Tails. Может быть, вы воспользовались опцией `toram'?" +msgstr "Запущенное устройство Tails не найдено. Возможно вы используете 'toram' опцию?" #: ../lib/Tails/RunningSystem.pm:192 msgid "" -"The drive Tails is running from cannot be found. Maybe you used the `toram' " +"The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" -msgstr "Устройство с Tails не было найдено. Возможно, вы используете опцию \"toram\"?" +msgstr "Запущенный носитель Tails не найден. Возможно вы используете 'toram' опцию?"

1 0

[translation/tails-perl5lib] Update translations for tails-perl5lib
by translation＠torproject.org 25 May '18

25 May '18

commit c0034766d70d185f302db6055bfa56100c4f414b Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 11:47:32 2018 +0000 Update translations for tails-perl5lib --- ru.po | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ru.po b/ru.po index 303915ace..4a0da28b1 100644 --- a/ru.po +++ b/ru.po @@ -7,13 +7,14 @@ # Misha Dyachuk <Wikia(a)scryptmail.com>, 2016 # Roberto Brigante, 2017 # Uho Lot <yavinav(a)gmail.com>, 2016 +# Виктор Ерухин <folkraft(a)rambler.ru>, 2018 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2018-03-15 12:15+0000\n" -"PO-Revision-Date: 2018-03-31 13:21+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2018-05-25 11:29+0000\n" +"Last-Translator: Виктор Ерухин <folkraft(a)rambler.ru>\n" "Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -29,10 +30,10 @@ msgstr "Ошибка" msgid "" "The device Tails is running from cannot be found. Maybe you used the 'toram'" " option?" -msgstr "" +msgstr "Запущенное устройство Tails не найдено. Возможно вы используете 'toram' опцию?" #: ../lib/Tails/RunningSystem.pm:192 msgid "" "The drive Tails is running from cannot be found. Maybe you used the 'toram' " "option?" -msgstr "" +msgstr "Запущенный носитель Tails не найден. Возможно вы используете 'toram' опцию?"

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 25 May '18

25 May '18

commit e3d95f1f2afd4e1820fac456592f6b9d45c62d2d Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 11:45:38 2018 +0000 Update translations for https_everywhere_completed --- ru/https-everywhere.dtd | 1 + 1 file changed, 1 insertion(+) diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd index f75256247..34d43ff20 100644 --- a/ru/https-everywhere.dtd +++ b/ru/https-everywhere.dtd @@ -23,6 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Экспорт настроек"> <!ENTITY https-everywhere.prefs.reset_defaults "По умолчанию"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Это действие сбросит каждый набор правил в состояние по умолчанию. Продолжить?"> <!ENTITY https-everywhere.chrome.stable_rules "Стабильные правила"> <!ENTITY https-everywhere.chrome.stable_rules_description "Принудительное шифрование на этих сайтах:">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 25 May '18

25 May '18

commit 4092173a889bd37e7da982a5dc13d629e15ed005 Author: Translation commit bot <translation(a)torproject.org> Date: Fri May 25 11:45:30 2018 +0000 Update translations for https_everywhere --- ru/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ru/https-everywhere.dtd b/ru/https-everywhere.dtd index 08ed398fe..34d43ff20 100644 --- a/ru/https-everywhere.dtd +++ b/ru/https-everywhere.dtd @@ -23,7 +23,7 @@ <!ENTITY https-everywhere.prefs.export_settings "Экспорт настроек"> <!ENTITY https-everywhere.prefs.reset_defaults "По умолчанию"> -<!ENTITY https-everywhere.prefs.reset_defaults_message "This will reset each ruleset to its default state. Continue?"> +<!ENTITY https-everywhere.prefs.reset_defaults_message "Это действие сбросит каждый набор правил в состояние по умолчанию. Продолжить?"> <!ENTITY https-everywhere.chrome.stable_rules "Стабильные правила"> <!ENTITY https-everywhere.chrome.stable_rules_description "Принудительное шифрование на этих сайтах:">

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2018