Repository: googleapis/google-http-java-client
Pull request #967 (2020-02-01 08:32:21)

chore: update common templates
This PR was generated using Autosynth. :rainbow:

Commits in this repo since last synth:
e42e99136a351e697cd33086e5a3e2102908e6cd chore(docs): missing space (#964)
8941ed519ef08138dfbcd7031141708e170f3814 chore: release 1.34.2-SNAPSHOT (#962)
67d5eb143d705bd8aefde47acc0efb4c81db8bba More work toward removing plusForSpace (#961)
879d81aad37554d7a2497ad3f7950543acea8dc8 chore: release 1.34.1 (#958)
20ac5f6736f975b646cf3006f63112b195d0f32f Prefer more spec compliant escaping (#959)
8e31198270a938eaa128828a760b7b555592842f test: add PercentEscaperTest (#957)
9384459015b37e1671aebadc4b8c25dc9e1e033f fix: include '+' in SAFEPATHCHARS_URLENCODER (#955)
f11b3af3077f7fc3e98b063f1d046ff01d4d8b4b Update apache httpclient (#948)
0c9251cfc79e0c8a1a54a324847f7040da2a3b8c Update setup.md (#946)
f9942bfcbb9f4e9773404bdf16865518393fc9db chore(deps): update dependency com.google.truth:truth to v1.0.1 (#944)
14736cab3dc060ea5b60522ea587cfaf66f29699 deps: remove unnecessary MySQL dependency (#943)
691ad32b199756b2c80e1ea2022b8d47de52386c chore(deps): update dependency org.apache.maven.plugins:maven-assembly-plugin to v3.2.0 (#932)
00ca9a6404bad510e99f5dab41a005254965abfc chore(deps): update dependency org.apache.maven.plugins:maven-surefire-plugin to v3.0.0-m4 (#935)
dc78b713f330f8b7ff8865c2c525566ebf8b68ad chore(deps): update dependency org.apache.maven.plugins:maven-compiler-plugin to v3 (#937)
e76368ef9479a3bf06f7c7cb878d4e8e241bb58c deps: update dependency mysql:mysql-connector-java to v8.0.19 (#940)
fd904d26d67b06fac807d38f8fe4141891ef0330 deps: update dependency org.apache.httpcomponents:httpcore to v4.4.13 (#941)
019b419ddc2d9feab24f22ba62b02c89624e8405 chore(deps): <project.guava.version>28.2-android</project.guava.version> (#938)
686b000568b5580349b3567575bcbc19fd915343 chore(deps): update dependency org.apache.maven.plugins:maven-jar-plugin to v3 (#939)


<details><summary>Log from Synthtool</summary>

```
synthtool > Executing /tmpfs/src/git/autosynth/working_repo/synth.py.
.github/ISSUE_TEMPLATE/bug_report.md
.github/ISSUE_TEMPLATE/feature_request.md
.github/ISSUE_TEMPLATE/support_request.md
.github/PULL_REQUEST_TEMPLATE.md
.github/release-please.yml
.kokoro/build.bat
.kokoro/build.sh
.kokoro/coerce_logs.sh
.kokoro/common.cfg
.kokoro/continuous/common.cfg
.kokoro/continuous/dependencies.cfg
.kokoro/continuous/integration.cfg
.kokoro/continuous/java11.cfg
.kokoro/continuous/java7.cfg
.kokoro/continuous/java8-osx.cfg
.kokoro/continuous/java8-win.cfg
.kokoro/continuous/java8.cfg
.kokoro/continuous/lint.cfg
.kokoro/continuous/propose_release.cfg
.kokoro/continuous/propose_release.sh
.kokoro/continuous/samples.cfg
.kokoro/dependencies.sh
.kokoro/linkage-monitor.sh
.kokoro/nightly/common.cfg
.kokoro/nightly/dependencies.cfg
.kokoro/nightly/integration.cfg
.kokoro/nightly/java11.cfg
.kokoro/nightly/java7.cfg
.kokoro/nightly/java8-osx.cfg
.kokoro/nightly/java8-win.cfg
.kokoro/nightly/java8.cfg
.kokoro/nightly/lint.cfg
.kokoro/nightly/samples.cfg
.kokoro/presubmit/clirr.cfg
.kokoro/presubmit/common.cfg
.kokoro/presubmit/dependencies.cfg
.kokoro/presubmit/integration.cfg
.kokoro/presubmit/java11.cfg
.kokoro/presubmit/java7.cfg
.kokoro/presubmit/java8-osx.cfg
.kokoro/presubmit/java8-win.cfg
.kokoro/presubmit/java8.cfg
.kokoro/presubmit/linkage-monitor.cfg
.kokoro/presubmit/lint.cfg
.kokoro/presubmit/samples.cfg
.kokoro/release/bump_snapshot.cfg
.kokoro/release/bump_snapshot.sh
.kokoro/release/common.cfg
.kokoro/release/common.sh
.kokoro/release/drop.cfg
.kokoro/release/drop.sh
.kokoro/release/promote.cfg
.kokoro/release/promote.sh
.kokoro/release/publish_javadoc.cfg
.kokoro/release/publish_javadoc.sh
.kokoro/release/snapshot.cfg
.kokoro/release/snapshot.sh
.kokoro/release/stage.cfg
.kokoro/release/stage.sh
.kokoro/trampoline.sh
CODE_OF_CONDUCT.md
CONTRIBUTING.md
LICENSE
README.md
codecov.yaml
java.header
license-checks.xml
renovate.json
synthtool > Wrote metadata to synth.metadata.

```
</details>


Patch:
diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh
index 5b1b6551..f88d7553 100755
--- a/.kokoro/linkage-monitor.sh
+++ b/.kokoro/linkage-monitor.sh
@@ -23,7 +23,12 @@ cd github/google-http-java-client/
 java -version
 echo ${JOB_TYPE}
 
-mvn install -DskipTests=true -Dmaven.javadoc.skip=true -Dgcloud.download.skip=true -B -V
+mvn install -B -V \
+  -DskipTests=true \
+  -Dclirr.skip=true \
+  -Denforcer.skip=true \
+  -Dmaven.javadoc.skip=true \
+  -Dgcloud.download.skip=true
 
 # Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR
 JAR=linkage-monitor-latest-all-deps.jar
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 876eacf2..90bfb1e0 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/docs/setup.md b/docs/setup.md
index 3b29fdec..9736859e 100644
--- a/docs/setup.md
+++ b/docs/setup.md
@@ -23,7 +23,7 @@ the `dependencyManagement` section of your `pom.xml`:
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>3.4.0</version>
+      <version>4.2.0</version>
       <type>pom</type>
       <scope>import</scope>
      </dependency>
diff --git a/google-http-client-android/pom.xml b/google-http-client-android/pom.xml
index 801bda48..a36d4f0c 100644
--- a/google-http-client-android/pom.xml
+++ b/google-http-client-android/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-android</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
   <name>Android Platform Extensions to the Google HTTP Client Library for Java.</name>
 
   <build>
@@ -48,15 +48,15 @@
     </plugins>
   </build>
   <dependencies>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.android</groupId>
       <artifactId>android</artifactId>
       <version>4.1.1.4</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client</artifactId>
-    </dependency>
   </dependencies>
 </project>
diff --git a/google-http-client-apache-v2/pom.xml b/google-http-client-apache-v2/pom.xml
index 70931df9..0cef2f33 100644
--- a/google-http-client-apache-v2/pom.xml
+++ b/google-http-client-apache-v2/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-apache-v2</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache-v2:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache-v2:current} -->
   <name>Apache HTTP transport v2 for the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client-appengine/pom.xml b/google-http-client-appengine/pom.xml
index ef1d7f86..048cf4bd 100644
--- a/google-http-client-appengine/pom.xml
+++ b/google-http-client-appengine/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-appengine</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-appengine:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-appengine:current} -->
   <name>Google App Engine extensions to the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client-assembly/pom.xml b/google-http-client-assembly/pom.xml
index da2c62c0..bcf1716c 100644
--- a/google-http-client-assembly/pom.xml
+++ b/google-http-client-assembly/pom.xml
@@ -4,12 +4,12 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.google.http-client</groupId>
   <artifactId>google-http-client-assembly</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-assembly:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-assembly:current} -->
   <packaging>pom</packaging>
   <name>Assembly for the Google HTTP Client Library for Java</name>
 
diff --git a/google-http-client-bom/pom.xml b/google-http-client-bom/pom.xml
index 96a13577..3214960d 100644
--- a/google-http-client-bom/pom.xml
+++ b/google-http-client-bom/pom.xml
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.http-client</groupId>
   <artifactId>google-http-client-bom</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-bom:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-bom:current} -->
   <packaging>pom</packaging>
 
   <name>Google HTTP Client Library for Java BOM</name>
@@ -63,52 +63,52 @@
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client</artifactId>
-        <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client:current} -->
+        <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-android</artifactId>
-        <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
+        <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-apache-v2</artifactId>
-        <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache-v2:current} -->
+        <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-apache-v2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-appengine</artifactId>
-        <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-appengine:current} -->
+        <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-appengine:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-findbugs</artifactId>
-        <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-findbugs:current} -->
+        <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-findbugs:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-gson</artifactId>
-        <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-gson:current} -->
+        <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-gson:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-jackson2</artifactId>
-        <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-jackson2:current} -->
+        <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-jackson2:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-protobuf</artifactId>
-        <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-protobuf:current} -->
+        <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-protobuf:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-test</artifactId>
-        <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
+        <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
         <artifactId>google-http-client-xml</artifactId>
-        <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-xml:current} -->
+        <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-xml:current} -->
       </dependency>
     </dependencies>
   </dependencyManagement>
diff --git a/google-http-client-findbugs/pom.xml b/google-http-client-findbugs/pom.xml
index 148150f1..9a38fc31 100644
--- a/google-http-client-findbugs/pom.xml
+++ b/google-http-client-findbugs/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-findbugs</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-findbugs:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-findbugs:current} -->
   <name>Google APIs Client Library Findbugs custom plugin.</name>
 
   <build>
diff --git a/google-http-client-gson/pom.xml b/google-http-client-gson/pom.xml
index 844a6770..96faf7cc 100644
--- a/google-http-client-gson/pom.xml
+++ b/google-http-client-gson/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-gson</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-gson:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-gson:current} -->
   <name>GSON extensions to the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client-jackson2/pom.xml b/google-http-client-jackson2/pom.xml
index 5c17cf4e..c2d0bc41 100644
--- a/google-http-client-jackson2/pom.xml
+++ b/google-http-client-jackson2/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-jackson2</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-jackson2:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-jackson2:current} -->
   <name>Jackson 2 extensions to the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client-protobuf/pom.xml b/google-http-client-protobuf/pom.xml
index e7d7a531..84e737bc 100644
--- a/google-http-client-protobuf/pom.xml
+++ b/google-http-client-protobuf/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-protobuf</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-protobuf:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-protobuf:current} -->
   <name>Protocol Buffer extensions to the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client-xml/pom.xml b/google-http-client-xml/pom.xml
index b8f6d457..97c6729e 100644
--- a/google-http-client-xml/pom.xml
+++ b/google-http-client-xml/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-xml</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-xml:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-xml:current} -->
   <name>XML extensions to the Google HTTP Client Library for Java.</name>
 
   <build>
diff --git a/google-http-client/pom.xml b/google-http-client/pom.xml
index 013df924..51bf0568 100644
--- a/google-http-client/pom.xml
+++ b/google-http-client/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client:current} -->
   <name>Google HTTP Client Library for Java</name>
   <description>
     Google HTTP Client Library for Java. Functionality that works on all supported Java platforms,
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 fcf25fa4..61071db6 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 @@ import java.util.Map;
  */
 public class UriTemplate {
 
-  static final Map<Character, CompositeOutput> COMPOSITE_PREFIXES =
+  private static final Map<Character, CompositeOutput> COMPOSITE_PREFIXES =
       new HashMap<Character, CompositeOutput>();
 
   static {
@@ -98,14 +98,14 @@ public class UriTemplate {
     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 @@ public class UriTemplate {
     }
 
     /**
-     * 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 @@ public class UriTemplate {
    * 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 @@ public class UriTemplate {
    * 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/json/JsonParser.java b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java
index 7ac07ff5..47764065 100644
--- a/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java
+++ b/google-http-client/src/main/java/com/google/api/client/json/JsonParser.java
@@ -717,7 +717,7 @@ public abstract class JsonParser implements Closeable {
     // value type is now null, class, parameterized type, or generic array type
     JsonToken token = getCurrentToken();
     try {
-      switch (getCurrentToken()) {
+      switch (token) {
         case START_ARRAY:
         case END_ARRAY:
           boolean isArray = Types.isArray(valueType);
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 d75bea05..9d61f8af 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 <a href="http://tools.ietf.org/html/rfc3986#section-2.4">RFC 3986 - section 2.4</a>.
+   * 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 <a href="https://www.w3.org/TR/html401/interact/forms.html#h-17.13.4.1">HTML 4
+   * specification, section 17.13.4.1</a>.
    *
    * <p>When encoding a String, the following rules apply:
    *
@@ -68,9 +76,36 @@ public final class CharEscapers {
    *   <li>{@link java.net.URLEncoder#encode(String, String)} with the encoding name "UTF-8"
    * </ul>
    */
+  @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 <a href="http://tools.ietf.org/html/rfc3986#section-2.4">RFC 3986 - section 2.4</a>.
+   *
+   * <p>When encoding a String, the following rules apply:
+   *
+   * <ul>
+   *   <li>The alphanumeric characters "a" through "z", "A" through "Z" and "0" through "9" remain
+   *       the same.
+   *   <li>The special characters ".", "-", "*", and "_" remain the same.
+   *   <li>The space character " " is converted into "%20".
+   *   <li>All other characters are converted into one or more bytes using UTF-8 encoding and each
+   *       byte is then represented by the 3-character string "%XY", where "XY" is the two-digit,
+   *       uppercase, hexadecimal representation of the byte value.
+   * </ul>
+   *
+   * <p><b>Note</b>: Unlike other escapers, URI escapers produce uppercase hexadecimal sequences.
+   * From <a href="http://tools.ietf.org/html/rfc3986">RFC 3986</a>:<br>
+   * <i>"URI producers and normalizers should use uppercase hexadecimal digits for all
+   * percent-encodings."</i>
+   */
+  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 final class CharEscapers {
 
   /**
    * 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/pom.xml b/pom.xml
index 88498ee1..4d1f7774 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.google.http-client</groupId>
   <artifactId>google-http-client-parent</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
   <packaging>pom</packaging>
   <name>Parent for the Google HTTP Client Library for Java</name>
   <description>Google HTTP Client Library for Java</description>
@@ -544,13 +544,13 @@
       - google-api-java-client/google-api-client-assembly/android-properties (make the filenames match the version here)
       - Internally, update the default features.json file
     -->
-    <project.http-client.version>1.34.2-SNAPSHOT</project.http-client.version><!-- {x-version-update:google-http-client-parent:current} -->
+    <project.http-client.version>1.34.3-SNAPSHOT</project.http-client.version><!-- {x-version-update:google-http-client-parent:current} -->
     <project.appengine.version>1.9.71</project.appengine.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <project.jsr305.version>3.0.2</project.jsr305.version>
     <project.gson.version>2.8.6</project.gson.version>
     <project.jackson-core2.version>2.10.2</project.jackson-core2.version>
-    <project.protobuf-java.version>3.11.1</project.protobuf-java.version>
+    <project.protobuf-java.version>3.11.4</project.protobuf-java.version>
     <project.guava.version>28.2-android</project.guava.version>
     <project.xpp3.version>1.1.4c</project.xpp3.version>
     <project.commons-logging.version>1.2</project.commons-logging.version>
diff --git a/samples/dailymotion-simple-cmdline-sample/pom.xml b/samples/dailymotion-simple-cmdline-sample/pom.xml
index 040ea718..8835f485 100644
--- a/samples/dailymotion-simple-cmdline-sample/pom.xml
+++ b/samples/dailymotion-simple-cmdline-sample/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../../pom.xml</relativePath>
   </parent>
   <artifactId>dailymotion-simple-cmdline-sample</artifactId>
diff --git a/synth.metadata b/synth.metadata
index 7b71dfbb..2f70e109 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -1,5 +1,5 @@
 {
-  "updateTime": "2020-01-07T08:32:34.360210Z",
+  "updateTime": "2020-02-01T08:32:15.578940Z",
   "sources": [
     {
       "template": {
@@ -8,1396 +8,5 @@
         "version": "2019.10.17"
       }
     }
-  ],
-  "newFiles": [
-    {
-      "path": ".repo-metadata.json"
-    },
-    {
-      "path": "checkstyle.xml"
-    },
-    {
-      "path": "renovate.json"
-    },
-    {
-      "path": "findbugs-exclude.xml"
-    },
-    {
-      "path": "synth.py"
-    },
-    {
-      "path": "CHANGELOG.md"
-    },
-    {
-      "path": "codecov.yaml"
-    },
-    {
-      "path": "LICENSE"
-    },
-    {
-      "path": "instructions.html"
-    },
-    {
-      "path": "checkstyle-suppressions.xml"
-    },
-    {
-      "path": ".gitignore"
-    },
-    {
-      "path": "pom.xml"
-    },
-    {
-      "path": "CODE_OF_CONDUCT.md"
-    },
-    {
-      "path": ".travis.yml"
-    },
-    {
-      "path": "synth.metadata"
-    },
-    {
-      "path": "README.md"
-    },
-    {
-      "path": "versions.txt"
-    },
-    {
-      "path": "CONTRIBUTING.md"
-    },
-    {
-      "path": "clirr-ignored-differences.xml"
-    },
-    {
-      "path": "google-http-client-assembly/readme.html"
-    },
-    {
-      "path": "google-http-client-assembly/LICENSE.txt"
-    },
-    {
-      "path": "google-http-client-assembly/pom.xml"
-    },
-    {
-      "path": "google-http-client-assembly/proguard-google-http-client.txt"
-    },
-    {
-      "path": "google-http-client-assembly/classpath-include"
-    },
-    {
-      "path": "google-http-client-assembly/assembly.xml"
-    },
-    {
-      "path": "google-http-client-assembly/licenses/CDDL-LICENSE.txt"
-    },
-    {
-      "path": "google-http-client-assembly/licenses/xpp3_LICENSE.txt"
-    },
-    {
-      "path": "google-http-client-assembly/licenses/APACHE-LICENSE.txt"
-    },
-    {
-      "path": "google-http-client-assembly/licenses/BSD-LICENSE.txt"
-    },
-    {
-      "path": "google-http-client-assembly/properties/google-http-client.jar.properties"
-    },
-    {
-      "path": "google-http-client-assembly/properties/google-http-client-android.jar.properties"
-    },
-    {
-      "path": "google-http-client-assembly/properties/google-http-client-gson.jar.properties"
-    },
-    {
-      "path": "google-http-client-assembly/properties/google-http-client-jackson2.jar.properties"
-    },
-    {
-      "path": "google-http-client-assembly/properties/protobuf-java.jar.properties"
-    },
-    {
-      "path": "google-http-client-assembly/properties/jackson-core.jar.properties"
-    },
-    {
-      "path": "google-http-client-assembly/properties/google-http-client-xml.jar.properties"
-    },
-    {
-      "path": "google-http-client-assembly/properties/gson.jar.properties"
-    },
-    {
-      "path": "google-http-client-assembly/properties/google-http-client-apache-v2.jar.properties"
-    },
-    {
-      "path": "google-http-client-assembly/properties/google-http-client-protobuf.jar.properties"
-    },
-    {
-      "path": "google-http-client-protobuf/pom.xml"
-    },
-    {
-      "path": "google-http-client-protobuf/src/test/proto/simple_proto.proto"
-    },
-    {
-      "path": "google-http-client-protobuf/src/test/java/com/google/api/client/protobuf/ProtocolBuffersTest.java"
-    },
-    {
-      "path": "google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/ProtocolBuffers.java"
-    },
-    {
-      "path": "google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/package-info.java"
-    },
-    {
-      "path": "google-http-client-protobuf/src/main/java/com/google/api/client/protobuf/ProtoObjectParser.java"
-    },
-    {
-      "path": "google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/ProtoHttpContent.java"
-    },
-    {
-      "path": "google-http-client-protobuf/src/main/java/com/google/api/client/http/protobuf/package-info.java"
-    },
-    {
-      "path": "google-http-client-xml/pom.xml"
-    },
-    {
-      "path": "google-http-client-xml/src/test/resources/sample-atom.xml"
-    },
-    {
-      "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/GenericXmlTest.java"
-    },
-    {
-      "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/AtomTest.java"
-    },
-    {
-      "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/XmlNamespaceDictionaryTest.java"
-    },
-    {
-      "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/XmlEnumTest.java"
-    },
-    {
-      "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/GenericXmlListTest.java"
-    },
-    {
-      "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/XmlListTest.java"
-    },
-    {
-      "path": "google-http-client-xml/src/test/java/com/google/api/client/xml/XmlTest.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/XmlNamespaceDictionary.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/GenericXml.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/Xml.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/package-info.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/XmlObjectParser.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/atom/Atom.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/atom/AbstractAtomFeedParser.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/xml/atom/package-info.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/http/xml/AbstractXmlHttpContent.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/http/xml/XmlHttpContent.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/http/xml/package-info.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomFeedParser.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/package-info.java"
-    },
-    {
-      "path": "google-http-client-xml/src/main/java/com/google/api/client/http/xml/atom/AtomContent.java"
-    },
-    {
-      "path": "google-http-client-gson/pom.xml"
-    },
-    {
-      "path": "google-http-client-gson/src/test/java/com/google/api/client/json/gson/GsonParserTest.java"
-    },
-    {
-      "path": "google-http-client-gson/src/test/java/com/google/api/client/json/gson/GsonFactoryTest.java"
-    },
-    {
-      "path": "google-http-client-gson/src/test/java/com/google/api/client/json/gson/GsonGeneratorTest.java"
-    },
-    {
-      "path": "google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonFactory.java"
-    },
-    {
-      "path": "google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonGenerator.java"
-    },
-    {
-      "path": "google-http-client-gson/src/main/java/com/google/api/client/json/gson/package-info.java"
-    },
-    {
-      "path": "google-http-client-gson/src/main/java/com/google/api/client/json/gson/GsonParser.java"
-    },
-    {
-      "path": "google-http-client-jackson2/pom.xml"
-    },
-    {
-      "path": "google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonFactoryTest.java"
-    },
-    {
-      "path": "google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonGeneratorTest.java"
-    },
-    {
-      "path": "google-http-client-jackson2/src/test/java/com/google/api/client/json/jackson2/JacksonParserTest.java"
-    },
-    {
-      "path": "google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonParser.java"
-    },
-    {
-      "path": "google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/package-info.java"
-    },
-    {
-      "path": "google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonFactory.java"
-    },
-    {
-      "path": "google-http-client-jackson2/src/main/java/com/google/api/client/json/jackson2/JacksonGenerator.java"
-    },
-    {
-      "path": "google-http-client-appengine/pom.xml"
-    },
-    {
-      "path": "google-http-client-appengine/src/test/java/com/google/api/client/extensions/appengine/datastore/AppEngineDataStoreFactoryTest.java"
-    },
-    {
-      "path": "google-http-client-appengine/src/test/java/com/google/api/client/extensions/appengine/datastore/AppEngineNoMemcacheDataStoreFactoryTest.java"
-    },
-    {
-      "path": "google-http-client-appengine/src/test/java/com/google/api/client/extensions/appengine/http/UrlFetchTransportTest.java"
-    },
-    {
-      "path": "google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/datastore/package-info.java"
-    },
-    {
-      "path": "google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/datastore/AppEngineDataStoreFactory.java"
-    },
-    {
-      "path": "google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchTransport.java"
-    },
-    {
-      "path": "google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchResponse.java"
-    },
-    {
-      "path": "google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/package-info.java"
-    },
-    {
-      "path": "google-http-client-appengine/src/main/java/com/google/api/client/extensions/appengine/http/UrlFetchRequest.java"
-    },
-    {
-      "path": "samples/dailymotion-simple-cmdline-sample/logging.properties"
-    },
-    {
-      "path": "samples/dailymotion-simple-cmdline-sample/instructions.html"
-    },
-    {
-      "path": "samples/dailymotion-simple-cmdline-sample/pom.xml"
-    },
-    {
-      "path": "samples/dailymotion-simple-cmdline-sample/DailyMotionSample.launch"
-    },
-    {
-      "path": "samples/dailymotion-simple-cmdline-sample/.settings/org.eclipse.jdt.ui.prefs"
-    },
-    {
-      "path": "samples/dailymotion-simple-cmdline-sample/src/main/java/com/google/api/services/samples/dailymotion/cmdline/simple/DailyMotionSample.java"
-    },
-    {
-      "path": "google-http-client-android/AndroidManifest.xml"
-    },
-    {
-      "path": "google-http-client-android/project.properties"
-    },
-    {
-      "path": "google-http-client-android/pom.xml"
-    },
-    {
-      "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/package-info.java"
-    },
-    {
-      "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/AndroidUtils.java"
-    },
-    {
-      "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonParser.java"
-    },
-    {
-      "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonGenerator.java"
-    },
-    {
-      "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactory.java"
-    },
-    {
-      "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/json/package-info.java"
-    },
-    {
-      "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/http/AndroidHttp.java"
-    },
-    {
-      "path": "google-http-client-android/src/main/java/com/google/api/client/extensions/android/http/package-info.java"
-    },
-    {
-      "path": "google-http-client-test/pom.xml"
-    },
-    {
-      "path": "google-http-client-test/src/test/java/com/google/api/client/test/util/store/MemoryDataStoreFactoryTest.java"
-    },
-    {
-      "path": "google-http-client-test/src/test/java/com/google/api/client/test/util/store/FileDataStoreFactoryTest.java"
-    },
-    {
-      "path": "google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonFactoryTest.java"
-    },
-    {
-      "path": "google-http-client-test/src/main/java/com/google/api/client/test/json/package-info.java"
-    },
-    {
-      "path": "google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonGeneratorTest.java"
-    },
-    {
-      "path": "google-http-client-test/src/main/java/com/google/api/client/test/json/AbstractJsonParserTest.java"
-    },
-    {
-      "path": "google-http-client-test/src/main/java/com/google/api/client/test/util/store/AbstractDataStoreFactoryTest.java"
-    },
-    {
-      "path": "google-http-client-test/src/main/java/com/google/api/client/test/util/store/package-info.java"
-    },
-    {
-      "path": ".kokoro/build.bat"
-    },
-    {
-      "path": ".kokoro/build.sh"
-    },
-    {
-      "path": ".kokoro/dependencies.sh"
-    },
-    {
-      "path": ".kokoro/common.cfg"
-    },
-    {
-      "path": ".kokoro/trampoline.sh"
-    },
-    {
-      "path": ".kokoro/coerce_logs.sh"
-    },
-    {
-      "path": ".kokoro/linkage-monitor.sh"
-    },
-    {
-      "path": ".kokoro/continuous/dependencies.cfg"
-    },
-    {
-      "path": ".kokoro/continuous/samples.cfg"
-    },
-    {
-      "path": ".kokoro/continuous/java7.cfg"
-    },
-    {
-      "path": ".kokoro/continuous/java8-osx.cfg"
-    },
-    {
-      "path": ".kokoro/continuous/java10.cfg"
-    },
-    {
-      "path": ".kokoro/continuous/java8-win.cfg"
-    },
-    {
-      "path": ".kokoro/continuous/propose_release.sh"
-    },
-    {
-      "path": ".kokoro/continuous/lint.cfg"
-    },
-    {
-      "path": ".kokoro/continuous/java11.cfg"
-    },
-    {
-      "path": ".kokoro/continuous/common.cfg"
-    },
-    {
-      "path": ".kokoro/continuous/propose_release.cfg"
-    },
-    {
-      "path": ".kokoro/continuous/java8.cfg"
-    },
-    {
-      "path": ".kokoro/continuous/integration.cfg"
-    },
-    {
-      "path": ".kokoro/release/drop.sh"
-    },
-    {
-      "path": ".kokoro/release/stage.cfg"
-    },
-    {
-      "path": ".kokoro/release/promote.cfg"
-    },
-    {
-      "path": ".kokoro/release/publish_javadoc.cfg"
-    },
-    {
-      "path": ".kokoro/release/bump_snapshot.cfg"
-    },
-    {
-      "path": ".kokoro/release/promote.sh"
-    },
-    {
-      "path": ".kokoro/release/stage.sh"
-    },
-    {
-      "path": ".kokoro/release/snapshot.sh"
-    },
-    {
-      "path": ".kokoro/release/snapshot.cfg"
-    },
-    {
-      "path": ".kokoro/release/common.cfg"
-    },
-    {
-      "path": ".kokoro/release/bump_snapshot.sh"
-    },
-    {
-      "path": ".kokoro/release/common.sh"
-    },
-    {
-      "path": ".kokoro/release/drop.cfg"
-    },
-    {
-      "path": ".kokoro/release/publish_javadoc.sh"
-    },
-    {
-      "path": ".kokoro/presubmit/dependencies.cfg"
-    },
-    {
-      "path": ".kokoro/presubmit/samples.cfg"
-    },
-    {
-      "path": ".kokoro/presubmit/java7.cfg"
-    },
-    {
-      "path": ".kokoro/presubmit/java8-osx.cfg"
-    },
-    {
-      "path": ".kokoro/presubmit/linkage-monitor.cfg"
-    },
-    {
-      "path": ".kokoro/presubmit/java10.cfg"
-    },
-    {
-      "path": ".kokoro/presubmit/java8-win.cfg"
-    },
-    {
-      "path": ".kokoro/presubmit/lint.cfg"
-    },
-    {
-      "path": ".kokoro/presubmit/java11.cfg"
-    },
-    {
-      "path": ".kokoro/presubmit/common.cfg"
-    },
-    {
-      "path": ".kokoro/presubmit/clirr.cfg"
-    },
-    {
-      "path": ".kokoro/presubmit/java8.cfg"
-    },
-    {
-      "path": ".kokoro/presubmit/integration.cfg"
-    },
-    {
-      "path": ".kokoro/nightly/dependencies.cfg"
-    },
-    {
-      "path": ".kokoro/nightly/samples.cfg"
-    },
-    {
-      "path": ".kokoro/nightly/java7.cfg"
-    },
-    {
-      "path": ".kokoro/nightly/java8-osx.cfg"
-    },
-    {
-      "path": ".kokoro/nightly/java8-win.cfg"
-    },
-    {
-      "path": ".kokoro/nightly/lint.cfg"
-    },
-    {
-      "path": ".kokoro/nightly/java11.cfg"
-    },
-    {
-      "path": ".kokoro/nightly/common.cfg"
-    },
-    {
-      "path": ".kokoro/nightly/java8.cfg"
-    },
-    {
-      "path": ".kokoro/nightly/integration.cfg"
-    },
-    {
-      "path": "google-http-client/pom.xml"
-    },
-    {
-      "path": "google-http-client/src/test/resources/file.txt"
-    },
-    {
-      "path": "google-http-client/src/test/resources/com/google/api/client/util/secret.pem"
-    },
-    {
-      "path": "google-http-client/src/test/resources/com/google/api/client/util/secret.p12"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/json/GenericJsonTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/json/JsonParserTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/json/JsonObjectParserTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/json/webtoken/JsonWebSignatureTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/testing/http/MockHttpTransportTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/testing/http/MockLowLevelHttpRequestTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/testing/http/FixedClockTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/testing/http/javanet/MockHttpUrlConnectionTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/testing/util/MockBackOffTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/HttpMediaTypeTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/OpenCensusUtilsTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/GZipEncodingTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/ExponentialBackOffPolicyTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/EmptyContentTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/GenericUrlTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/HttpResponseExceptionTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/ConsumingInputStreamTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/MultipartContentTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/HttpRequestTracingTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/HttpResponseTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/HttpRequestTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/HttpHeadersTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/UriTemplateTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/HttpEncodingStreamingContentTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/AbstractHttpContentTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/HttpStatusCodesTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/HttpBackOffIOExpcetionHandlerTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/UrlEncodedParserTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/ByteArrayContentTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/UrlEncodedContentTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/HttpBackOffUnsuccessfulResponseHandlerTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/BasicAuthenticationTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpRequestTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpResponseTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/http/javanet/NetHttpTransportTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/ArrayMapTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/DataMapTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/NanoClockTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/LoggingStreamingContentTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/DataTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/TypesTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/ObjectsTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/ClassInfoTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/GenericDataTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/ExponentialBackOffTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/BackOffTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/DateTimeTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/IOUtilsTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/Base64Test.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/ClockTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/StringUtilsTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/SecurityUtilsTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/FieldInfoTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/PemReaderTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/BackOffUtilsTest.java"
-    },
-    {
-      "path": "google-http-client/src/test/java/com/google/api/client/util/escape/CharEscapersTest.java"
-    },
-    {
-      "path": "google-http-client/src/main/resources/google-http-client.properties"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/JsonParser.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/JsonGenerator.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/JsonFactory.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/JsonToken.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/Json.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/JsonObjectParser.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/GenericJson.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/JsonPolymorphicTypeMap.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/JsonString.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/CustomizeJsonParser.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebToken.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/webtoken/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/webtoken/JsonWebSignature.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/rpc2/JsonRpcRequest.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/json/rpc2/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonFactory.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonParser.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/json/MockJsonGenerator.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/json/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/TestCertificates.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/json/webtoken/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpTransport.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/http/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpResponse.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/http/FixedClock.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/http/HttpTesting.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/http/MockHttpUnsuccessfulResponseHandler.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/http/MockLowLevelHttpRequest.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/http/javanet/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/http/javanet/MockHttpURLConnection.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/http/apache/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/http/apache/MockHttpClient.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/util/MockBackOff.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/util/SecurityTestUtils.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/util/MockSleeper.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/util/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/util/TestableByteArrayOutputStream.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/util/TestableByteArrayInputStream.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/testing/util/LogRecordingHandler.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpResponseException.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/UrlEncodedParser.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/MultipartContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/BasicAuthentication.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpBackOffUnsuccessfulResponseHandler.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpUnsuccessfulResponseHandler.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpEncoding.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpEncodingStreamingContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpExecuteInterceptor.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/ByteArrayContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpRequest.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/EmptyContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/FileContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpRequest.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpStatusCodes.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/UriTemplate.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpBackOffIOExceptionHandler.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/GZipEncoding.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/OpenCensusUtils.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpMediaType.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpIOExceptionHandler.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/UrlEncodedContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpMethods.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/ExponentialBackOffPolicy.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpRequestFactory.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/AbstractHttpContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/AbstractInputStreamContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/BackOffPolicy.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/InputStreamContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpHeaders.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/GenericUrl.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/LowLevelHttpResponse.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpResponseInterceptor.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/ConsumingInputStream.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpTransport.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/HttpRequestInitializer.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/json/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/json/JsonHttpContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/javanet/ConnectionFactory.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpRequest.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpTransport.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/javanet/NetHttpResponse.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/javanet/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/javanet/DefaultConnectionFactory.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/apache/HttpExtensionMethod.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/apache/ContentEntity.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpRequest.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/apache/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpResponse.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/apache/ApacheHttpTransport.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/http/apache/SSLSocketFactoryExtension.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/LoggingByteArrayOutputStream.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Maps.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/NullValue.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/StreamingContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/SslUtils.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Lists.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/GenericData.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Types.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Collections2.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Key.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/BackOff.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Joiner.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/ArrayMap.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Clock.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/ArrayValueMap.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/DateTime.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/StringUtils.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/ObjectParser.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Beta.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/LoggingOutputStream.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/LoggingInputStream.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/LoggingStreamingContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/ExponentialBackOff.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/ByteCountingOutputStream.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/ClassInfo.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Data.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/DataMap.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Sleeper.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Value.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/NanoClock.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/ByteArrayStreamingContent.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Throwables.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/IOUtils.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Charsets.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/SecurityUtils.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Objects.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/FieldInfo.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Base64.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/ByteStreams.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/BackOffUtils.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Preconditions.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Strings.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/PemReader.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/Sets.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStore.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/store/DataStoreFactory.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/store/DataStoreUtils.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/store/AbstractDataStoreFactory.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/store/DataStore.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/store/MemoryDataStoreFactory.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/store/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/store/FileDataStoreFactory.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/store/AbstractMemoryDataStore.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/escape/Escaper.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/escape/CharEscapers.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/escape/Platform.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/escape/PercentEscaper.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/escape/package-info.java"
-    },
-    {
-      "path": "google-http-client/src/main/java/com/google/api/client/util/escape/UnicodeEscaper.java"
-    },
-    {
-      "path": ".github/CODEOWNERS"
-    },
-    {
-      "path": ".github/.release-please.yml"
-    },
-    {
-      "path": ".github/ISSUE_TEMPLATE.md"
-    },
-    {
-      "path": ".github/release-please.yml"
-    },
-    {
-      "path": ".github/PULL_REQUEST_TEMPLATE.md"
-    },
-    {
-      "path": ".github/ISSUE_TEMPLATE/bug_report.md"
-    },
-    {
-      "path": ".github/ISSUE_TEMPLATE/support_request.md"
-    },
-    {
-      "path": ".github/ISSUE_TEMPLATE/feature_request.md"
-    },
-    {
-      "path": "__pycache__/synth.cpython-36.pyc"
-    },
-    {
-      "path": "google-http-client-findbugs/pom.xml"
-    },
-    {
-      "path": "google-http-client-findbugs/src/main/resources/messages.xml"
-    },
-    {
-      "path": "google-http-client-findbugs/src/main/resources/bugrank.txt"
-    },
-    {
-      "path": "google-http-client-findbugs/src/main/resources/findbugs.xml"
-    },
-    {
-      "path": "google-http-client-findbugs/src/main/java/com/google/api/client/findbugs/BetaDetector.java"
-    },
-    {
-      "path": "google-http-client-findbugs/src/main/java/com/google/api/client/findbugs/package-info.java"
-    },
-    {
-      "path": "google-http-client-findbugs/google-http-client-findbugs-test/.project"
-    },
-    {
-      "path": "google-http-client-findbugs/google-http-client-findbugs-test/.classpath"
-    },
-    {
-      "path": "google-http-client-findbugs/google-http-client-findbugs-test/pom.xml"
-    },
-    {
-      "path": "google-http-client-findbugs/google-http-client-findbugs-test/.settings/org.eclipse.jdt.core.prefs"
-    },
-    {
-      "path": "google-http-client-findbugs/google-http-client-findbugs-test/.settings/org.eclipse.jdt.ui.prefs"
-    },
-    {
-      "path": "google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass.java"
-    },
-    {
-      "path": "google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/BetaClass2.java"
-    },
-    {
-      "path": "google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaField.java"
-    },
-    {
-      "path": "google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/Test.java"
-    },
-    {
-      "path": "google-http-client-findbugs/google-http-client-findbugs-test/src/main/java/com/google/api/client/findbugs/test/ClassWithBetaMethod.java"
-    },
-    {
-      "path": ".git/index"
-    },
-    {
-      "path": ".git/packed-refs"
-    },
-    {
-      "path": ".git/HEAD"
-    },
-    {
-      "path": ".git/config"
-    },
-    {
-      "path": ".git/shallow"
-    },
-    {
-      "path": ".git/objects/pack/pack-05aa278ffdf8a410aeb04cb592a33d2cb1daf479.idx"
-    },
-    {
-      "path": ".git/objects/pack/pack-05aa278ffdf8a410aeb04cb592a33d2cb1daf479.pack"
-    },
-    {
-      "path": ".git/refs/remotes/origin/HEAD"
-    },
-    {
-      "path": ".git/refs/heads/autosynth"
-    },
-    {
-      "path": ".git/refs/heads/master"
-    },
-    {
-      "path": ".git/logs/HEAD"
-    },
-    {
-      "path": ".git/logs/refs/remotes/origin/HEAD"
-    },
-    {
-      "path": ".git/logs/refs/heads/autosynth"
-    },
-    {
-      "path": ".git/logs/refs/heads/master"
-    },
-    {
-      "path": "google-http-client-apache-v2/pom.xml"
-    },
-    {
-      "path": "google-http-client-apache-v2/src/test/java/com/google/api/client/http/apache/v2/ApacheHttpTransportTest.java"
-    },
-    {
-      "path": "google-http-client-apache-v2/src/test/java/com/google/api/client/http/apache/v2/ApacheHttpRequestTest.java"
-    },
-    {
-      "path": "google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/HttpExtensionMethod.java"
-    },
-    {
-      "path": "google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ContentEntity.java"
-    },
-    {
-      "path": "google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpRequest.java"
-    },
-    {
-      "path": "google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/package-info.java"
-    },
-    {
-      "path": "google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpResponse.java"
-    },
-    {
-      "path": "google-http-client-apache-v2/src/main/java/com/google/api/client/http/apache/v2/ApacheHttpTransport.java"
-    },
-    {
-      "path": "docs/index.md"
-    },
-    {
-      "path": "docs/exponential-backoff.md"
-    },
-    {
-      "path": "docs/_config.yml"
-    },
-    {
-      "path": "docs/android.md"
-    },
-    {
-      "path": "docs/component-modules.md"
-    },
-    {
-      "path": "docs/google-app-engine.md"
-    },
-    {
-      "path": "docs/support.md"
-    },
-    {
-      "path": "docs/http-transport.md"
-    },
-    {
-      "path": "docs/unit-testing.md"
-    },
-    {
-      "path": "docs/json.md"
-    },
-    {
-      "path": "docs/setup.md"
-    },
-    {
-      "path": "docs/_layouts/default.html"
-    },
-    {
-      "path": "docs/_data/navigation.yml"
-    },
-    {
-      "path": "google-http-client-android-test/AndroidManifest.xml"
-    },
-    {
-      "path": "google-http-client-android-test/pom.xml"
-    },
-    {
-      "path": "google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/FakeTest.java"
-    },
-    {
-      "path": "google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/AndroidJsonFactoryTest.java"
-    },
-    {
-      "path": "google-http-client-android-test/src/main/java/com/google/api/client/extensions/android/json/package-info.java"
-    },
-    {
-      "path": "google-http-client-bom/pom.xml"
-    },
-    {
-      "path": "google-http-client-bom/README.md"
-    }
   ]
 }
\ No newline at end of file
diff --git a/versions.txt b/versions.txt
index 2769477c..ab3e1fea 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.3-SNAPSHOT
+google-http-client-bom:1.34.2:1.34.3-SNAPSHOT
+google-http-client-parent:1.34.2:1.34.3-SNAPSHOT
+google-http-client-android:1.34.2:1.34.3-SNAPSHOT
+google-http-client-android-test:1.34.2:1.34.3-SNAPSHOT
+google-http-client-apache-v2:1.34.2:1.34.3-SNAPSHOT
+google-http-client-appengine:1.34.2:1.34.3-SNAPSHOT
+google-http-client-assembly:1.34.2:1.34.3-SNAPSHOT
+google-http-client-findbugs:1.34.2:1.34.3-SNAPSHOT
+google-http-client-gson:1.34.2:1.34.3-SNAPSHOT
+google-http-client-jackson2:1.34.2:1.34.3-SNAPSHOT
+google-http-client-protobuf:1.34.2:1.34.3-SNAPSHOT
+google-http-client-test:1.34.2:1.34.3-SNAPSHOT
+google-http-client-xml:1.34.2:1.34.3-SNAPSHOT


Test patch:
diff --git a/google-http-client-android-test/pom.xml b/google-http-client-android-test/pom.xml
index d01a09e6..1a7c8355 100644
--- a/google-http-client-android-test/pom.xml
+++ b/google-http-client-android-test/pom.xml
@@ -4,7 +4,7 @@
   <groupId>google-http-client</groupId>
   <artifactId>google-http-client-android-test</artifactId>
   <name>Test project for google-http-client-android.</name>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-android-test:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-android-test:current} -->
   <packaging>apk</packaging>
 
   <build>
@@ -53,7 +53,7 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-android</artifactId>
-      <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
+      <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-android:current} -->
       <exclusions>
         <exclusion>
           <artifactId>android</artifactId>
@@ -72,7 +72,7 @@
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-test</artifactId>
-      <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
+      <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
       <exclusions>
         <exclusion>
           <artifactId>junit</artifactId>
diff --git a/google-http-client-test/pom.xml b/google-http-client-test/pom.xml
index eb72072e..21c06879 100644
--- a/google-http-client-test/pom.xml
+++ b/google-http-client-test/pom.xml
@@ -4,11 +4,11 @@
   <parent>
     <groupId>com.google.http-client</groupId>
     <artifactId>google-http-client-parent</artifactId>
-    <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
+    <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-parent:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-http-client-test</artifactId>
-  <version>1.34.2-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
+  <version>1.34.3-SNAPSHOT</version><!-- {x-version-update:google-http-client-test:current} -->
   <name>Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</name>
 
   <build>
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 53376c38..1a38eeaf 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 class UriTemplateTest extends TestCase {
     assertTrue(requestMap.containsKey("unused"));
   }
 
-  public void testExpanTemplates_basicEncodeValue() {
+  public void testExpandTemplates_basicEncodeValue() {
     SortedMap<String, Object> 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<String, Object> requestMap = Maps.newTreeMap();
+    requestMap.put("abc", "xyz def");
+    assertEquals(";abc=xyz%20def", UriTemplate.expand("{;abc}", requestMap, false));
+  }
+
   public void testExpandTemplates_noExpansionsWithQueryParams() {
     SortedMap<String, Object> requestMap = Maps.newTreeMap();
     requestMap.put("abc", "xyz");