From 67d5eb143d705bd8aefde47acc0efb4c81db8bba Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 28 Jan 2020 12:24:08 -0500 Subject: [PATCH 1/8] More work toward removing plusForSpace (#961) * more standard exception test * replace deprecated methods * update Javadoc * update Javadoc * rename variable for clarity * replace deprecated methods * remove obsolete javadoc * restore some comments * replace deprecated method * unused import * class is final --- .../client/json/jackson2/JacksonFactory.java | 2 +- .../com/google/api/client/xml/atom/Atom.java | 2 +- .../google/api/client/http/GenericUrl.java | 15 ++++------ .../api/client/http/UrlEncodedParser.java | 5 ++-- .../api/client/util/escape/CharEscapers.java | 30 +++++++++---------- .../client/http/ConsumingInputStreamTest.java | 1 - .../client/util/escape/CharEscapersTest.java | 7 ++--- 7 files changed, 29 insertions(+), 33 deletions(-) diff --git a/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonFactory.java b/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonFactory.java index 62bc14ec7..8028d63c6 100644 --- a/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonFactory.java +++ b/google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonFactory.java @@ -29,7 +29,7 @@ /** * Low-level JSON library implementation based on Jackson 2. * - *

Implementation is thread-safe, and sub-classes must be thread-safe. For maximum efficiency, + *

Implementation is thread-safe. For maximum efficiency, * applications should use a single globally-shared instance of the JSON factory. * * @since 1.11 diff --git a/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/Atom.java b/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/Atom.java index 85b39b0a9..c948bd36d 100644 --- a/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/Atom.java +++ b/google-http-client-xml/src/main/java/com/google/api/client/xml/atom/Atom.java @@ -49,7 +49,7 @@ public final class Atom { /** Escaper for the {@code Slug} header. */ private static final PercentEscaper SLUG_ESCAPER = - new PercentEscaper(" !\"#$&'()*+,-./:;<=>?@[\\]^_`{|}~", false); + new PercentEscaper(" !\"#$&'()*+,-./:;<=>?@[\\]^_`{|}~"); static final class StopAtAtomEntry extends Xml.CustomizeParser { diff --git a/google-http-client/src/main/java/com/google/api/client/http/GenericUrl.java b/google-http-client/src/main/java/com/google/api/client/http/GenericUrl.java index 45e9d5ab5..3204f695e 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/GenericUrl.java +++ b/google-http-client/src/main/java/com/google/api/client/http/GenericUrl.java @@ -52,8 +52,7 @@ */ public class GenericUrl extends GenericData { - private static final Escaper URI_FRAGMENT_ESCAPER = - new PercentEscaper("=&-_.!~*'()@:$,;/?:", false); + private static final Escaper URI_FRAGMENT_ESCAPER = new PercentEscaper("=&-_.!~*'()@:$,;/?:"); /** Scheme (lowercase), for example {@code "https"}. */ private String scheme; @@ -90,7 +89,7 @@ public class GenericUrl extends GenericData { public GenericUrl() {} /** - * Constructs from an encoded URL. + * Constructs a GenericUrl from a URL encoded string. * *

Any known query parameters with pre-defined fields as data keys will be parsed based on * their data type. Any unrecognized query parameter will always be parsed as a string. @@ -103,17 +102,17 @@ public GenericUrl() {} * compliant with, at least, RFC 3986. * * @param encodedUrl encoded URL, including any existing query parameters that should be parsed - * @throws IllegalArgumentException if URL has a syntax error + * @throws IllegalArgumentException if the URL has a syntax error */ public GenericUrl(String encodedUrl) { this(encodedUrl, false); } /** - * Constructs from an encoded URL. + * Constructs a GenericUrl from a string. * - *

Any known query parameters with pre-defined fields as data keys are parsed based on their - * data type. Any unrecognized query parameter are always parsed as a string. + *

Any known query parameters with pre-defined fields as data keys will be parsed based on + * their data type. Any unrecognized query parameter will always be parsed as a string. * *

Any {@link MalformedURLException} is wrapped in an {@link IllegalArgumentException}. * @@ -216,7 +215,6 @@ private GenericUrl( @Override public int hashCode() { - // TODO(yanivi): optimize? return build().hashCode(); } @@ -229,7 +227,6 @@ public boolean equals(Object obj) { return false; } GenericUrl other = (GenericUrl) obj; - // TODO(yanivi): optimize? return build().equals(other.build()); } diff --git a/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java b/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java index fb5ec5375..14c3238f7 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java +++ b/google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java @@ -83,7 +83,7 @@ public class UrlEncodedParser implements ObjectParser { public static void parse(String content, Object data) { parse(content, data, true); } - + /** * Parses the given URL-encoded content into the given data object of data key name/value pairs * using {@link #parse(Reader, Object)}. @@ -92,7 +92,7 @@ public static void parse(String content, Object data) { * @param data data key name/value pairs * @param decodeEnabled flag that specifies whether decoding should be enabled. */ - public static void parse(String content, Object data, boolean decodeEnabled) { + public static void parse(String content, Object data, boolean decodeEnabled) { if (content == null) { return; } @@ -103,6 +103,7 @@ public static void parse(String content, Object data, boolean decodeEnabled) { throw Throwables.propagate(exception); } } + /** * Parses the given URL-encoded content into the given data object of data key name/value pairs, * including support for repeating data key names. diff --git a/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java b/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java index 062e082d8..d75bea05c 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java +++ b/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java @@ -1,5 +1,6 @@ /* * Copyright (c) 2010 Google Inc. + * * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except * in compliance with the License. You may obtain a copy of the License at @@ -19,27 +20,26 @@ import java.nio.charset.StandardCharsets; /** - * Utility functions for dealing with {@code CharEscaper}s, and some commonly used {@code - * CharEscaper} instances. + * Utility functions for encoding and decoding URIs. * * @since 1.0 */ public final class CharEscapers { - private static final Escaper URI_ESCAPER = + private static final Escaper APPLICATION_X_WWW_FORM_URLENCODED = new PercentEscaper(PercentEscaper.SAFECHARS_URLENCODER, true); private static final Escaper URI_PATH_ESCAPER = - new PercentEscaper(PercentEscaper.SAFEPATHCHARS_URLENCODER, false); + new PercentEscaper(PercentEscaper.SAFEPATHCHARS_URLENCODER); private static final Escaper URI_RESERVED_ESCAPER = - new PercentEscaper(PercentEscaper.SAFE_PLUS_RESERVED_CHARS_URLENCODER, false); + new PercentEscaper(PercentEscaper.SAFE_PLUS_RESERVED_CHARS_URLENCODER); private static final Escaper URI_USERINFO_ESCAPER = - new PercentEscaper(PercentEscaper.SAFEUSERINFOCHARS_URLENCODER, false); + new PercentEscaper(PercentEscaper.SAFEUSERINFOCHARS_URLENCODER); private static final Escaper URI_QUERY_STRING_ESCAPER = - new PercentEscaper(PercentEscaper.SAFEQUERYSTRINGCHARS_URLENCODER, false); + new PercentEscaper(PercentEscaper.SAFEQUERYSTRINGCHARS_URLENCODER); /** * Escapes the string value so it can be safely included in URIs. For details on escaping URIs, @@ -69,18 +69,18 @@ public final class CharEscapers { * */ public static String escapeUri(String value) { - return URI_ESCAPER.escape(value); + return APPLICATION_X_WWW_FORM_URLENCODED.escape(value); } /** - * Percent-decodes a US-ASCII string into a Unicode string. UTF-8 encoding is used to determine + * Decodes application/x-www-form-urlencoded strings. The UTF-8 character set determines * what characters are represented by any consecutive sequences of the form "%XX". * - *

This replaces each occurrence of '+' with a space, ' '. So this method should not be used - * for non application/x-www-form-urlencoded strings such as host and path. + *

This replaces each occurrence of '+' with a space, ' '. This method should not be used + * for non-application/x-www-form-urlencoded strings such as host and path. * * @param uri a percent-encoded US-ASCII string - * @return a Unicode string + * @return a string without any percent escapes or plus signs */ public static String decodeUri(String uri) { try { @@ -92,11 +92,11 @@ public static String decodeUri(String uri) { } /** - * Decodes the path component of a URI. This must be done via a method that does not try to - * convert + into spaces(the behavior of {@link java.net.URLDecoder#decode(String, String)}). This + * Decodes the path component of a URI. This does not + * convert + into spaces (the behavior of {@link java.net.URLDecoder#decode(String, String)}). This * method transforms URI encoded values into their decoded symbols. * - *

i.e: {@code decodePath("%3Co%3E")} would return {@code ""} + *

e.g. {@code decodePath("%3Co%3E")} returns {@code ""} * * @param path the value to be decoded * @return decoded version of {@code path} diff --git a/google-http-client/src/test/java/com/google/api/client/http/ConsumingInputStreamTest.java b/google-http-client/src/test/java/com/google/api/client/http/ConsumingInputStreamTest.java index d55b5a0d4..33a48dce1 100644 --- a/google-http-client/src/test/java/com/google/api/client/http/ConsumingInputStreamTest.java +++ b/google-http-client/src/test/java/com/google/api/client/http/ConsumingInputStreamTest.java @@ -20,7 +20,6 @@ import java.io.IOException; import java.io.InputStream; -import java.nio.charset.Charset; import java.nio.charset.StandardCharsets; import org.junit.Test; diff --git a/google-http-client/src/test/java/com/google/api/client/util/escape/CharEscapersTest.java b/google-http-client/src/test/java/com/google/api/client/util/escape/CharEscapersTest.java index 0ad3d1e58..0a4e08809 100644 --- a/google-http-client/src/test/java/com/google/api/client/util/escape/CharEscapersTest.java +++ b/google-http-client/src/test/java/com/google/api/client/util/escape/CharEscapersTest.java @@ -38,12 +38,11 @@ public void testDecodeUri_IllegalArgumentException() { } private void subtestDecodeUri_IllegalArgumentException(String input) { - boolean thrown = false; try { CharEscapers.decodeUriPath(input); - } catch (IllegalArgumentException e) { - thrown = true; + fail(); + } catch (IllegalArgumentException expected) { + assertNotNull(expected.getMessage()); } - assertTrue(thrown); } } From 8941ed519ef08138dfbcd7031141708e170f3814 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 28 Jan 2020 10:47:13 -0800 Subject: [PATCH 2/8] chore: release 1.34.2-SNAPSHOT (#962) * updated versions.txt [ci skip] * updated google-http-client-findbugs/google-http-client-findbugs-test/pom.xml [ci skip] * updated google-http-client-android-test/pom.xml [ci skip] * updated google-http-client-android/pom.xml [ci skip] * updated google-http-client-apache-v2/pom.xml [ci skip] * updated google-http-client-appengine/pom.xml [ci skip] * updated google-http-client-assembly/pom.xml [ci skip] * updated google-http-client-bom/pom.xml [ci skip] * updated google-http-client-findbugs/pom.xml [ci skip] * updated google-http-client-gson/pom.xml [ci skip] * updated google-http-client-jackson2/pom.xml [ci skip] * updated google-http-client-protobuf/pom.xml [ci skip] * updated google-http-client-test/pom.xml [ci skip] * updated google-http-client-xml/pom.xml [ci skip] * updated google-http-client/pom.xml [ci skip] * updated pom.xml [ci skip] * updated samples/dailymotion-simple-cmdline-sample/pom.xml [ci skip] --- google-http-client-android-test/pom.xml | 6 ++-- google-http-client-android/pom.xml | 4 +-- google-http-client-apache-v2/pom.xml | 4 +-- google-http-client-appengine/pom.xml | 4 +-- google-http-client-assembly/pom.xml | 4 +-- google-http-client-bom/pom.xml | 22 +++++++-------- google-http-client-findbugs/pom.xml | 4 +-- google-http-client-gson/pom.xml | 4 +-- google-http-client-jackson2/pom.xml | 4 +-- google-http-client-protobuf/pom.xml | 4 +-- google-http-client-test/pom.xml | 4 +-- google-http-client-xml/pom.xml | 4 +-- google-http-client/pom.xml | 4 +-- pom.xml | 4 +-- .../dailymotion-simple-cmdline-sample/pom.xml | 2 +- versions.txt | 28 +++++++++---------- 16 files changed, 53 insertions(+), 53 deletions(-) diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index 54dbbb7cb..d01a09e6e 100644 --- a/google-http-client-android-test/pom.xml +++ b/google-http-client-android-test/pom.xml @@ -4,7 +4,7 @@ google-http-client google-http-client-android-test Test project for google-http-client-android. - 1.34.1 + 1.34.2-SNAPSHOT apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.34.1 + 1.34.2-SNAPSHOT android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.34.1 + 1.34.2-SNAPSHOT junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index 6590ccedc..801bda481 100644 --- a/google-http-client-android/pom.xml +++ b/google-http-client-android/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT ../pom.xml google-http-client-android - 1.34.1 + 1.34.2-SNAPSHOT Android Platform Extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v2/pom.xml b/google-http-client-apache-v2/pom.xml index 3a039269a..70931df93 100644 --- a/google-http-client-apache-v2/pom.xml +++ b/google-http-client-apache-v2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT ../pom.xml google-http-client-apache-v2 - 1.34.1 + 1.34.2-SNAPSHOT Apache HTTP transport v2 for the Google HTTP Client Library for Java. diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index 73dcb3be4..ef1d7f869 100644 --- a/google-http-client-appengine/pom.xml +++ b/google-http-client-appengine/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT ../pom.xml google-http-client-appengine - 1.34.1 + 1.34.2-SNAPSHOT Google App Engine extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-assembly/pom.xml b/google-http-client-assembly/pom.xml index 760b8489f..da2c62c0e 100644 --- a/google-http-client-assembly/pom.xml +++ b/google-http-client-assembly/pom.xml @@ -4,12 +4,12 @@ com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT ../pom.xml com.google.http-client google-http-client-assembly - 1.34.1 + 1.34.2-SNAPSHOT pom Assembly for the Google HTTP Client Library for Java diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index 3189b3fd0..96a13577c 100644 --- a/google-http-client-bom/pom.xml +++ b/google-http-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.http-client google-http-client-bom - 1.34.1 + 1.34.2-SNAPSHOT pom Google HTTP Client Library for Java BOM @@ -63,52 +63,52 @@ com.google.http-client google-http-client - 1.34.1 + 1.34.2-SNAPSHOT com.google.http-client google-http-client-android - 1.34.1 + 1.34.2-SNAPSHOT com.google.http-client google-http-client-apache-v2 - 1.34.1 + 1.34.2-SNAPSHOT com.google.http-client google-http-client-appengine - 1.34.1 + 1.34.2-SNAPSHOT com.google.http-client google-http-client-findbugs - 1.34.1 + 1.34.2-SNAPSHOT com.google.http-client google-http-client-gson - 1.34.1 + 1.34.2-SNAPSHOT com.google.http-client google-http-client-jackson2 - 1.34.1 + 1.34.2-SNAPSHOT com.google.http-client google-http-client-protobuf - 1.34.1 + 1.34.2-SNAPSHOT com.google.http-client google-http-client-test - 1.34.1 + 1.34.2-SNAPSHOT com.google.http-client google-http-client-xml - 1.34.1 + 1.34.2-SNAPSHOT diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index 8a47d151e..148150f18 100644 --- a/google-http-client-findbugs/pom.xml +++ b/google-http-client-findbugs/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT ../pom.xml google-http-client-findbugs - 1.34.1 + 1.34.2-SNAPSHOT Google APIs Client Library Findbugs custom plugin. diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml index 03adfd898..844a6770f 100644 --- a/google-http-client-gson/pom.xml +++ b/google-http-client-gson/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT ../pom.xml google-http-client-gson - 1.34.1 + 1.34.2-SNAPSHOT GSON extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml index 29b26efc3..5c17cf4e7 100644 --- a/google-http-client-jackson2/pom.xml +++ b/google-http-client-jackson2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT ../pom.xml google-http-client-jackson2 - 1.34.1 + 1.34.2-SNAPSHOT Jackson 2 extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml index a5079f435..e7d7a5311 100644 --- a/google-http-client-protobuf/pom.xml +++ b/google-http-client-protobuf/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT ../pom.xml google-http-client-protobuf - 1.34.1 + 1.34.2-SNAPSHOT Protocol Buffer extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml index 4a756e0c7..eb72072e1 100644 --- a/google-http-client-test/pom.xml +++ b/google-http-client-test/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT ../pom.xml google-http-client-test - 1.34.1 + 1.34.2-SNAPSHOT Shared classes used for testing of artifacts in the Google HTTP Client Library for Java. diff --git a/google-http-client-xml/pom.xml b/google-http-client-xml/pom.xml index 462f8a61b..b8f6d4571 100644 --- a/google-http-client-xml/pom.xml +++ b/google-http-client-xml/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT ../pom.xml google-http-client-xml - 1.34.1 + 1.34.2-SNAPSHOT XML extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index c79a16661..013df9249 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT ../pom.xml google-http-client - 1.34.1 + 1.34.2-SNAPSHOT Google HTTP Client Library for Java Google HTTP Client Library for Java. Functionality that works on all supported Java platforms, diff --git a/pom.xml b/pom.xml index aae5f7d58..88498ee1a 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT pom Parent for the Google HTTP Client Library for Java Google HTTP Client Library for Java @@ -544,7 +544,7 @@ - google-api-java-client/google-api-client-assembly/android-properties (make the filenames match the version here) - Internally, update the default features.json file --> - 1.34.1 + 1.34.2-SNAPSHOT 1.9.71 UTF-8 3.0.2 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index f5c1c9e81..040ea7181 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.http-client google-http-client-parent - 1.34.1 + 1.34.2-SNAPSHOT ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/versions.txt b/versions.txt index 4d2439e82..2769477ce 100644 --- a/versions.txt +++ b/versions.txt @@ -1,17 +1,17 @@ # Format: # module:released-version:current-version -google-http-client:1.34.1:1.34.1 -google-http-client-bom:1.34.1:1.34.1 -google-http-client-parent:1.34.1:1.34.1 -google-http-client-android:1.34.1:1.34.1 -google-http-client-android-test:1.34.1:1.34.1 -google-http-client-apache-v2:1.34.1:1.34.1 -google-http-client-appengine:1.34.1:1.34.1 -google-http-client-assembly:1.34.1:1.34.1 -google-http-client-findbugs:1.34.1:1.34.1 -google-http-client-gson:1.34.1:1.34.1 -google-http-client-jackson2:1.34.1:1.34.1 -google-http-client-protobuf:1.34.1:1.34.1 -google-http-client-test:1.34.1:1.34.1 -google-http-client-xml:1.34.1:1.34.1 +google-http-client:1.34.1:1.34.2-SNAPSHOT +google-http-client-bom:1.34.1:1.34.2-SNAPSHOT +google-http-client-parent:1.34.1:1.34.2-SNAPSHOT +google-http-client-android:1.34.1:1.34.2-SNAPSHOT +google-http-client-android-test:1.34.1:1.34.2-SNAPSHOT +google-http-client-apache-v2:1.34.1:1.34.2-SNAPSHOT +google-http-client-appengine:1.34.1:1.34.2-SNAPSHOT +google-http-client-assembly:1.34.1:1.34.2-SNAPSHOT +google-http-client-findbugs:1.34.1:1.34.2-SNAPSHOT +google-http-client-gson:1.34.1:1.34.2-SNAPSHOT +google-http-client-jackson2:1.34.1:1.34.2-SNAPSHOT +google-http-client-protobuf:1.34.1:1.34.2-SNAPSHOT +google-http-client-test:1.34.1:1.34.2-SNAPSHOT +google-http-client-xml:1.34.1:1.34.2-SNAPSHOT From e42e99136a351e697cd33086e5a3e2102908e6cd Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Fri, 31 Jan 2020 13:10:26 -0500 Subject: [PATCH 3/8] chore(docs): missing space (#964) --- docs/component-modules.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/component-modules.md b/docs/component-modules.md index 1f9273d76..29a064466 100644 --- a/docs/component-modules.md +++ b/docs/component-modules.md @@ -41,7 +41,7 @@ contains an implementation of `JsonFactory` based on the Jackson2 API. This modu ## google-http-client-protobuf -[Protocol buffer][protobuf] extensions to theGoogle HTTP Client Library for Java +[Protocol buffer][protobuf] extensions to the Google HTTP Client Library for Java (`google-http-client-protobuf`) support protobuf data format. This module depends on `google-http-client`. ## google-http-client-xml @@ -49,4 +49,4 @@ contains an implementation of `JsonFactory` based on the Jackson2 API. This modu XML extensions to the Google HTTP Client Library for Java (`google-http-client-xml`) support the XML data format. This module depends on `google-http-client`. -[protobuf]: https://developers.google.com/protocol-buffers/docs/overview \ No newline at end of file +[protobuf]: https://developers.google.com/protocol-buffers/docs/overview From 27c2110ff0c86d3c3b4c0bbc98c3e36f4ead72d1 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Mon, 3 Feb 2020 04:19:57 +0100 Subject: [PATCH 4/8] chore(deps): update dependency com.google.protobuf:protobuf-java to v3.11.3 (#968) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 88498ee1a..377d19613 100644 --- a/pom.xml +++ b/pom.xml @@ -550,7 +550,7 @@ 3.0.2 2.8.6 2.10.2 - 3.11.1 + 3.11.3 28.2-android 1.1.4c 1.2 From 7f4c06237287928b9ca78075525b91ed97b8fb80 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Mon, 3 Feb 2020 11:27:28 -0500 Subject: [PATCH 5/8] Latest BOM version (#969) @BenWhitehead --- docs/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup.md b/docs/setup.md index 3b29fdec2..16c3c0ee8 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -23,7 +23,7 @@ the `dependencyManagement` section of your `pom.xml`: com.google.cloud libraries-bom - 3.4.0 + 3.5.0 pom import From 198453b8b9e0765439ac430deaf10ef9df084665 Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Thu, 6 Feb 2020 12:15:22 -0500 Subject: [PATCH 6/8] docs: bom 4.0.0 (#970) @kolea2 --- docs/setup.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/setup.md b/docs/setup.md index 16c3c0ee8..b77577572 100644 --- a/docs/setup.md +++ b/docs/setup.md @@ -23,7 +23,7 @@ the `dependencyManagement` section of your `pom.xml`: com.google.cloud libraries-bom - 3.5.0 + 4.0.0 pom import From 60ba4ea771d8ad0a98eddca10a77c5241187d28c Mon Sep 17 00:00:00 2001 From: Elliotte Rusty Harold Date: Tue, 11 Feb 2020 17:41:19 -0500 Subject: [PATCH 7/8] use %20 to escpae spaces in URI templates (#973) --- .../google/api/client/http/UriTemplate.java | 51 +++++++++---------- .../api/client/util/escape/CharEscapers.java | 41 +++++++++++++-- .../api/client/http/UriTemplateTest.java | 8 ++- 3 files changed, 68 insertions(+), 32 deletions(-) diff --git a/google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java b/google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java index fcf25fa49..61071db68 100644 --- a/google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java +++ b/google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java @@ -55,7 +55,7 @@ */ public class UriTemplate { - static final Map COMPOSITE_PREFIXES = + private static final Map COMPOSITE_PREFIXES = new HashMap(); static { @@ -98,14 +98,14 @@ private enum CompositeOutput { private final boolean reservedExpansion; /** - * @param propertyPrefix The prefix of a parameter or {@code null} for none. In {+var} the + * @param propertyPrefix the prefix of a parameter or {@code null} for none. In {+var} the * prefix is '+' - * @param outputPrefix The string that should be prefixed to the expanded template. - * @param explodeJoiner The delimiter used to join composite values. - * @param requiresVarAssignment Denotes whether or not the expanded template should contain an - * assignment with the variable. - * @param reservedExpansion Reserved expansion allows pct-encoded triplets and characters in the - * reserved set. + * @param outputPrefix the string that should be prefixed to the expanded template. + * @param explodeJoiner the delimiter used to join composite values. + * @param requiresVarAssignment denotes whether or not the expanded template should contain an + * assignment with the variable + * @param reservedExpansion reserved expansion allows percent-encoded triplets and characters in the + * reserved set */ CompositeOutput( Character propertyPrefix, @@ -149,26 +149,22 @@ int getVarNameStartIndex() { } /** - * Encodes the specified value. If reserved expansion is turned on then pct-encoded triplets and + * Encodes the specified value. If reserved expansion is turned on, then percent-encoded triplets and * characters are allowed in the reserved set. * - * @param value The string to be encoded. - * @return The encoded string. + * @param value the string to be encoded + * @return the encoded string */ - String getEncodedValue(String value) { + private String getEncodedValue(String value) { String encodedValue; if (reservedExpansion) { - // Reserved expansion allows pct-encoded triplets and characters in the reserved set. + // Reserved expansion allows percent-encoded triplets and characters in the reserved set. encodedValue = CharEscapers.escapeUriPathWithoutReserved(value); } else { - encodedValue = CharEscapers.escapeUri(value); + encodedValue = CharEscapers.escapeUriConformant(value); } return encodedValue; } - - boolean getReservedExpansion() { - return reservedExpansion; - } } static CompositeOutput getCompositeOutput(String propertyName) { @@ -334,12 +330,12 @@ private static String getSimpleValue(String name, String value, CompositeOutput * Expand the template of a composite list property. Eg: If d := ["red", "green", "blue"] then * {/d*} is expanded to "/red/green/blue" * - * @param varName The name of the variable the value corresponds to. Eg: "d" - * @param iterator The iterator over list values. Eg: ["red", "green", "blue"] - * @param containsExplodeModifier Set to true if the template contains the explode modifier "*" - * @param compositeOutput An instance of CompositeOutput. Contains information on how the + * @param varName the name of the variable the value corresponds to. E.g. "d" + * @param iterator the iterator over list values. E.g. ["red", "green", "blue"] + * @param containsExplodeModifiersSet to true if the template contains the explode modifier "*" + * @param compositeOutput an instance of CompositeOutput. Contains information on how the * expansion should be done - * @return The expanded list template + * @return the expanded list template * @throws IllegalArgumentException if the required list path parameter is empty */ private static String getListPropertyValue( @@ -378,12 +374,11 @@ private static String getListPropertyValue( * Expand the template of a composite map property. Eg: If d := [("semi", ";"),("dot", * "."),("comma", ",")] then {/d*} is expanded to "/semi=%3B/dot=./comma=%2C" * - * @param varName The name of the variable the value corresponds to. Eg: "d" - * @param map The map property value. Eg: [("semi", ";"),("dot", "."),("comma", ",")] + * @param varName the name of the variable the value corresponds to. Eg: "d" + * @param map the map property value. Eg: [("semi", ";"),("dot", "."),("comma", ",")] * @param containsExplodeModifier Set to true if the template contains the explode modifier "*" - * @param compositeOutput An instance of CompositeOutput. Contains information on how the - * expansion should be done - * @return The expanded map template + * @param compositeOutput contains information on how the expansion should be done + * @return the expanded map template * @throws IllegalArgumentException if the required list path parameter is map */ private static String getMapPropertyValue( diff --git a/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java b/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java index d75bea05c..9d61f8af0 100644 --- a/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java +++ b/google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java @@ -29,6 +29,9 @@ public final class CharEscapers { private static final Escaper APPLICATION_X_WWW_FORM_URLENCODED = new PercentEscaper(PercentEscaper.SAFECHARS_URLENCODER, true); + private static final Escaper URI_ESCAPER = + new PercentEscaper(PercentEscaper.SAFECHARS_URLENCODER, false); + private static final Escaper URI_PATH_ESCAPER = new PercentEscaper(PercentEscaper.SAFEPATHCHARS_URLENCODER); @@ -42,8 +45,13 @@ public final class CharEscapers { new PercentEscaper(PercentEscaper.SAFEQUERYSTRINGCHARS_URLENCODER); /** - * Escapes the string value so it can be safely included in URIs. For details on escaping URIs, - * see RFC 3986 - section 2.4. + * Escapes the string value so it can be safely included in application/x-www-form-urlencoded + * data. This is not appropriate for generic URI escaping. In particular it encodes + * the space character as a plus sign instead of percent escaping it, in + * contravention of the URI specification. + * For details on application/x-www-form-urlencoded encoding see the + * see HTML 4 + * specification, section 17.13.4.1. * *

When encoding a String, the following rules apply: * @@ -68,9 +76,36 @@ public final class CharEscapers { *

  • {@link java.net.URLEncoder#encode(String, String)} with the encoding name "UTF-8" * */ + @Deprecated public static String escapeUri(String value) { return APPLICATION_X_WWW_FORM_URLENCODED.escape(value); } + + /** + * Escapes the string value so it can be safely included in any part of a URI. + * For details on escaping URIs, + * see RFC 3986 - section 2.4. + * + *

    When encoding a String, the following rules apply: + * + *

    + * + *

    Note: Unlike other escapers, URI escapers produce uppercase hexadecimal sequences. + * From RFC 3986:
    + * "URI producers and normalizers should use uppercase hexadecimal digits for all + * percent-encodings." + */ + public static String escapeUriConformant(String value) { + return URI_ESCAPER.escape(value); + } /** * Decodes application/x-www-form-urlencoded strings. The UTF-8 character set determines @@ -144,7 +179,7 @@ public static String escapeUriPath(String value) { /** * Escapes a URI path but retains all reserved characters, including all general delimiters. That - * is the same as {@link #escapeUriPath(String)} except that it keeps '?', '+', and '/' unescaped. + * is the same as {@link #escapeUriPath(String)} except that it does not escape '?', '+', and '/'. */ public static String escapeUriPathWithoutReserved(String value) { return URI_RESERVED_ESCAPER.escape(value); diff --git a/google-http-client/src/test/java/com/google/api/client/http/UriTemplateTest.java b/google-http-client/src/test/java/com/google/api/client/http/UriTemplateTest.java index 53376c389..1a38eeafa 100644 --- a/google-http-client/src/test/java/com/google/api/client/http/UriTemplateTest.java +++ b/google-http-client/src/test/java/com/google/api/client/http/UriTemplateTest.java @@ -58,13 +58,19 @@ public void testExpandTemplates_basic() { assertTrue(requestMap.containsKey("unused")); } - public void testExpanTemplates_basicEncodeValue() { + public void testExpandTemplates_basicEncodeValue() { SortedMap requestMap = Maps.newTreeMap(); requestMap.put("abc", "xyz;def"); assertEquals(";abc=xyz%3Bdef", UriTemplate.expand("{;abc}", requestMap, false)); assertEquals("xyz;def", UriTemplate.expand("{+abc}", requestMap, false)); } + public void testExpandTemplates_encodeSpace() { + SortedMap requestMap = Maps.newTreeMap(); + requestMap.put("abc", "xyz def"); + assertEquals(";abc=xyz%20def", UriTemplate.expand("{;abc}", requestMap, false)); + } + public void testExpandTemplates_noExpansionsWithQueryParams() { SortedMap requestMap = Maps.newTreeMap(); requestMap.put("abc", "xyz"); From 74962da6e06e016cc1782e7320916a9c606a7143 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Thu, 13 Feb 2020 13:13:53 -0800 Subject: [PATCH 8/8] chore: release 1.34.2 (#974) * updated CHANGELOG.md [ci skip] * updated README.md [ci skip] * updated versions.txt [ci skip] * updated google-http-client-findbugs/google-http-client-findbugs-test/pom.xml [ci skip] * updated google-http-client-android-test/pom.xml [ci skip] * updated google-http-client-android/pom.xml [ci skip] * updated google-http-client-apache-v2/pom.xml [ci skip] * updated google-http-client-appengine/pom.xml [ci skip] * updated google-http-client-assembly/pom.xml [ci skip] * updated google-http-client-bom/pom.xml [ci skip] * updated google-http-client-findbugs/pom.xml [ci skip] * updated google-http-client-gson/pom.xml [ci skip] * updated google-http-client-jackson2/pom.xml [ci skip] * updated google-http-client-protobuf/pom.xml [ci skip] * updated google-http-client-test/pom.xml [ci skip] * updated google-http-client-xml/pom.xml [ci skip] * updated google-http-client/pom.xml [ci skip] * updated samples/dailymotion-simple-cmdline-sample/pom.xml [ci skip] * updated pom.xml [ci skip] --- CHANGELOG.md | 12 ++++++++ google-http-client-android-test/pom.xml | 6 ++-- google-http-client-android/pom.xml | 4 +-- google-http-client-apache-v2/pom.xml | 4 +-- google-http-client-appengine/pom.xml | 4 +-- google-http-client-assembly/pom.xml | 4 +-- google-http-client-bom/pom.xml | 22 +++++++-------- google-http-client-findbugs/pom.xml | 4 +-- google-http-client-gson/pom.xml | 4 +-- google-http-client-jackson2/pom.xml | 4 +-- google-http-client-protobuf/pom.xml | 4 +-- google-http-client-test/pom.xml | 4 +-- google-http-client-xml/pom.xml | 4 +-- google-http-client/pom.xml | 4 +-- pom.xml | 4 +-- .../dailymotion-simple-cmdline-sample/pom.xml | 2 +- versions.txt | 28 +++++++++---------- 17 files changed, 65 insertions(+), 53 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 876eacf23..90bfb1e0b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +### [1.34.2](https://www.github.com/googleapis/google-http-java-client/compare/v1.34.1...v1.34.2) (2020-02-12) + + +### Bug Fixes + +* use %20 to escpae spaces in URI templates ([#973](https://www.github.com/googleapis/google-http-java-client/issues/973)) ([60ba4ea](https://www.github.com/googleapis/google-http-java-client/commit/60ba4ea771d8ad0a98eddca10a77c5241187d28c)) + + +### Documentation + +* bom 4.0.0 ([#970](https://www.github.com/googleapis/google-http-java-client/issues/970)) ([198453b](https://www.github.com/googleapis/google-http-java-client/commit/198453b8b9e0765439ac430deaf10ef9df084665)) + ### [1.34.1](https://www.github.com/googleapis/google-http-java-client/compare/v1.34.0...v1.34.1) (2020-01-26) diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml index d01a09e6e..9e3dc9569 100644 --- a/google-http-client-android-test/pom.xml +++ b/google-http-client-android-test/pom.xml @@ -4,7 +4,7 @@ google-http-client google-http-client-android-test Test project for google-http-client-android. - 1.34.2-SNAPSHOT + 1.34.2 apk @@ -53,7 +53,7 @@ com.google.http-client google-http-client-android - 1.34.2-SNAPSHOT + 1.34.2 android @@ -72,7 +72,7 @@ com.google.http-client google-http-client-test - 1.34.2-SNAPSHOT + 1.34.2 junit diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml index 801bda481..6a474c559 100644 --- a/google-http-client-android/pom.xml +++ b/google-http-client-android/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 ../pom.xml google-http-client-android - 1.34.2-SNAPSHOT + 1.34.2 Android Platform Extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-apache-v2/pom.xml b/google-http-client-apache-v2/pom.xml index 70931df93..2db004ef0 100644 --- a/google-http-client-apache-v2/pom.xml +++ b/google-http-client-apache-v2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 ../pom.xml google-http-client-apache-v2 - 1.34.2-SNAPSHOT + 1.34.2 Apache HTTP transport v2 for the Google HTTP Client Library for Java. diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml index ef1d7f869..d791810ad 100644 --- a/google-http-client-appengine/pom.xml +++ b/google-http-client-appengine/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 ../pom.xml google-http-client-appengine - 1.34.2-SNAPSHOT + 1.34.2 Google App Engine extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-assembly/pom.xml b/google-http-client-assembly/pom.xml index da2c62c0e..3ab6bff00 100644 --- a/google-http-client-assembly/pom.xml +++ b/google-http-client-assembly/pom.xml @@ -4,12 +4,12 @@ com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 ../pom.xml com.google.http-client google-http-client-assembly - 1.34.2-SNAPSHOT + 1.34.2 pom Assembly for the Google HTTP Client Library for Java diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml index 96a13577c..a8796f688 100644 --- a/google-http-client-bom/pom.xml +++ b/google-http-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.http-client google-http-client-bom - 1.34.2-SNAPSHOT + 1.34.2 pom Google HTTP Client Library for Java BOM @@ -63,52 +63,52 @@ com.google.http-client google-http-client - 1.34.2-SNAPSHOT + 1.34.2 com.google.http-client google-http-client-android - 1.34.2-SNAPSHOT + 1.34.2 com.google.http-client google-http-client-apache-v2 - 1.34.2-SNAPSHOT + 1.34.2 com.google.http-client google-http-client-appengine - 1.34.2-SNAPSHOT + 1.34.2 com.google.http-client google-http-client-findbugs - 1.34.2-SNAPSHOT + 1.34.2 com.google.http-client google-http-client-gson - 1.34.2-SNAPSHOT + 1.34.2 com.google.http-client google-http-client-jackson2 - 1.34.2-SNAPSHOT + 1.34.2 com.google.http-client google-http-client-protobuf - 1.34.2-SNAPSHOT + 1.34.2 com.google.http-client google-http-client-test - 1.34.2-SNAPSHOT + 1.34.2 com.google.http-client google-http-client-xml - 1.34.2-SNAPSHOT + 1.34.2 diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml index 148150f18..e9e33e565 100644 --- a/google-http-client-findbugs/pom.xml +++ b/google-http-client-findbugs/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 ../pom.xml google-http-client-findbugs - 1.34.2-SNAPSHOT + 1.34.2 Google APIs Client Library Findbugs custom plugin. diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml index 844a6770f..463c9feda 100644 --- a/google-http-client-gson/pom.xml +++ b/google-http-client-gson/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 ../pom.xml google-http-client-gson - 1.34.2-SNAPSHOT + 1.34.2 GSON extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml index 5c17cf4e7..e3c9ba349 100644 --- a/google-http-client-jackson2/pom.xml +++ b/google-http-client-jackson2/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 ../pom.xml google-http-client-jackson2 - 1.34.2-SNAPSHOT + 1.34.2 Jackson 2 extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml index e7d7a5311..11cfa76fc 100644 --- a/google-http-client-protobuf/pom.xml +++ b/google-http-client-protobuf/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 ../pom.xml google-http-client-protobuf - 1.34.2-SNAPSHOT + 1.34.2 Protocol Buffer extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml index eb72072e1..d2c9dc1c8 100644 --- a/google-http-client-test/pom.xml +++ b/google-http-client-test/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 ../pom.xml google-http-client-test - 1.34.2-SNAPSHOT + 1.34.2 Shared classes used for testing of artifacts in the Google HTTP Client Library for Java. diff --git a/google-http-client-xml/pom.xml b/google-http-client-xml/pom.xml index b8f6d4571..ac1cb4a7b 100644 --- a/google-http-client-xml/pom.xml +++ b/google-http-client-xml/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 ../pom.xml google-http-client-xml - 1.34.2-SNAPSHOT + 1.34.2 XML extensions to the Google HTTP Client Library for Java. diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml index 013df9249..1b033d480 100644 --- a/google-http-client/pom.xml +++ b/google-http-client/pom.xml @@ -4,11 +4,11 @@ com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 ../pom.xml google-http-client - 1.34.2-SNAPSHOT + 1.34.2 Google HTTP Client Library for Java Google HTTP Client Library for Java. Functionality that works on all supported Java platforms, diff --git a/pom.xml b/pom.xml index 377d19613..eeb364004 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 pom Parent for the Google HTTP Client Library for Java Google HTTP Client Library for Java @@ -544,7 +544,7 @@ - google-api-java-client/google-api-client-assembly/android-properties (make the filenames match the version here) - Internally, update the default features.json file --> - 1.34.2-SNAPSHOT + 1.34.2 1.9.71 UTF-8 3.0.2 diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml index 040ea7181..a735456a7 100644 --- a/samples/dailymotion-simple-cmdline-sample/pom.xml +++ b/samples/dailymotion-simple-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.http-client google-http-client-parent - 1.34.2-SNAPSHOT + 1.34.2 ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/versions.txt b/versions.txt index 2769477ce..fef459c2e 100644 --- a/versions.txt +++ b/versions.txt @@ -1,17 +1,17 @@ # Format: # module:released-version:current-version -google-http-client:1.34.1:1.34.2-SNAPSHOT -google-http-client-bom:1.34.1:1.34.2-SNAPSHOT -google-http-client-parent:1.34.1:1.34.2-SNAPSHOT -google-http-client-android:1.34.1:1.34.2-SNAPSHOT -google-http-client-android-test:1.34.1:1.34.2-SNAPSHOT -google-http-client-apache-v2:1.34.1:1.34.2-SNAPSHOT -google-http-client-appengine:1.34.1:1.34.2-SNAPSHOT -google-http-client-assembly:1.34.1:1.34.2-SNAPSHOT -google-http-client-findbugs:1.34.1:1.34.2-SNAPSHOT -google-http-client-gson:1.34.1:1.34.2-SNAPSHOT -google-http-client-jackson2:1.34.1:1.34.2-SNAPSHOT -google-http-client-protobuf:1.34.1:1.34.2-SNAPSHOT -google-http-client-test:1.34.1:1.34.2-SNAPSHOT -google-http-client-xml:1.34.1:1.34.2-SNAPSHOT +google-http-client:1.34.2:1.34.2 +google-http-client-bom:1.34.2:1.34.2 +google-http-client-parent:1.34.2:1.34.2 +google-http-client-android:1.34.2:1.34.2 +google-http-client-android-test:1.34.2:1.34.2 +google-http-client-apache-v2:1.34.2:1.34.2 +google-http-client-appengine:1.34.2:1.34.2 +google-http-client-assembly:1.34.2:1.34.2 +google-http-client-findbugs:1.34.2:1.34.2 +google-http-client-gson:1.34.2:1.34.2 +google-http-client-jackson2:1.34.2:1.34.2 +google-http-client-protobuf:1.34.2:1.34.2 +google-http-client-test:1.34.2:1.34.2 +google-http-client-xml:1.34.2:1.34.2