diff --git a/.github/.release-please.yml b/.github/.release-please.yml
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/.github/.release-please.yml
@@ -0,0 +1 @@
+
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 000000000..30fdb7b9c
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,10 @@
+# Code owners file.
+# This file controls who is tagged for review for any given pull request.
+
+# For syntax help see:
+# https://help.github.com/en/github/creating-cloning-and-archiving-repositories/about-code-owners#codeowners-syntax
+
+*                       @googleapis/yoshi-java
+
+# The java-samples-reviewers team is the default owner for samples changes
+samples/**/*.java       @googleapis/java-samples-reviewers
diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 000000000..7c86b0e47
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,31 @@
+Thanks for stopping by to let us know something could be better!
+
+Please be sure to include as much information as possible:
+
+#### Environment details
+
+- OS:
+- Java version:
+- google-api-java-client version:
+
+#### Steps to reproduce
+
+1. ?
+2. ?
+
+#### Stacktrace
+
+```
+Any relevant stacktrace here.
+```
+
+#### External references such as API reference guides used
+
+- ?
+
+#### Any additional information below
+
+Making sure to follow these steps will guarantee the quickest resolution possible.
+
+Thanks!
+
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 000000000..f69f0c445
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,51 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+Thanks for stopping by to let us know something could be better!
+
+**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
+
+Please run down the following list and make sure you've tried the usual "quick fixes":
+
+  - Search the issues already opened: https://github.com/googleapis/google-api-java-client/issues
+  - Check for answers on StackOverflow: http://stackoverflow.com/questions/tagged/google-cloud-platform
+
+If you are still having issues, please include as much information as possible:
+
+#### Environment details
+
+1. Specify the API at the beginning of the title. For example, "BigQuery: ...").
+   General, Core, and Other are also allowed as types
+2. OS type and version:
+3. Java version:
+4. google-api-client version(s):
+
+#### Steps to reproduce
+
+  1. ?
+  2. ?
+
+#### Code example
+
+```java
+// example
+```
+
+#### Stack trace
+```
+Any relevant stacktrace here.
+```
+
+#### External references such as API reference guides
+
+- ?
+
+#### Any additional information below
+
+
+Following these steps guarantees the quickest resolution possible.
+
+Thanks!
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 000000000..754e30c68
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,21 @@
+---
+name: Feature request
+about: Suggest an idea for this library
+
+---
+
+Thanks for stopping by to let us know something could be better!
+
+**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
+
+**Is your feature request related to a problem? Please describe.**
+What the problem is. Example: I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+What you want to happen.
+
+**Describe alternatives you've considered**
+Any alternative solutions or features you've considered.
+
+**Additional context**
+Any other context or screenshots about the feature request.
diff --git a/.github/ISSUE_TEMPLATE/support_request.md b/.github/ISSUE_TEMPLATE/support_request.md
new file mode 100644
index 000000000..995869032
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/support_request.md
@@ -0,0 +1,7 @@
+---
+name: Support request
+about: If you have a support contract with Google, please create an issue in the Google Cloud Support console.
+
+---
+
+**PLEASE READ**: If you have a support contract with Google, please create an issue in the [support console](https://cloud.google.com/support/) instead of filing on GitHub. This will ensure a timely response.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 000000000..cbe6adac4
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,7 @@
+Thank you for opening a Pull Request! Before submitting your PR, there are a few things you can do to make sure it goes smoothly:
+- [ ] Make sure to open an issue as a [bug/issue](https://github.com/googleapis/google-api-java-client/issues/new/choose) before writing your code!  That way we can discuss the change, evaluate designs, and agree on the general idea
+- [ ] Ensure the tests and linter pass
+- [ ] Code coverage does not decrease (if any source code was changed)
+- [ ] Appropriate docs were updated (if necessary)
+
+Fixes #<issue_number_goes_here> ☕️
diff --git a/.github/blunderbuss.yml b/.github/blunderbuss.yml
new file mode 100644
index 000000000..1a23ea42b
--- /dev/null
+++ b/.github/blunderbuss.yml
@@ -0,0 +1,7 @@
+# Configuration for the Blunderbuss GitHub app. For more info see
+# https://github.com/googleapis/repo-automation-bots/tree/master/packages/blunderbuss
+assign_prs_by:
+- labels:
+  - samples
+  to:
+  - googleapis/java-samples-reviewers
\ No newline at end of file
diff --git a/.github/generated-files-bot.yml b/.github/generated-files-bot.yml
new file mode 100644
index 000000000..c644a24e1
--- /dev/null
+++ b/.github/generated-files-bot.yml
@@ -0,0 +1,12 @@
+externalManifests:
+- type: json
+  file: 'synth.metadata'
+  jsonpath: '$.generatedFiles[*]'
+- type: json
+  file: '.github/readme/synth.metadata/synth.metadata'
+  jsonpath: '$.generatedFiles[*]'
+ignoreAuthors:
+- 'renovate-bot'
+- 'yoshi-automation'
+- 'release-please[bot]'
+- 'gcf-owl-bot[bot]'
diff --git a/.github/readme/synth.py b/.github/readme/synth.py
new file mode 100644
index 000000000..7b48cc28d
--- /dev/null
+++ b/.github/readme/synth.py
@@ -0,0 +1,19 @@
+# Copyright 2020 Google LLC
+#
+# 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""This script is used to synthesize generated the README for this library."""
+
+from synthtool.languages import java
+
+java.custom_templates(["java_library/README.md"])
diff --git a/.github/release-please.yml b/.github/release-please.yml
new file mode 100644
index 000000000..3cc5e9baf
--- /dev/null
+++ b/.github/release-please.yml
@@ -0,0 +1,8 @@
+bumpMinorPreMajor: true
+handleGHRelease: true
+releaseType: java-yoshi
+branches:
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-lts
+    branch: 1.31.3-sp
diff --git a/.github/snippet-bot.yml b/.github/snippet-bot.yml
new file mode 100644
index 000000000..e69de29bb
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
new file mode 100644
index 000000000..a8c5b3ed6
--- /dev/null
+++ b/.github/sync-repo-settings.yaml
@@ -0,0 +1,43 @@
+rebaseMergeAllowed: false
+squashMergeAllowed: true
+mergeCommitAllowed: false
+branchProtectionRules:
+  - pattern: master
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - units (7)
+      - units (8)
+      - units (11)
+      - windows
+      - dependencies (8)
+      - dependencies (11)
+      - linkage-monitor
+      - lint
+      - clirr
+      - cla/google
+  - pattern: 1.31.3-sp
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - units (7)
+      - units (8)
+      - units (11)
+      - windows
+      - dependencies (8)
+      - dependencies (11)
+      - linkage-monitor
+      - lint
+      - clirr
+      - cla/google
+permissionRules:
+  - team: yoshi-admins
+    permission: admin
+  - team: yoshi-java-admins
+    permission: admin
+  - team: yoshi-java
+    permission: push
diff --git a/.github/trusted-contribution.yml b/.github/trusted-contribution.yml
new file mode 100644
index 000000000..f247d5c78
--- /dev/null
+++ b/.github/trusted-contribution.yml
@@ -0,0 +1,2 @@
+trustedContributors:
+- renovate-bot
\ No newline at end of file
diff --git a/.github/workflows/approve-readme.yaml b/.github/workflows/approve-readme.yaml
new file mode 100644
index 000000000..7513acaeb
--- /dev/null
+++ b/.github/workflows/approve-readme.yaml
@@ -0,0 +1,54 @@
+on:
+  pull_request:
+name: auto-merge-readme
+jobs:
+  approve:
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'googleapis' && github.head_ref == 'autosynth-readme'
+    steps:
+      - uses: actions/github-script@v3
+        with:
+          github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
+          script: |
+            // only approve PRs from yoshi-automation
+            if (context.payload.pull_request.user.login !== "yoshi-automation") {
+              return;
+            }
+
+            // only approve PRs like "chore: release <release version>"
+            if (!context.payload.pull_request.title === "chore: regenerate README") {
+              return;
+            }
+
+            // only approve PRs with README.md and synth.metadata changes
+            const files = new Set(
+              (
+                await github.paginate(
+                  github.pulls.listFiles.endpoint({
+                    owner: context.repo.owner,
+                    repo: context.repo.repo,
+                    pull_number: context.payload.pull_request.number,
+                  })
+                )
+              ).map(file => file.filename)
+            );
+            if (files.size != 2 || !files.has("README.md") || !files.has(".github/readme/synth.metadata/synth.metadata")) {
+              return;
+            }
+
+            // approve README regeneration PR
+            await github.pulls.createReview({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: 'Rubber stamped PR!',
+              pull_number: context.payload.pull_request.number,
+              event: 'APPROVE'
+            });
+
+            // attach automerge label
+            await github.issues.addLabels({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.payload.pull_request.number,
+              labels: ['automerge']
+            });
diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml
new file mode 100644
index 000000000..9b4fd4d83
--- /dev/null
+++ b/.github/workflows/auto-release.yaml
@@ -0,0 +1,88 @@
+on:
+  pull_request:
+name: auto-release
+jobs:
+  approve:
+    runs-on: ubuntu-latest
+    if: contains(github.head_ref, 'release-please')
+    steps:
+    - uses: actions/github-script@v3
+      with:
+        github-token: ${{secrets.YOSHI_APPROVER_TOKEN}}
+        debug: true
+        script: |
+          // only approve PRs from release-please[bot]
+          if (context.payload.pull_request.user.login !== "release-please[bot]") {
+            return;
+          }
+
+          // only approve PRs like "chore: release <release version>"
+          if ( !context.payload.pull_request.title.startsWith("chore: release") ) {
+            return;
+          }
+
+          // only approve PRs with pom.xml and versions.txt changes
+          const filesPromise = github.pulls.listFiles.endpoint({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            pull_number: context.payload.pull_request.number,
+          });
+          const changed_files = await github.paginate(filesPromise)
+
+          if ( changed_files.length < 1 ) {
+            console.log( "Not proceeding since PR is empty!" )
+            return;
+          }
+
+          if ( !changed_files.some(v => v.filename.includes("pom")) || !changed_files.some(v => v.filename.includes("versions.txt")) ) {
+            console.log( "PR file changes do not have pom.xml or versions.txt -- something is wrong. PTAL!" )
+            return;
+          }
+
+          // trigger auto-release when
+          // 1) it is a SNAPSHOT release (auto-generated post regular release)
+          // 2) there are dependency updates only
+          // 3) there are no open dependency update PRs in this repo (to avoid multiple releases)
+          if (
+            context.payload.pull_request.body.includes("Fix") ||
+            context.payload.pull_request.body.includes("Build") ||
+            context.payload.pull_request.body.includes("Documentation") ||
+            context.payload.pull_request.body.includes("BREAKING CHANGES") ||
+            context.payload.pull_request.body.includes("Features")
+          ) {
+            console.log( "Not auto-releasing since it is not a dependency-update-only release." );
+            return;
+          }
+
+          const promise = github.pulls.list.endpoint({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            state: 'open'
+          });
+          const open_pulls = await github.paginate(promise)
+
+          if ( open_pulls.length > 1 && !context.payload.pull_request.title.includes("SNAPSHOT") ) {
+            for ( const pull of open_pulls ) {
+              if ( pull.title.startsWith("deps: update dependency") ) {
+                console.log( "Not auto-releasing yet since there are dependency update PRs open in this repo." );
+                return;
+              }
+            }
+          }
+
+          // approve release PR
+          await github.pulls.createReview({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            body: 'Rubber stamped release!',
+            pull_number: context.payload.pull_request.number,
+            event: 'APPROVE'
+          });
+
+          // attach kokoro:force-run and automerge labels
+          await github.issues.addLabels({
+            owner: context.repo.owner,
+            repo: context.repo.repo,
+            issue_number: context.payload.pull_request.number,
+            labels: ['kokoro:force-run', 'automerge']
+          });
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
new file mode 100644
index 000000000..cc337f60d
--- /dev/null
+++ b/.github/workflows/ci.yaml
@@ -0,0 +1,102 @@
+on:
+  push:
+    branches:
+    - master
+  pull_request:
+name: ci
+jobs:
+  units:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [7, 8, 11]
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: ${{matrix.java}}
+    - run: java -version
+    - run: .kokoro/install_dependencies.sh
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: test
+  windows:
+    runs-on: windows-latest
+    steps:
+    - name: git configuration to avoid automatic CRLF conversion
+      run: |
+        git config --global core.autocrlf false
+        git config --global core.eol lf
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - run: java -version
+    - name: Install google-play-services artifact
+      shell: bash
+      run: |
+        mkdir play-services
+        cd play-services
+        curl --output play-services-basement-8.3.0.aar https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/8.3.0/play-services-basement-8.3.0.aar
+        unzip play-services-basement-8.3.0.aar
+        mvn install:install-file \
+            -Dfile=classes.jar \
+            -DgroupId=com.google.android.google-play-services \
+            -DartifactId=google-play-services \
+            -Dversion=1 \
+            -Dpackaging=jar
+    - run: .kokoro/build.sh
+      shell: bash
+      env:
+        JOB_TYPE: test
+  dependencies:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        java: [8, 11]
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: ${{matrix.java}}
+    - run: java -version
+    - run: .kokoro/install_dependencies.sh
+    - run: .kokoro/dependencies.sh
+  linkage-monitor:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - run: java -version
+    - run: .kokoro/install_dependencies.sh
+    - name: Install artifacts to local Maven repository
+      run: .kokoro/build.sh
+      shell: bash
+    - name: Validate dependencies with regard to com.google.cloud:libraries-bom (latest release)
+      uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 11
+    - run: java -version
+    - run: .kokoro/install_dependencies.sh
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: lint
+  clirr:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-java@v1
+      with:
+        java-version: 8
+    - run: java -version
+    - run: .kokoro/install_dependencies.sh
+    - run: .kokoro/build.sh
+      env:
+        JOB_TYPE: clirr
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 809cc8f28..2d6752757 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,30 @@
-target/
-bin/
+.gitignore
+
+# Packages
+dist
+bin
+var
+sdist
+target
+
+# Unit test / coverage reports
+.coverage
+.tox
+nosetests.xml
+
+# Translations
+*.mo
+
+# Mr Developer
+.mr.developer.cfg
+.project
+.pydevproject
+*.iml
+.idea
+.settings
+.DS_Store
+.classpath
+
+
+# Python utilities
+*.pyc
diff --git a/.hgignore b/.hgignore
deleted file mode 100644
index 88774422d..000000000
--- a/.hgignore
+++ /dev/null
@@ -1,6 +0,0 @@
-
-syntax: regexp
-^(.*/)?target$
-
-syntax: regexp
-^(.*/)?bin$
diff --git a/.kokoro/build.bat b/.kokoro/build.bat
new file mode 100644
index 000000000..05826ad93
--- /dev/null
+++ b/.kokoro/build.bat
@@ -0,0 +1,3 @@
+:: See documentation in type-shell-output.bat
+
+"C:\Program Files\Git\bin\bash.exe" %~dp0build.sh
diff --git a/.kokoro/build.sh b/.kokoro/build.sh
new file mode 100755
index 000000000..b615ef989
--- /dev/null
+++ b/.kokoro/build.sh
@@ -0,0 +1,125 @@
+#!/bin/bash
+# Copyright 2019 Google LLC
+#
+# 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+# include common functions
+source ${scriptDir}/common.sh
+
+# Print out Maven & Java version
+mvn -version
+echo ${JOB_TYPE}
+
+# attempt to install 3 times with exponential backoff (starting with 10 seconds)
+retry_with_backoff 3 10 \
+  mvn install -B -V -ntp \
+    -DskipTests=true \
+    -Dclirr.skip=true \
+    -Denforcer.skip=true \
+    -Dmaven.javadoc.skip=true \
+    -Dgcloud.download.skip=true \
+    -T 1C
+
+# if GOOGLE_APPLICATION_CREDENTIALS is specified as a relative path, prepend Kokoro root directory onto it
+if [[ ! -z "${GOOGLE_APPLICATION_CREDENTIALS}" && "${GOOGLE_APPLICATION_CREDENTIALS}" != /* ]]; then
+    export GOOGLE_APPLICATION_CREDENTIALS=$(realpath ${KOKORO_GFILE_DIR}/${GOOGLE_APPLICATION_CREDENTIALS})
+fi
+
+RETURN_CODE=0
+set +e
+
+case ${JOB_TYPE} in
+test)
+    mvn test -B -Dclirr.skip=true -Denforcer.skip=true
+    RETURN_CODE=$?
+    ;;
+lint)
+    mvn com.coveo:fmt-maven-plugin:check
+    RETURN_CODE=$?
+    ;;
+javadoc)
+    mvn javadoc:javadoc javadoc:test-javadoc
+    RETURN_CODE=$?
+    ;;
+integration)
+    mvn -B ${INTEGRATION_TEST_ARGS} \
+      -ntp \
+      -Penable-integration-tests \
+      -DtrimStackTrace=false \
+      -Dclirr.skip=true \
+      -Denforcer.skip=true \
+      -fae \
+      verify
+    RETURN_CODE=$?
+    ;;
+samples)
+    SAMPLES_DIR=samples
+    # only run ITs in snapshot/ on presubmit PRs. run ITs in all 3 samples/ subdirectories otherwise.
+    if [[ ! -z ${KOKORO_GITHUB_PULL_REQUEST_NUMBER} ]]
+    then
+      SAMPLES_DIR=samples/snapshot
+    fi
+
+    if [[ -f ${SAMPLES_DIR}/pom.xml ]]
+    then
+        for FILE in ${KOKORO_GFILE_DIR}/secret_manager/*-samples-secrets; do
+          [[ -f "$FILE" ]] || continue
+          source "$FILE"
+        done
+
+        pushd ${SAMPLES_DIR}
+        mvn -B \
+          -Penable-samples \
+          -ntp \
+          -DtrimStackTrace=false \
+          -Dclirr.skip=true \
+          -Denforcer.skip=true \
+          -fae \
+          verify
+        RETURN_CODE=$?
+        popd
+    else
+        echo "no sample pom.xml found - skipping sample tests"
+    fi
+    ;;
+clirr)
+    mvn -B -Denforcer.skip=true clirr:check
+    RETURN_CODE=$?
+    ;;
+*)
+    ;;
+esac
+
+if [ "${REPORT_COVERAGE}" == "true" ]
+then
+  bash ${KOKORO_GFILE_DIR}/codecov.sh
+fi
+
+# fix output location of logs
+bash .kokoro/coerce_logs.sh
+
+if [[ "${ENABLE_BUILD_COP}" == "true" ]]
+then
+    chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/flakybot
+    ${KOKORO_GFILE_DIR}/linux_amd64/flakybot -repo=googleapis/google-api-java-client
+fi
+
+echo "exiting with ${RETURN_CODE}"
+exit ${RETURN_CODE}
diff --git a/.kokoro/coerce_logs.sh b/.kokoro/coerce_logs.sh
new file mode 100755
index 000000000..46edbf7f2
--- /dev/null
+++ b/.kokoro/coerce_logs.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+# Copyright 2019 Google LLC
+#
+# 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# This script finds and moves sponge logs so that they can be found by placer
+# and are not flagged as flaky by sponge.
+
+set -eo pipefail
+
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+job=$(basename ${KOKORO_JOB_NAME})
+
+echo "coercing sponge logs..."
+for xml in `find . -name *-sponge_log.xml`
+do
+  class=$(basename ${xml} | cut -d- -f2)
+  dir=$(dirname ${xml})/${job}/${class}
+  text=$(dirname ${xml})/${class}-sponge_log.txt
+  mkdir -p ${dir}
+  mv ${xml} ${dir}/sponge_log.xml
+  mv ${text} ${dir}/sponge_log.txt
+done
diff --git a/.kokoro/common.cfg b/.kokoro/common.cfg
new file mode 100644
index 000000000..7ba13c29d
--- /dev/null
+++ b/.kokoro/common.cfg
@@ -0,0 +1,13 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download trampoline resources. These will be in ${KOKORO_GFILE_DIR}
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# All builds use the trampoline script to run in docker.
+build_file: "google-api-java-client/.kokoro/trampoline.sh"
+
+# Tell the trampoline which build file to use.
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/build.sh"
+}
diff --git a/.kokoro/common.sh b/.kokoro/common.sh
new file mode 100644
index 000000000..ace89f45a
--- /dev/null
+++ b/.kokoro/common.sh
@@ -0,0 +1,58 @@
+#!/bin/bash
+# Copyright 2020 Google LLC
+#
+# 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+function retry_with_backoff {
+    attempts_left=$1
+    sleep_seconds=$2
+    shift 2
+    command=$@
+
+
+    # store current flag state
+    flags=$-
+    
+    # allow a failures to continue
+    set +e
+    ${command}
+    exit_code=$?
+
+    # restore "e" flag
+    if [[ ${flags} =~ e ]]
+    then set -e
+    else set +e
+    fi
+
+    if [[ $exit_code == 0 ]]
+    then
+        return 0
+    fi
+
+    # failure
+    if [[ ${attempts_left} > 0 ]]
+    then
+        echo "failure (${exit_code}), sleeping ${sleep_seconds}..."
+        sleep ${sleep_seconds}
+        new_attempts=$((${attempts_left} - 1))
+        new_sleep=$((${sleep_seconds} * 2))
+        retry_with_backoff ${new_attempts} ${new_sleep} ${command}
+    fi
+
+    return $exit_code
+}
+
+## Helper functionss
+function now() { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n'; }
+function msg() { println "$*" >&2; }
+function println() { printf '%s\n' "$(now) $*"; }
\ No newline at end of file
diff --git a/.kokoro/continuous/common.cfg b/.kokoro/continuous/common.cfg
new file mode 100644
index 000000000..81ac96db0
--- /dev/null
+++ b/.kokoro/continuous/common.cfg
@@ -0,0 +1,25 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.txt"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "google-api-java-client/.kokoro/trampoline.sh"
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/build.sh"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "test"
+}
diff --git a/.kokoro/continuous/java10.cfg b/.kokoro/continuous/java10.cfg
new file mode 100644
index 000000000..6e2f1f5fa
--- /dev/null
+++ b/.kokoro/continuous/java10.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java10"
+}
diff --git a/.kokoro/continuous/java8.cfg b/.kokoro/continuous/java8.cfg
new file mode 100644
index 000000000..495cc7bac
--- /dev/null
+++ b/.kokoro/continuous/java8.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "REPORT_COVERAGE"
+  value: "true"
+}
diff --git a/.kokoro/continuous/propose_release.sh b/.kokoro/continuous/propose_release.sh
new file mode 100755
index 000000000..a67b3ce2b
--- /dev/null
+++ b/.kokoro/continuous/propose_release.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# Copyright 2019 Google LLC
+#
+# 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
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
+if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then
+  # Groom the release PR as new commits are merged.
+  npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \
+    --repo-url=googleapis/google-api-java-client \
+    --package-name="google-api-client" \
+    --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \
+    --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \
+    --release-type=java-yoshi
+fi
diff --git a/.kokoro/continuous/readme.cfg b/.kokoro/continuous/readme.cfg
new file mode 100644
index 000000000..aa35f0b8d
--- /dev/null
+++ b/.kokoro/continuous/readme.cfg
@@ -0,0 +1,55 @@
+# Copyright 2020 Google LLC
+#
+# 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/python-multi"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/readme.sh"
+}
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.log"
+  }
+}
+
+# The github token is stored here.
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "yoshi-automation-github-key"
+      # TODO(theacodes): remove this after secrets have globally propagated
+      backend_type: FASTCONFIGPUSH
+    }
+  }
+}
+
+# Common env vars for all repositories and builds.
+env_vars: {
+    key: "GITHUB_USER"
+    value: "yoshi-automation"
+}
+env_vars: {
+    key: "GITHUB_EMAIL"
+    value: "yoshi-automation@google.com"
+}
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
new file mode 100755
index 000000000..9030ba8f9
--- /dev/null
+++ b/.kokoro/dependencies.sh
@@ -0,0 +1,91 @@
+#!/bin/bash
+# Copyright 2019 Google LLC
+#
+# 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+shopt -s nullglob
+
+## Get the directory of the build script
+scriptDir=$(realpath $(dirname "${BASH_SOURCE[0]}"))
+## cd to the parent directory, i.e. the root of the git repo
+cd ${scriptDir}/..
+
+# include common functions
+source ${scriptDir}/common.sh
+
+# Print out Java
+java -version
+echo $JOB_TYPE
+
+export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m"
+
+# this should run maven enforcer
+retry_with_backoff 3 10 \
+  mvn install -B -V -ntp \
+    -DskipTests=true \
+    -Dmaven.javadoc.skip=true \
+    -Dclirr.skip=true
+
+mvn -B dependency:analyze -DfailOnWarning=true
+
+echo "****************** DEPENDENCY LIST COMPLETENESS CHECK *******************"
+## Run dependency list completeness check
+function completenessCheck() {
+  # Output dep list with compile scope generated using the original pom
+  # Running mvn dependency:list on Java versions that support modules will also include the module of the dependency.
+  # This is stripped from the output as it is not present in the flattened pom.
+  # Only dependencies with 'compile' or 'runtime' scope are included from original dependency list.
+  msg "Generating dependency list using original pom..."
+  mvn dependency:list -f pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' | sed -e 's/ --.*//' >.org-list.txt
+
+  # Output dep list generated using the flattened pom (only 'compile' and 'runtime' scopes)
+  msg "Generating dependency list using flattened pom..."
+  mvn dependency:list -f .flattened-pom.xml -DincludeScope=runtime -Dsort=true | grep '\[INFO]    .*:.*:.*:.*:.*' >.new-list.txt
+
+  # Compare two dependency lists
+  msg "Comparing dependency lists..."
+  diff .org-list.txt .new-list.txt >.diff.txt
+  if [[ $? == 0 ]]
+    then
+      msg "Success. No diff!"
+  else
+    msg "Diff found. See below: "
+    msg "You can also check .diff.txt file located in $1."
+    cat .diff.txt
+    return 1
+  fi
+}
+
+# Allow failures to continue running the script
+set +e
+
+error_count=0
+for path in **/.flattened-pom.xml
+do
+  # Check flattened pom in each dir that contains it for completeness
+  dir=$(dirname "$path")
+  pushd "$dir"
+  completenessCheck "$dir"
+  error_count=$(($error_count + $?))
+  popd
+done
+
+if [[ $error_count == 0 ]]
+then
+  msg "All checks passed."
+  exit 0
+else
+  msg "Errors found. See log statements above."
+  exit 1
+fi
diff --git a/.kokoro/install_dependencies.sh b/.kokoro/install_dependencies.sh
new file mode 100755
index 000000000..a0439dd7d
--- /dev/null
+++ b/.kokoro/install_dependencies.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Copyright 2018 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+# Install the android SDK
+mvn dependency:get -Dartifact=com.google.android:android:4.1.1.4
+
+# Install the appengine SDK
+mvn dependency:get -Dartifact=com.google.appengine:appengine-api-1.0-sdk:1.9.65
+
+# Install play services
+mvn dependency:get -Dartifact=com.google.android.google-play-services:google-play-services:1 -o -DremoteRepositories=file:~/.m2 || \
+  (wget https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/8.3.0/play-services-basement-8.3.0.aar && \
+   unzip play-services-basement-8.3.0.aar && \
+   mvn install:install-file \
+      -Dfile=classes.jar \
+      -DgroupId=com.google.android.google-play-services \
+      -DartifactId=google-play-services \
+      -Dversion=1 \
+   -Dpackaging=jar)
diff --git a/.kokoro/nightly/common.cfg b/.kokoro/nightly/common.cfg
new file mode 100644
index 000000000..81ac96db0
--- /dev/null
+++ b/.kokoro/nightly/common.cfg
@@ -0,0 +1,25 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.txt"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "google-api-java-client/.kokoro/trampoline.sh"
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/build.sh"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "test"
+}
diff --git a/.kokoro/nightly/integration.cfg b/.kokoro/nightly/integration.cfg
new file mode 100644
index 000000000..0048c8ece
--- /dev/null
+++ b/.kokoro/nightly/integration.cfg
@@ -0,0 +1,37 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration"
+}
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "ENABLE_BUILD_COP"
+  value: "true"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
diff --git a/.kokoro/nightly/java11.cfg b/.kokoro/nightly/java11.cfg
new file mode 100644
index 000000000..709f2b4c7
--- /dev/null
+++ b/.kokoro/nightly/java11.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
diff --git a/.kokoro/nightly/java7.cfg b/.kokoro/nightly/java7.cfg
new file mode 100644
index 000000000..cb24f44ee
--- /dev/null
+++ b/.kokoro/nightly/java7.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java7"
+}
diff --git a/.kokoro/nightly/java8-osx.cfg b/.kokoro/nightly/java8-osx.cfg
new file mode 100644
index 000000000..59d051c1b
--- /dev/null
+++ b/.kokoro/nightly/java8-osx.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "google-api-java-client/.kokoro/build.sh"
diff --git a/.kokoro/nightly/java8-win.cfg b/.kokoro/nightly/java8-win.cfg
new file mode 100644
index 000000000..a4d91e3ca
--- /dev/null
+++ b/.kokoro/nightly/java8-win.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "google-api-java-client/.kokoro/build.bat"
diff --git a/.kokoro/nightly/java8.cfg b/.kokoro/nightly/java8.cfg
new file mode 100644
index 000000000..495cc7bac
--- /dev/null
+++ b/.kokoro/nightly/java8.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "REPORT_COVERAGE"
+  value: "true"
+}
diff --git a/.kokoro/nightly/samples.cfg b/.kokoro/nightly/samples.cfg
new file mode 100644
index 000000000..f25429314
--- /dev/null
+++ b/.kokoro/nightly/samples.cfg
@@ -0,0 +1,38 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "samples"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-docs-samples-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-docs-samples-service-account"
+}
+
+env_vars: {
+  key: "ENABLE_BUILD_COP"
+  value: "true"
+}
diff --git a/.kokoro/populate-secrets.sh b/.kokoro/populate-secrets.sh
new file mode 100755
index 000000000..f52514257
--- /dev/null
+++ b/.kokoro/populate-secrets.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Copyright 2020 Google LLC.
+#
+# 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+function now { date +"%Y-%m-%d %H:%M:%S" | tr -d '\n' ;}
+function msg { println "$*" >&2 ;}
+function println { printf '%s\n' "$(now) $*" ;}
+
+
+# Populates requested secrets set in SECRET_MANAGER_KEYS from service account:
+# kokoro-trampoline@cloud-devrel-kokoro-resources.iam.gserviceaccount.com
+SECRET_LOCATION="${KOKORO_GFILE_DIR}/secret_manager"
+msg "Creating folder on disk for secrets: ${SECRET_LOCATION}"
+mkdir -p ${SECRET_LOCATION}
+for key in $(echo ${SECRET_MANAGER_KEYS} | sed "s/,/ /g")
+do
+  msg "Retrieving secret ${key}"
+  docker run --entrypoint=gcloud \
+    --volume=${KOKORO_GFILE_DIR}:${KOKORO_GFILE_DIR} \
+    gcr.io/google.com/cloudsdktool/cloud-sdk \
+    secrets versions access latest \
+    --project cloud-devrel-kokoro-resources \
+    --secret ${key} > \
+    "${SECRET_LOCATION}/${key}"
+  if [[ $? == 0 ]]; then
+    msg "Secret written to ${SECRET_LOCATION}/${key}"
+  else
+    msg "Error retrieving secret ${key}"
+  fi
+done
diff --git a/.kokoro/presubmit/clirr.cfg b/.kokoro/presubmit/clirr.cfg
new file mode 100644
index 000000000..ec572442e
--- /dev/null
+++ b/.kokoro/presubmit/clirr.cfg
@@ -0,0 +1,13 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "clirr"
+}
\ No newline at end of file
diff --git a/.kokoro/presubmit/common.cfg b/.kokoro/presubmit/common.cfg
new file mode 100644
index 000000000..4e28721be
--- /dev/null
+++ b/.kokoro/presubmit/common.cfg
@@ -0,0 +1,34 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+    regex: "**/*sponge_log.txt"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "google-api-java-client/.kokoro/trampoline.sh"
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/build.sh"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "test"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "dpebot_codecov_token"
+    }
+  }
+}
diff --git a/.kokoro/presubmit/dependencies.cfg b/.kokoro/presubmit/dependencies.cfg
new file mode 100644
index 000000000..e23bcb07e
--- /dev/null
+++ b/.kokoro/presubmit/dependencies.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/dependencies.sh"
+}
diff --git a/.kokoro/presubmit/integration.cfg b/.kokoro/presubmit/integration.cfg
new file mode 100644
index 000000000..dded67a9d
--- /dev/null
+++ b/.kokoro/presubmit/integration.cfg
@@ -0,0 +1,33 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "integration"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "gcloud-devel"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-it-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-it-service-account"
+}
diff --git a/.kokoro/presubmit/java10.cfg b/.kokoro/presubmit/java10.cfg
new file mode 100644
index 000000000..6e2f1f5fa
--- /dev/null
+++ b/.kokoro/presubmit/java10.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java10"
+}
diff --git a/.kokoro/presubmit/java11.cfg b/.kokoro/presubmit/java11.cfg
new file mode 100644
index 000000000..709f2b4c7
--- /dev/null
+++ b/.kokoro/presubmit/java11.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
diff --git a/.kokoro/presubmit/java7.cfg b/.kokoro/presubmit/java7.cfg
new file mode 100644
index 000000000..cb24f44ee
--- /dev/null
+++ b/.kokoro/presubmit/java7.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java7"
+}
diff --git a/.kokoro/presubmit/java8-osx.cfg b/.kokoro/presubmit/java8-osx.cfg
new file mode 100644
index 000000000..59d051c1b
--- /dev/null
+++ b/.kokoro/presubmit/java8-osx.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "google-api-java-client/.kokoro/build.sh"
diff --git a/.kokoro/presubmit/java8-win.cfg b/.kokoro/presubmit/java8-win.cfg
new file mode 100644
index 000000000..a4d91e3ca
--- /dev/null
+++ b/.kokoro/presubmit/java8-win.cfg
@@ -0,0 +1,3 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+build_file: "google-api-java-client/.kokoro/build.bat"
diff --git a/.kokoro/presubmit/java8.cfg b/.kokoro/presubmit/java8.cfg
new file mode 100644
index 000000000..495cc7bac
--- /dev/null
+++ b/.kokoro/presubmit/java8.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "REPORT_COVERAGE"
+  value: "true"
+}
diff --git a/.kokoro/presubmit/java9.cfg b/.kokoro/presubmit/java9.cfg
new file mode 100644
index 000000000..3b9c408d6
--- /dev/null
+++ b/.kokoro/presubmit/java9.cfg
@@ -0,0 +1,7 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java9"
+}
diff --git a/.kokoro/presubmit/linkage-monitor.cfg b/.kokoro/presubmit/linkage-monitor.cfg
new file mode 100644
index 000000000..5bb77dd41
--- /dev/null
+++ b/.kokoro/presubmit/linkage-monitor.cfg
@@ -0,0 +1,12 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/linkage-monitor.sh"
+}
\ No newline at end of file
diff --git a/.kokoro/presubmit/lint.cfg b/.kokoro/presubmit/lint.cfg
new file mode 100644
index 000000000..6d323c8ae
--- /dev/null
+++ b/.kokoro/presubmit/lint.cfg
@@ -0,0 +1,13 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "lint"
+}
\ No newline at end of file
diff --git a/.kokoro/presubmit/samples.cfg b/.kokoro/presubmit/samples.cfg
new file mode 100644
index 000000000..01e096004
--- /dev/null
+++ b/.kokoro/presubmit/samples.cfg
@@ -0,0 +1,33 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+env_vars: {
+  key: "JOB_TYPE"
+  value: "samples"
+}
+
+# TODO: remove this after we've migrated all tests and scripts
+env_vars: {
+  key: "GCLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_CLOUD_PROJECT"
+  value: "java-docs-samples-testing"
+}
+
+env_vars: {
+  key: "GOOGLE_APPLICATION_CREDENTIALS"
+  value: "secret_manager/java-docs-samples-service-account"
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "java-docs-samples-service-account"
+}
\ No newline at end of file
diff --git a/.kokoro/readme.sh b/.kokoro/readme.sh
new file mode 100755
index 000000000..d2bc9736a
--- /dev/null
+++ b/.kokoro/readme.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+# Copyright 2020 Google LLC
+#
+# 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+cd ${KOKORO_ARTIFACTS_DIR}/github/google-api-java-client
+
+# Disable buffering, so that the logs stream through.
+export PYTHONUNBUFFERED=1
+
+# Kokoro exposes this as a file, but the scripts expect just a plain variable.
+export GITHUB_TOKEN=$(cat ${KOKORO_KEYSTORE_DIR}/73713_yoshi-automation-github-key)
+
+# Setup git credentials
+echo "https://${GITHUB_TOKEN}:@github.com" >> ~/.git-credentials
+git config --global credential.helper 'store --file ~/.git-credentials'
+
+python3.6 -m pip install git+https://github.com/googleapis/synthtool.git#egg=gcp-synthtool
+
+set +e
+python3.6 -m autosynth.synth \
+    --repository=googleapis/google-api-java-client \
+    --synth-file-name=.github/readme/synth.py \
+    --metadata-path=.github/readme/synth.metadata \
+    --pr-title="chore: regenerate README" \
+    --branch-suffix="readme"
+
+# autosynth returns 28 to signal there are no changes
+RETURN_CODE=$?
+if [[ ${RETURN_CODE} -ne 0 && ${RETURN_CODE} -ne 28 ]]
+then
+    exit ${RETURN_CODE}
+fi
diff --git a/.kokoro/release/bump_snapshot.cfg b/.kokoro/release/bump_snapshot.cfg
new file mode 100644
index 000000000..d192d119e
--- /dev/null
+++ b/.kokoro/release/bump_snapshot.cfg
@@ -0,0 +1,53 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Build logs will be here
+action {
+  define_artifacts {
+    regex: "**/*sponge_log.xml"
+  }
+}
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "google-api-java-client/.kokoro/trampoline.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/node:10-user"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/release/bump_snapshot.sh"
+}
+
+# tokens used by release-please to keep an up-to-date release PR.
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "github-magic-proxy-key-release-please"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "github-magic-proxy-token-release-please"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "github-magic-proxy-url-release-please"
+    }
+  }
+}
diff --git a/.kokoro/release/bump_snapshot.sh b/.kokoro/release/bump_snapshot.sh
new file mode 100755
index 000000000..6ebc38ad0
--- /dev/null
+++ b/.kokoro/release/bump_snapshot.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Copyright 2019 Google LLC
+#
+# 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
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+export NPM_CONFIG_PREFIX=/home/node/.npm-global
+
+if [ -f ${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please ]; then
+  # Groom the snapshot release PR immediately after publishing a release
+  npx release-please release-pr --token=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-token-release-please \
+    --repo-url=googleapis/google-api-java-client \
+    --package-name="google-api-client" \
+    --api-url=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-url-release-please \
+    --proxy-key=${KOKORO_KEYSTORE_DIR}/73713_github-magic-proxy-key-release-please \
+    --snapshot \
+    --release-type=java-auth-yoshi
+fi
diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg
new file mode 100644
index 000000000..ea8de3624
--- /dev/null
+++ b/.kokoro/release/common.cfg
@@ -0,0 +1,49 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Download trampoline resources.
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline"
+
+# Use the trampoline script to run in docker.
+build_file: "google-api-java-client/.kokoro/trampoline.sh"
+
+# Configure the docker image for kokoro-trampoline.
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java8"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "maven-gpg-keyring"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "maven-gpg-passphrase"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "maven-gpg-pubkeyring"
+    }
+  }
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 70247
+      keyname: "sonatype-credentials"
+    }
+  }
+}
diff --git a/.kokoro/release/common.sh b/.kokoro/release/common.sh
new file mode 100755
index 000000000..6e3f65999
--- /dev/null
+++ b/.kokoro/release/common.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+# Copyright 2018 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+# Get secrets from keystore and set and environment variables
+setup_environment_secrets() {
+  export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)
+  export GPG_TTY=$(tty)
+  export GPG_HOMEDIR=/gpg
+  mkdir $GPG_HOMEDIR
+  mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GPG_HOMEDIR/pubring.gpg
+  mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GPG_HOMEDIR/secring.gpg
+  export SONATYPE_USERNAME=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f1 -d'|')
+  export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/70247_sonatype-credentials | cut -f2 -d'|')
+}
+
+create_settings_xml_file() {
+  echo "<settings>
+  <servers>
+    <server>
+      <id>ossrh</id>
+      <username>${SONATYPE_USERNAME}</username>
+      <password>${SONATYPE_PASSWORD}</password>
+    </server>
+    <server>
+      <id>sonatype-nexus-staging</id>
+      <username>${SONATYPE_USERNAME}</username>
+      <password>${SONATYPE_PASSWORD}</password>
+    </server>
+    <server>
+      <id>sonatype-nexus-snapshots</id>
+      <username>${SONATYPE_USERNAME}</username>
+      <password>${SONATYPE_PASSWORD}</password>
+    </server>
+  </servers>
+</settings>" > $1
+}
\ No newline at end of file
diff --git a/.kokoro/release/drop.cfg b/.kokoro/release/drop.cfg
new file mode 100644
index 000000000..4b17d187a
--- /dev/null
+++ b/.kokoro/release/drop.cfg
@@ -0,0 +1,6 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/release/drop.sh"
+}
diff --git a/.kokoro/release/drop.sh b/.kokoro/release/drop.sh
new file mode 100755
index 000000000..5c4551efa
--- /dev/null
+++ b/.kokoro/release/drop.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+# Copyright 2018 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+# STAGING_REPOSITORY_ID must be set
+if [ -z "${STAGING_REPOSITORY_ID}" ]; then
+  echo "Missing STAGING_REPOSITORY_ID environment variable"
+  exit 1
+fi
+
+source $(dirname "$0")/common.sh
+pushd $(dirname "$0")/../../
+
+setup_environment_secrets
+create_settings_xml_file "settings.xml"
+
+mvn nexus-staging:drop -B \
+  --settings=settings.xml \
+  -DstagingRepositoryId=${STAGING_REPOSITORY_ID}
diff --git a/.kokoro/release/promote.cfg b/.kokoro/release/promote.cfg
new file mode 100644
index 000000000..7f210a7d2
--- /dev/null
+++ b/.kokoro/release/promote.cfg
@@ -0,0 +1,6 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/release/promote.sh"
+}
diff --git a/.kokoro/release/promote.sh b/.kokoro/release/promote.sh
new file mode 100755
index 000000000..1fa95fa53
--- /dev/null
+++ b/.kokoro/release/promote.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# Copyright 2018 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+# STAGING_REPOSITORY_ID must be set
+if [ -z "${STAGING_REPOSITORY_ID}" ]; then
+  echo "Missing STAGING_REPOSITORY_ID environment variable"
+  exit 1
+fi
+
+source $(dirname "$0")/common.sh
+
+pushd $(dirname "$0")/../../
+
+setup_environment_secrets
+create_settings_xml_file "settings.xml"
+
+mvn nexus-staging:release -B \
+  -DperformRelease=true \
+  --settings=settings.xml \
+  -DstagingRepositoryId=${STAGING_REPOSITORY_ID}
diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg
new file mode 100644
index 000000000..512780c53
--- /dev/null
+++ b/.kokoro/release/publish_javadoc.cfg
@@ -0,0 +1,23 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/doc-templates/"
+
+env_vars: {
+  key: "STAGING_BUCKET"
+  value: "docs-staging"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/release/publish_javadoc.sh"
+}
+
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "docuploader_service_account"
+    }
+  }
+}
diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh
new file mode 100755
index 000000000..dd4d56ade
--- /dev/null
+++ b/.kokoro/release/publish_javadoc.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+# Copyright 2019 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+if [[ -z "${CREDENTIALS}" ]]; then
+  CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account
+fi
+
+if [[ -z "${STAGING_BUCKET}" ]]; then
+  echo "Need to set STAGING_BUCKET environment variable"
+  exit 1
+fi
+
+# work from the git root directory
+pushd $(dirname "$0")/../../
+
+# install docuploader package
+python3 -m pip install gcp-docuploader
+
+# compile all packages
+mvn clean install -B -q -DskipTests=true
+
+export NAME=google-api-client
+export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
+
+# build the docs
+mvn site -B -q
+
+pushd target/site/apidocs
+
+# create metadata
+python3 -m docuploader create-metadata \
+  --name ${NAME} \
+  --version ${VERSION} \
+  --language java
+
+# upload docs
+python3 -m docuploader upload . \
+  --credentials ${CREDENTIALS} \
+  --staging-bucket ${STAGING_BUCKET}
diff --git a/.kokoro/release/publish_javadoc11.cfg b/.kokoro/release/publish_javadoc11.cfg
new file mode 100644
index 000000000..9d466b639
--- /dev/null
+++ b/.kokoro/release/publish_javadoc11.cfg
@@ -0,0 +1,30 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# cloud-rad production
+env_vars: {
+  key: "STAGING_BUCKET_V2"
+  value: "docs-staging-v2"
+}
+
+# Configure the docker image for kokoro-trampoline
+env_vars: {
+  key: "TRAMPOLINE_IMAGE"
+  value: "gcr.io/cloud-devrel-kokoro-resources/java11"
+}
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/release/publish_javadoc11.sh"
+}
+
+before_action {
+  fetch_keystore {
+    keystore_resource {
+      keystore_config_id: 73713
+      keyname: "docuploader_service_account"
+    }
+  }
+}
+
+# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/<doclet name>
+gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx"
diff --git a/.kokoro/release/publish_javadoc11.sh b/.kokoro/release/publish_javadoc11.sh
new file mode 100755
index 000000000..74608833a
--- /dev/null
+++ b/.kokoro/release/publish_javadoc11.sh
@@ -0,0 +1,67 @@
+#!/bin/bash
+# Copyright 2021 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+if [[ -z "${CREDENTIALS}" ]]; then
+  CREDENTIALS=${KOKORO_KEYSTORE_DIR}/73713_docuploader_service_account
+fi
+
+if [[ -z "${STAGING_BUCKET_V2}" ]]; then
+  echo "Need to set STAGING_BUCKET_V2 environment variable"
+  exit 1
+fi
+
+# work from the git root directory
+pushd $(dirname "$0")/../../
+
+# install docuploader package
+python3 -m pip install gcp-docuploader
+
+# compile all packages
+mvn clean install -B -q -DskipTests=true
+
+export NAME=google-api-client
+export VERSION=$(grep ${NAME}: versions.txt | cut -d: -f3)
+
+# V3 generates docfx yml from javadoc
+# generate yml
+mvn clean site -B -q -P docFX
+
+# copy README to docfx-yml dir and rename index.md
+cp README.md target/docfx-yml/index.md
+# copy CHANGELOG to docfx-yml dir and rename history.md
+cp CHANGELOG.md target/docfx-yml/history.md
+
+pushd target/docfx-yml
+
+# create metadata
+python3 -m docuploader create-metadata \
+ --name ${NAME} \
+ --version ${VERSION} \
+ --xrefs devsite://java/gax \
+ --xrefs devsite://java/google-cloud-core \
+ --xrefs devsite://java/api-common \
+ --xrefs devsite://java/proto-google-common-protos \
+ --xrefs devsite://java/google-api-client \
+ --xrefs devsite://java/google-http-client \
+ --xrefs devsite://java/protobuf \
+ --language java
+
+# upload yml to production bucket
+python3 -m docuploader upload . \
+ --credentials ${CREDENTIALS} \
+ --staging-bucket ${STAGING_BUCKET_V2} \
+ --destination-prefix docfx
diff --git a/.kokoro/release/snapshot.cfg b/.kokoro/release/snapshot.cfg
new file mode 100644
index 000000000..166c105ba
--- /dev/null
+++ b/.kokoro/release/snapshot.cfg
@@ -0,0 +1,6 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/release/snapshot.sh"
+}
\ No newline at end of file
diff --git a/.kokoro/release/snapshot.sh b/.kokoro/release/snapshot.sh
new file mode 100755
index 000000000..1f55b7702
--- /dev/null
+++ b/.kokoro/release/snapshot.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+# Copyright 2019 Google LLC
+#
+# 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+source $(dirname "$0")/common.sh
+MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
+pushd $(dirname "$0")/../../
+
+# ensure we're trying to push a snapshot (no-result returns non-zero exit code)
+grep SNAPSHOT versions.txt
+
+setup_environment_secrets
+create_settings_xml_file "settings.xml"
+
+mvn clean deploy -B \
+  --settings ${MAVEN_SETTINGS_FILE} \
+  -DperformRelease=true \
+  -Dgpg.executable=gpg \
+  -Dgpg.passphrase=${GPG_PASSPHRASE} \
+  -Dgpg.homedir=${GPG_HOMEDIR}
diff --git a/.kokoro/release/stage.cfg b/.kokoro/release/stage.cfg
new file mode 100644
index 000000000..329861871
--- /dev/null
+++ b/.kokoro/release/stage.cfg
@@ -0,0 +1,19 @@
+# Format: //devtools/kokoro/config/proto/build.proto
+
+env_vars: {
+  key: "TRAMPOLINE_BUILD_FILE"
+  value: "github/google-api-java-client/.kokoro/release/stage.sh"
+}
+
+# Need to save the properties file
+action {
+  define_artifacts {
+    regex: "github/google-api-java-client/target/nexus-staging/staging/*.properties"
+    strip_prefix: "github/google-api-java-client"
+  }
+}
+
+env_vars: {
+  key: "SECRET_MANAGER_KEYS"
+  value: "releasetool-publish-reporter-app,releasetool-publish-reporter-googleapis-installation,releasetool-publish-reporter-pem"
+}
diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh
new file mode 100755
index 000000000..8a1033843
--- /dev/null
+++ b/.kokoro/release/stage.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+# Copyright 2018 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -eo pipefail
+
+# Start the releasetool reporter
+python3 -m pip install gcp-releasetool
+python3 -m releasetool publish-reporter-script > /tmp/publisher-script; source /tmp/publisher-script
+
+source $(dirname "$0")/common.sh
+source $(dirname "$0")/../common.sh
+MAVEN_SETTINGS_FILE=$(realpath $(dirname "$0")/../../)/settings.xml
+pushd $(dirname "$0")/../../
+
+setup_environment_secrets
+create_settings_xml_file "settings.xml"
+
+# attempt to stage 3 times with exponential backoff (starting with 10 seconds)
+retry_with_backoff 3 10 \
+  mvn clean deploy -B \
+    --settings ${MAVEN_SETTINGS_FILE} \
+    -DskipTests=true \
+    -DperformRelease=true \
+    -Dgpg.executable=gpg \
+    -Dgpg.passphrase=${GPG_PASSPHRASE} \
+    -Dgpg.homedir=${GPG_HOMEDIR}
+
+if [[ -n "${AUTORELEASE_PR}" ]]
+then
+  mvn nexus-staging:release -B \
+    -DperformRelease=true \
+    --settings=settings.xml
+fi
\ No newline at end of file
diff --git a/.kokoro/trampoline.sh b/.kokoro/trampoline.sh
new file mode 100644
index 000000000..9da0f8398
--- /dev/null
+++ b/.kokoro/trampoline.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+# Copyright 2018 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
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+set -eo pipefail
+# Always run the cleanup script, regardless of the success of bouncing into
+# the container.
+function cleanup() {
+    chmod +x ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh
+    ${KOKORO_GFILE_DIR}/trampoline_cleanup.sh
+    echo "cleanup";
+}
+trap cleanup EXIT
+
+$(dirname $0)/populate-secrets.sh # Secret Manager secrets.
+python3 "${KOKORO_GFILE_DIR}/trampoline_v1.py"
diff --git a/.repo-metadata.json b/.repo-metadata.json
new file mode 100644
index 000000000..fe101bec7
--- /dev/null
+++ b/.repo-metadata.json
@@ -0,0 +1,10 @@
+{
+  "name": "google-api-client",
+  "name_pretty": "Google API Java Client",
+  "client_documentation": "https://googleapis.dev/java/google-api-client/latest/",
+  "release_level": "ga",
+  "language": "java",
+  "repo": "googleapis/google-api-java-client",
+  "repo_short": "google-api-java-client",
+  "distribution_name": "com.google.api-client:google-api-client"
+}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 41f113f23..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: java
-notifications:
-  email: false
-jdk:
-  - oraclejdk8
-  - openjdk7
-before_install:
-  - sed -i 's/<module>google-api-client-android<\/module>//'  pom.xml
-  - sed -i 's/<module>google-api-client-assembly<\/module>//' pom.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000..c08c119ec
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,212 @@
+# Changelog
+
+### [1.32.1](https://www.github.com/googleapis/google-api-java-client/compare/v1.32.0...v1.32.1) (2021-06-24)
+
+
+### Bug Fixes
+
+* bring comment up to date with code ([#1838](https://www.github.com/googleapis/google-api-java-client/issues/1838)) ([f150c5a](https://www.github.com/googleapis/google-api-java-client/commit/f150c5aa6e2de0c6cbad7461f4b76be8e0027567))
+* Update dependencies.sh to not break on mac ([#1830](https://www.github.com/googleapis/google-api-java-client/issues/1830)) ([97940b3](https://www.github.com/googleapis/google-api-java-client/commit/97940b3fd96e343df3985630398811f3c417afcc))
+
+
+### Dependencies
+
+* don't use sp versions in the regular release ([#1840](https://www.github.com/googleapis/google-api-java-client/issues/1840)) ([94cde71](https://www.github.com/googleapis/google-api-java-client/commit/94cde719e9ad845bcd186595e06279e2b7c19096))
+
+## [1.32.0](https://www.github.com/googleapis/google-api-java-client/compare/v1.31.5...v1.32.0) (2021-06-22)
+
+
+### Features
+
+* add `gcf-owl-bot[bot]` to `ignoreAuthors` ([#1813](https://www.github.com/googleapis/google-api-java-client/issues/1813)) ([56f5b8b](https://www.github.com/googleapis/google-api-java-client/commit/56f5b8be0a60cb1cf0b279743d85ef57d9aa46b6))
+
+
+### Bug Fixes
+
+* add reason field to Details in GoogleJsonErrorObject ([#1831](https://www.github.com/googleapis/google-api-java-client/issues/1831)) ([5e92b4c](https://www.github.com/googleapis/google-api-java-client/commit/5e92b4c22e0d45686a58de58977d20c96593e901))
+
+### [1.31.5](https://www.github.com/googleapis/google-api-java-client/compare/v1.31.4...v1.31.5) (2021-05-10)
+
+
+### Bug Fixes
+
+* release scripts from issuing overlapping phases ([#1769](https://www.github.com/googleapis/google-api-java-client/issues/1769)) ([3174ff9](https://www.github.com/googleapis/google-api-java-client/commit/3174ff9ddf0c7428b90bff766c6b18bf17d1feac))
+* remove deprecated parent pom ([#1785](https://www.github.com/googleapis/google-api-java-client/issues/1785)) ([5da3355](https://www.github.com/googleapis/google-api-java-client/commit/5da335518ff5076ea5dd4f40fd0494330458296c))
+* update GoogleJsonError object to accomodate all fields in Invalid parameter exception ([#1783](https://www.github.com/googleapis/google-api-java-client/issues/1783)) ([94c4570](https://www.github.com/googleapis/google-api-java-client/commit/94c4570e16324b4c654d4ec3f0f940926064d955))
+
+### [1.31.4](https://www.github.com/googleapis/google-api-java-client/compare/v1.31.3...v1.31.4) (2021-04-09)
+
+
+### Bug Fixes
+
+* re-encode public keys from google.jks into p12 format for android ([#1738](https://www.github.com/googleapis/google-api-java-client/issues/1738)) ([83f3702](https://www.github.com/googleapis/google-api-java-client/commit/83f37023ea50a643a76eb6e5230072e5c829a205))
+* wrap BatchRequest InputStream with BufferedInputStream ([#1749](https://www.github.com/googleapis/google-api-java-client/issues/1749)) ([07346d8](https://www.github.com/googleapis/google-api-java-client/commit/07346d8dfa955a40daf01b8fb17fe1d75dc2a998))
+
+
+### Dependencies
+
+* update guava ([#1762](https://www.github.com/googleapis/google-api-java-client/issues/1762)) ([2197258](https://www.github.com/googleapis/google-api-java-client/commit/219725878e9954e724a1832ee615553319771c54))
+* update project.http.version to v1.39.2 ([#1748](https://www.github.com/googleapis/google-api-java-client/issues/1748)) ([5f62a41](https://www.github.com/googleapis/google-api-java-client/commit/5f62a412dcaabe8cb17783b9add6366dde7d96be))
+
+### [1.31.3](https://www.github.com/googleapis/google-api-java-client/compare/v1.31.2...v1.31.3) (2021-03-01)
+
+
+### Dependencies
+
+* update google-http-client to v1.39.0 ([#1731](https://www.github.com/googleapis/google-api-java-client/issues/1731)) ([918fc3b](https://www.github.com/googleapis/google-api-java-client/commit/918fc3bc2eb45d704edad6c02ca811348c6df922))
+
+### [1.31.2](https://www.github.com/googleapis/google-api-java-client/compare/v1.31.1...v1.31.2) (2021-01-14)
+
+
+### Bug Fixes
+
+* remove unused code ([#1664](https://www.github.com/googleapis/google-api-java-client/issues/1664)) ([3e9169f](https://www.github.com/googleapis/google-api-java-client/commit/3e9169f1af87dd947d24440f82fd4e0d7d4e4e5a))
+* use Gson instead of Jackson ([#1661](https://www.github.com/googleapis/google-api-java-client/issues/1661)) ([63ed2ca](https://www.github.com/googleapis/google-api-java-client/commit/63ed2caecc200a407ef40b249bed158f18e2c5ae))
+
+
+### Documentation
+
+* Update the documentation link for GoogleCredential from deprecated version to newer version ([#1652](https://www.github.com/googleapis/google-api-java-client/issues/1652)) ([98db6ca](https://www.github.com/googleapis/google-api-java-client/commit/98db6ca0113396e715894a083227f062269ca93d))
+
+
+### Dependencies
+
+* update Guava to 30.0 ([#1645](https://www.github.com/googleapis/google-api-java-client/issues/1645)) ([9e34f37](https://www.github.com/googleapis/google-api-java-client/commit/9e34f37e2ef667507e03cb2d495b2c945851eb30))
+* update Guava to 30.1 ([#1658](https://www.github.com/googleapis/google-api-java-client/issues/1658)) ([677011e](https://www.github.com/googleapis/google-api-java-client/commit/677011ea4ec40e85d6e219de4e0d8d095b40acd8))
+
+### [1.31.1](https://www.github.com/googleapis/google-api-java-client/compare/v1.31.0...v1.31.1) (2020-11-16)
+
+
+### Bug Fixes
+
+* socketfactory not registered for apache ([#1637](https://www.github.com/googleapis/google-api-java-client/issues/1637)) ([e886efa](https://www.github.com/googleapis/google-api-java-client/commit/e886efaa384bac106f2e5efcc3fb59901c251505))
+
+## [1.31.0](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.11...v1.31.0) (2020-11-10)
+
+
+### Features
+
+* add GoogleApacheHttpTransport that uses the v2 ApacheHttpTransport implementation ([#1568](https://www.github.com/googleapis/google-api-java-client/issues/1568)) ([d0dbca7](https://www.github.com/googleapis/google-api-java-client/commit/d0dbca720479f1ca8627c58eda195857ea0b2423))
+* add mtls support to GoogleNetHttpTransport and GoogleApacheHttpTransport ([#1619](https://www.github.com/googleapis/google-api-java-client/issues/1619)) ([1d8304c](https://www.github.com/googleapis/google-api-java-client/commit/1d8304c6311e910293b800ffdbf0bb6f19cf7fff))
+
+
+### Dependencies
+
+* update dependency com.google.appengine:appengine-api-1.0-sdk to v1.9.83 ([#1622](https://www.github.com/googleapis/google-api-java-client/issues/1622)) ([10bb904](https://www.github.com/googleapis/google-api-java-client/commit/10bb90441c90cb5ea7045a1ac5d39d669fad963d))
+* update dependency com.google.oauth-client:google-oauth-client-bom to v1.31.2 ([#1623](https://www.github.com/googleapis/google-api-java-client/issues/1623)) ([5942561](https://www.github.com/googleapis/google-api-java-client/commit/594256120e4eb37b0f3ca386f69542b68b53d05b))
+* update google-http-client to v1.38.0 ([#1620](https://www.github.com/googleapis/google-api-java-client/issues/1620)) ([bb63ded](https://www.github.com/googleapis/google-api-java-client/commit/bb63ded8846cd515c993c288728063f35e226ec5))
+
+### [1.30.11](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.10...v1.30.11) (2020-10-13)
+
+
+### Dependencies
+
+* update dependency com.google.appengine:appengine-api-1.0-sdk to v1.9.82 ([#1518](https://www.github.com/googleapis/google-api-java-client/issues/1518)) ([d77e5fa](https://www.github.com/googleapis/google-api-java-client/commit/d77e5fad9db5bf0e4bc73e42299e86ea6d72709d))
+* update dependency com.google.oauth-client:google-oauth-client-bom to v1.31.1 ([#1599](https://www.github.com/googleapis/google-api-java-client/issues/1599)) ([73f3a6d](https://www.github.com/googleapis/google-api-java-client/commit/73f3a6d2de662179d08d11cc48e843499758cb94))
+* update dependency com.google.protobuf:protobuf-java to v3.13.0 ([#1558](https://www.github.com/googleapis/google-api-java-client/issues/1558)) ([27b0359](https://www.github.com/googleapis/google-api-java-client/commit/27b0359568f780c65b8ffe9e893d40f6f748cff2))
+* update dependency commons-codec:commons-codec to v1.15 ([#1574](https://www.github.com/googleapis/google-api-java-client/issues/1574)) ([e453cdb](https://www.github.com/googleapis/google-api-java-client/commit/e453cdb272738196a561ee4395a567719594f656))
+* update google-http-client to v1.37.0 ([#1598](https://www.github.com/googleapis/google-api-java-client/issues/1598)) ([6504e79](https://www.github.com/googleapis/google-api-java-client/commit/6504e791d68c73ec1ca4d43f9ff9369b52f8c64f))
+
+### [1.30.10](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.9...v1.30.10) (2020-07-08)
+
+
+### Bug Fixes
+
+* cleanup checkstyle import rules ([#1503](https://www.github.com/googleapis/google-api-java-client/issues/1503)) ([ce22c0e](https://www.github.com/googleapis/google-api-java-client/commit/ce22c0ea7d02bd1807eae0076bfe55db1a3b754c))
+* cleanup commented code of version control ([#1504](https://www.github.com/googleapis/google-api-java-client/issues/1504)) ([5b1968d](https://www.github.com/googleapis/google-api-java-client/commit/5b1968d7bb05affd211b3403a6acc18c3d0c23d9))
+
+
+### Dependencies
+
+* remove excess dependencies ([#1502](https://www.github.com/googleapis/google-api-java-client/issues/1502)) ([dbe6287](https://www.github.com/googleapis/google-api-java-client/commit/dbe6287dac5b7340827a03c0977ad8f350b58eae))
+* update dependency com.google.oauth-client:google-oauth-client-bom to v1.31.0 ([#1544](https://www.github.com/googleapis/google-api-java-client/issues/1544)) ([ebab80d](https://www.github.com/googleapis/google-api-java-client/commit/ebab80d1fec30bde241a5cb7a3146c89aca5359c))
+* update dependency com.google.protobuf:protobuf-java to v3.12.2 ([#1527](https://www.github.com/googleapis/google-api-java-client/issues/1527)) ([a4cdec7](https://www.github.com/googleapis/google-api-java-client/commit/a4cdec7afd3c5fb1b6cb4de05021e156dd9d0a14))
+* update google-http-client to v1.36.0 ([#1551](https://www.github.com/googleapis/google-api-java-client/issues/1551)) ([01c635a](https://www.github.com/googleapis/google-api-java-client/commit/01c635a21fc3d7b549b6a19cbf3359cacf04ef47))
+* update oauth client ([#1499](https://www.github.com/googleapis/google-api-java-client/issues/1499)) ([b9c222c](https://www.github.com/googleapis/google-api-java-client/commit/b9c222cfdc4578dabca48cfbe64068f4f70d3b18))
+* update to Guava 29.0 ([#1516](https://www.github.com/googleapis/google-api-java-client/issues/1516)) ([fda223d](https://www.github.com/googleapis/google-api-java-client/commit/fda223d5da5076396bc896db3227facde17e89e5))
+
+
+### Documentation
+
+* removes reference to deprecated service (Google+) ([#1530](https://www.github.com/googleapis/google-api-java-client/issues/1530)) ([b257207](https://www.github.com/googleapis/google-api-java-client/commit/b2572075418dbbb86b9da8901184c72966464520))
+
+### [1.30.9](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.8...v1.30.9) (2020-02-18)
+
+
+### Bug Fixes
+
+* use embedded Proguard configuration instead of compile-time annotation ([#1491](https://www.github.com/googleapis/google-api-java-client/issues/1491)) ([8a59ed0](https://www.github.com/googleapis/google-api-java-client/commit/8a59ed071f19d9b78d284cdc75181ee102ca9c61)), closes [#1467](https://www.github.com/googleapis/google-api-java-client/issues/1467) [#1489](https://www.github.com/googleapis/google-api-java-client/issues/1489)
+
+### [1.30.8](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.7...v1.30.8) (2020-01-31)
+
+
+### Bug Fixes
+
+* future test breakage ([#1457](https://www.github.com/googleapis/google-api-java-client/issues/1457)) ([e7d5c83](https://www.github.com/googleapis/google-api-java-client/commit/e7d5c831a9d5c72206af6322142c338585698a78))
+
+
+### Dependencies
+
+* update dependency commons-codec:commons-codec to v1.14 ([#1463](https://www.github.com/googleapis/google-api-java-client/issues/1463)) ([97de688](https://www.github.com/googleapis/google-api-java-client/commit/97de688da9a0748e78f314f686a771852ed78459))
+* update guava to 28.2-android ([#1473](https://www.github.com/googleapis/google-api-java-client/issues/1473)) ([69a8d6f](https://www.github.com/googleapis/google-api-java-client/commit/69a8d6fb4146e85e8100c9e5fc220835f8ce12d9))
+* update http client ([#1482](https://www.github.com/googleapis/google-api-java-client/issues/1482)) ([232785a](https://www.github.com/googleapis/google-api-java-client/commit/232785a9aa8a4441129d74a08066bcb848153df3))
+
+### [1.30.7](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.6...v1.30.7) (2019-12-17)
+
+
+### Bug Fixes
+
+* update GoogleUtils#getVersion() to use stable logic ([#1452](https://www.github.com/googleapis/google-api-java-client/issues/1452)) ([744839f](https://www.github.com/googleapis/google-api-java-client/commit/744839f51a01301390297b4a5cb037547eefc4c0))
+
+
+### Dependencies
+
+* update dependency com.google.oauth-client:google-oauth-client-bom to v1.30.5 ([#1453](https://www.github.com/googleapis/google-api-java-client/issues/1453)) ([b32a7d9](https://www.github.com/googleapis/google-api-java-client/commit/b32a7d95801e1e2e5617818a4f11853eca272c72))
+
+### [1.30.6](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.5...v1.30.6) (2019-12-03)
+
+
+### Bug Fixes
+
+* grab version from package metadata ([#1419](https://www.github.com/googleapis/google-api-java-client/issues/1419)) ([a6c6dec](https://www.github.com/googleapis/google-api-java-client/commit/a6c6decbd4a162ff4030e2c3f74c72eb6ac9eddb))
+* user-agent should use identifier/version ([#1425](https://www.github.com/googleapis/google-api-java-client/issues/1425)) ([bfb4d9c](https://www.github.com/googleapis/google-api-java-client/commit/bfb4d9cacdadd8065be07b1bf0c22ea7aeb94d97))
+
+
+### Documentation
+
+* fix link to media upload documentation ([#1442](https://www.github.com/googleapis/google-api-java-client/issues/1442)) ([21af62a](https://www.github.com/googleapis/google-api-java-client/commit/21af62a45eb167adcf4d6932b27f9e2b86fc06f3))
+
+
+### Dependencies
+
+* remove jackson-core-asl ([#1414](https://www.github.com/googleapis/google-api-java-client/issues/1414)) ([8e08249](https://www.github.com/googleapis/google-api-java-client/commit/8e082496d41ed271523b78df80e678a338f22a8a))
+* update dependency com.google.protobuf:protobuf-java to v3.11.0 ([#1431](https://www.github.com/googleapis/google-api-java-client/issues/1431)) ([c4be24d](https://www.github.com/googleapis/google-api-java-client/commit/c4be24d2f371c22aa12d47085e88f21774efa6e5))
+* update dependency com.google.protobuf:protobuf-java to v3.11.1 ([#1436](https://www.github.com/googleapis/google-api-java-client/issues/1436)) ([c1eaa85](https://www.github.com/googleapis/google-api-java-client/commit/c1eaa851d9bd4102a0cff21d972190923050fd5e))
+* update guava to 28.1-android ([#1410](https://www.github.com/googleapis/google-api-java-client/issues/1410)) ([1d37f32](https://www.github.com/googleapis/google-api-java-client/commit/1d37f325d3c0cf808cd7c006ba9414e4dd65e5b6))
+
+### [1.30.5](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.4...v1.30.5) (2019-10-24)
+
+
+### Bug Fixes
+
+* add details to GoogleJsonResponseExceptions created with GoogleJsonResponseExceptionFactoryTesting ([#1395](https://www.github.com/googleapis/google-api-java-client/issues/1395)) ([1ffdba6](https://www.github.com/googleapis/google-api-java-client/commit/1ffdba6071d716d9843fada802c3cb4d2dcaedf7))
+* specify Metadata-Flavor for metadata requests ([#1397](https://www.github.com/googleapis/google-api-java-client/issues/1397)) ([d3dcfe9](https://www.github.com/googleapis/google-api-java-client/commit/d3dcfe9c049f72207b30e75f073b4b8ccc14c46d))
+
+
+### Dependencies
+
+* update dependency com.google.oauth-client:google-oauth-client-bom to v1.30.4 ([#1401](https://www.github.com/googleapis/google-api-java-client/issues/1401)) ([502cf1d](https://www.github.com/googleapis/google-api-java-client/commit/502cf1d1f2b7b6231ace109f3162c069c5f2234c))
+
+
+### Documentation
+
+* migrate docs from wiki ([#1399](https://www.github.com/googleapis/google-api-java-client/issues/1399)) ([173adca](https://www.github.com/googleapis/google-api-java-client/commit/173adcaed0d96b3771486ee59d0b4a4cf87df895))
+
+### [1.30.4](https://www.github.com/googleapis/google-api-java-client/compare/v1.30.3...v1.30.4) (2019-09-20)
+
+
+### Dependencies
+
+* update dependency com.google.oauth-client:google-oauth-client-bom to v1.30.3 ([#1386](https://www.github.com/googleapis/google-api-java-client/issues/1386)) ([3a9ba9a](https://www.github.com/googleapis/google-api-java-client/commit/3a9ba9a))
+* update dependency com.google.protobuf:protobuf-java to v3.10.0 ([#1379](https://www.github.com/googleapis/google-api-java-client/issues/1379)) ([309f8d4](https://www.github.com/googleapis/google-api-java-client/commit/309f8d4))
+* update google-http-client to v1.32.1 ([#1384](https://www.github.com/googleapis/google-api-java-client/issues/1384)) ([859570a](https://www.github.com/googleapis/google-api-java-client/commit/859570a))
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 46b2a08ea..2add2547a 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,43 +1,94 @@
-# Contributor Code of Conduct
+<!-- # Generated by synthtool. DO NOT EDIT! !-->
+# Code of Conduct
 
-As contributors and maintainers of this project,
-and in the interest of fostering an open and welcoming community,
-we pledge to respect all people who contribute through reporting issues,
-posting feature requests, updating documentation,
-submitting pull requests or patches, and other activities.
+## Our Pledge
 
-We are committed to making participation in this project
-a harassment-free experience for everyone,
-regardless of level of experience, gender, gender identity and expression,
-sexual orientation, disability, personal appearance,
-body size, race, ethnicity, age, religion, or nationality.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of
+experience, education, socio-economic status, nationality, personal appearance,
+race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+*   Using welcoming and inclusive language
+*   Being respectful of differing viewpoints and experiences
+*   Gracefully accepting constructive criticism
+*   Focusing on what is best for the community
+*   Showing empathy towards other community members
 
 Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery
-* Personal attacks
-* Trolling or insulting/derogatory comments
-* Public or private harassment
-* Publishing other's private information,
-such as physical or electronic
-addresses, without explicit permission
-* Other unethical or unprofessional conduct.
+*   The use of sexualized language or imagery and unwelcome sexual attention or
+    advances
+*   Trolling, insulting/derogatory comments, and personal or political attacks
+*   Public or private harassment
+*   Publishing others' private information, such as a physical or electronic
+    address, without explicit permission
+*   Other conduct which could reasonably be considered inappropriate in a
+    professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
 Project maintainers have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct.
-By adopting this Code of Conduct,
-project maintainers commit themselves to fairly and consistently
-applying these principles to every aspect of managing this project.
-Project maintainers who do not follow or enforce the Code of Conduct
-may be permanently removed from the project team.
-
-This code of conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community.
-
-Instances of abusive, harassing, or otherwise unacceptable behavior
-may be reported by opening an issue
-or contacting one or more of the project maintainers.
-
-This Code of Conduct is adapted from the [Contributor Covenant](http://contributor-covenant.org), version 1.2.0,
-available at [http://contributor-covenant.org/version/1/2/0/](http://contributor-covenant.org/version/1/2/0/)
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, or to ban temporarily or permanently any
+contributor for other behaviors that they deem inappropriate, threatening,
+offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+This Code of Conduct also applies outside the project spaces when the Project
+Steward has a reasonable belief that an individual's behavior may have a
+negative impact on the project or its community.
+
+## Conflict Resolution
+
+We do not believe that all conflict is bad; healthy debate and disagreement
+often yield positive results. However, it is never okay to be disrespectful or
+to engage in behavior that violates the project’s code of conduct.
+
+If you see someone violating the code of conduct, you are encouraged to address
+the behavior directly with those involved. Many issues can be resolved quickly
+and easily, and this gives people more control over the outcome of their
+dispute. If you are unable to resolve the matter for any reason, or if the
+behavior is threatening or harassing, report it. We are dedicated to providing
+an environment where participants feel welcome and safe.
+
+Reports should be directed to *googleapis-stewards@google.com*, the
+Project Steward(s) for *Google Cloud Client Libraries*. It is the Project Steward’s duty to
+receive and address reported violations of the code of conduct. They will then
+work with a committee consisting of representatives from the Open Source
+Programs Office and the Google Open Source Strategy team. If for any reason you
+are uncomfortable reaching out to the Project Steward, please email
+opensource@google.com.
+
+We will investigate every complaint, but you may not receive a direct response.
+We will use our discretion in determining when and how to follow up on reported
+incidents, which may range from not taking action to permanent expulsion from
+the project and project-sponsored spaces. We will notify the accused of the
+report and provide them an opportunity to discuss it before any action is taken.
+The identity of the reporter will be omitted from the details of the report
+supplied to the accused. In potentially harmful situations, such as ongoing
+harassment or threats to anyone's safety, we may take action without notice.
+
+## Attribution
+
+This Code of Conduct is adapted from the Contributor Covenant, version 1.4,
+available at
+https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
\ No newline at end of file
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..f2dbdee06
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,139 @@
+# How to Contribute
+
+We'd love to accept your patches and contributions to this project. There are
+just a few small guidelines you need to follow.
+
+## Contributor License Agreement
+
+Contributions to this project must be accompanied by a Contributor License
+Agreement. You (or your employer) retain the copyright to your contribution;
+this simply gives us permission to use and redistribute your contributions as
+part of the project. Head over to <https://cla.developers.google.com/> to see
+your current agreements on file or to sign a new one.
+
+You generally only need to submit a CLA once, so if you've already submitted one
+(even if it was for a different project), you probably don't need to do it
+again.
+
+## Code reviews
+
+All submissions, including submissions by project members, require review. We
+use GitHub pull requests for this purpose. Consult
+[GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
+information on using pull requests.
+
+## Community Guidelines
+
+This project follows
+[Google's Open Source Community Guidelines](https://opensource.google.com/conduct/).
+
+## Building the project
+
+To build, package, and run all unit tests run the command
+
+```
+mvn clean verify
+```
+
+### Running Integration tests
+
+To include integration tests when building the project, you need access to
+a GCP Project with a valid service account. 
+
+For instructions on how to generate a service account and corresponding
+credentials JSON see: [Creating a Service Account][1].
+
+Then run the following to build, package, run all unit tests and run all
+integration tests.
+
+```bash
+export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json
+mvn -Penable-integration-tests clean verify
+```
+
+## Code Samples
+
+Code Samples must be bundled in separate Maven modules, and guarded by a
+Maven profile with the name `enable-samples`.
+
+The samples must be separate from the primary project for a few reasons:
+1. Primary projects have a minimum Java version of Java 7 whereas samples have
+   a minimum Java version of Java 8. Due to this we need the ability to
+   selectively exclude samples from a build run.
+2. Many code samples depend on external GCP services and need
+   credentials to access the service.
+3. Code samples are not released as Maven artifacts and must be excluded from 
+   release builds.
+   
+### Building
+
+```bash
+mvn -Penable-samples clean verify
+```
+
+Some samples require access to GCP services and require a service account:
+
+```bash
+export GOOGLE_APPLICATION_CREDENTIALS=/path/to/service/account.json
+mvn -Penable-samples clean verify
+```
+
+### Profile Config
+
+1. To add samples in a profile to your Maven project, add the following to your
+`pom.xml`
+
+    ```xml
+    <project>
+      [...]
+      <profiles>
+        <profile>
+          <id>enable-samples</id>
+          <modules>
+            <module>sample</module>
+          </modules>
+        </profile>
+      </profiles>
+      [...]
+    </project>
+    ```
+
+2. [Activate](#profile-activation) the profile.
+3. Define your samples in a normal Maven project in the `samples/` directory.
+
+### Code Formatting
+
+Code in this repo is formatted with
+[google-java-format](https://github.com/google/google-java-format).
+To run formatting on your project, you can run:
+```
+mvn com.coveo:fmt-maven-plugin:format
+```
+
+### Profile Activation
+
+To include code samples when building and testing the project, enable the 
+`enable-samples` Maven profile.
+
+#### Command line
+
+To activate the Maven profile on the command line add `-Penable-samples` to your
+Maven command.
+
+#### Maven `settings.xml`
+
+To activate the Maven profile in your `~/.m2/settings.xml` add an entry of
+`enable-samples` following the instructions in [Active Profiles][2].
+
+This method has the benefit of applying to all projects you build (and is
+respected by IntelliJ IDEA) and is recommended if you are going to be
+contributing samples to several projects.
+
+#### IntelliJ IDEA
+
+To activate the Maven Profile inside IntelliJ IDEA, follow the instructions in
+[Activate Maven profiles][3] to activate `enable-samples`.
+
+[1]: https://cloud.google.com/docs/authentication/getting-started#creating_a_service_account
+[2]: https://maven.apache.org/settings.html#Active_Profiles
+[3]: https://www.jetbrains.com/help/idea/work-with-maven-profiles.html#activate_maven_profiles
diff --git a/LICENSE b/LICENSE
index 980a15ac2..261eeb9e9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-                                Apache License
+                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/
 
@@ -178,7 +178,7 @@
    APPENDIX: How to apply the Apache License to your work.
 
       To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "{}"
+      boilerplate notice, with the fields enclosed by brackets "[]"
       replaced with your own identifying information. (Don't include
       the brackets!)  The text should be enclosed in the appropriate
       comment syntax for the file format. We also recommend that a
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright {yyyy} {name of copyright owner}
+   Copyright [yyyy] [name of copyright owner]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index 6c0ae87d5..b29c854aa 100644
--- a/README.md
+++ b/README.md
@@ -1,230 +1,90 @@
 # Google APIs Client Library for Java
 
-- [Library maintenance](#maintenance)
-- [Overview](#Overview)
-- [Highlighted Features](#Highlighted_Features)
-- [Dependencies](#Dependencies)
-- [Important Warnings](#Beta)
-  - [@Beta](#Beta)
-  - [Deprecations](#Deprecations)
-- [Documentation](#Documentation)
-- [Links](#Links)
-
-## Library maintenance
-
-This client library is supported but in maintenance mode only. We are fixing necessary bugs and
-adding essential features to ensure this library continues to meet your needs for accessing Google
-APIs. Non-critical issues will be closed. Any issue may be reopened if it is causing ongoing problems.
-
-If you're working with **Google Cloud Platform** APIs such as Datastore, Pub/Sub and many others,
-consider using the [Cloud Client Libraries for Java](https://github.com/GoogleCloudPlatform/google-cloud-java)
-instead. These are the new and idiomatic Java libraries targeted specifically at Google Cloud
-Platform Services.
-
-## Building locally
-
-##### One time setup
-
-```
-mkdir /tmp/foo && cd /tmp/foo
-wget https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/8.3.0/play-services-basement-8.3.0.aar
-unzip play-services-basement-8.3.0.aar
-mvn install:install-file \
-  -Dfile=classes.jar \
-  -DgroupId=com.google.android.google-play-services \
-  -DartifactId=google-play-services \
-  -Dversion=1 \
-  -Dpackaging=jar
-cd -
-
-# we need the google-http-java-client jar cached locally
-git clone https://github.com/google/google-http-java-client.git
-cd google-http-java-client && mvn compile && mvn install && cd ..
-
-# we need the google-oauth-java-client jar cached locally
-git clone https://github.com/google/google-oauth-java-client.git
-cd google-oauth-java-client && mvn compile && mvn install
-```
-
-##### Building And Testing
-
-```
-mvn install
-```
-
-## Overview
+## Description
 
 The Google APIs Client Library for Java is a flexible, efficient, and powerful Java client library
 for accessing any HTTP-based API on the web, not just Google APIs.
 
 The library has the following features:
- - A powerful [OAuth 2.0](https://developers.google.com/api-client-library/java/google-api-java-client/oauth2) library with a consistent interface.  
+ - A powerful [OAuth 2.0](https://github.com/googleapis/google-api-java-client/wiki/OAuth2) library with a consistent interface.
  - Lightweight, efficient XML and JSON data models that support any data schema.
  - Support for [protocol buffers](https://github.com/google/protobuf/).
- - A set of [generated libraries for Google APIs](https://developers.google.com/api-client-library/java/apis/). 
-
-### Accessing Google APIs
-
-To use Google's Java client libraries to call any Google API, you need two libraries:
-
-- The core Google APIs Client Library for Java (google-api-java-client), which is the generic 
-runtime library described here. This library provides functionality common to all APIs, for example 
-HTTP transport, error handling, authentication, JSON parsing, media download/upload, and batching. 
-- An auto-generated Java library for the API you are accessing, for example 
-the [generated Java library for the BigQuery API](https://github.com/google/google-api-java-client-samples/tree/master/bigquery-appengine-sample/src/main/java/com/google/api/client/sample/bigquery/appengine/dashboard). 
-These generated libraries include API-specific information such as the root URL, and classes that 
-represent entities in the context of the API. These classes are useful for making conversions 
-between JSON objects and Java objects.
-
-To find the generated library for a Google API, visit [Google APIs Client Library for Java](https://developers.google.com/api-client-library/java/apis/). 
-The API-specific Java packages include both the core google-api-java-client and the client-specific 
-libraries. 
-
-If you are using the old GData library, you need to
-[migrate](https://github.com/google/gdata-java-client/blob/wiki/MigratingToGoogleApiJavaClient.md).
-
-### Developing for Android
-
-If you are developing for Android and the Google API you want to use is included in the 
-[Google Play Services library](https://developer.android.com/google/play-services/index.html), you 
-should use that library for the best performance and experience. 
-
-To access other Google APIs, you can use the Google APIs Client Library for Java, which supports 
-[Android 1.5 (or higher)](https://developers.google.com/api-client-library/java/google-api-java-client/android).
+ - A set of [generated libraries for Google APIs](https://github.com/googleapis/google-api-java-client-services#supported-google-apis).
 
-### Other Java environments
+## Supported Java environments
 
-- Java 6 (or higher)
+- Java 7 (or higher)
 - Android 1.6 (or higher)
-- [Google App Engine](https://developers.google.com/api-client-library/java/google-api-java-client/app-engine)
+- [Google App Engine](https://github.com/googleapis/google-api-java-client/wiki/App-Engine)
 
-## Highlighted Features
+## Usage
 
-- **The library makes it simple to call Google APIs.**
+For detailed instructions on usage, please visit the [guide](https://googleapis.github.io/google-api-java-client/).
 
-You can call Google APIs using Google service-specific generated libraries with the Google APIs 
-Client Library for Java. Here's an example that makes a call to the 
-[Google Calendar API](https://developers.google.com/google-apps/calendar/): 
+## Installation
 
-```java
-// Show events on user's calendar.
-View.header("Show Calendars");
-CalendarList feed = client.calendarList().list().execute();
-View.display(feed); 
-```
-
-- **The library makes authentication easier.**
-
-The authentication library can reduce the amount of code needed to handle 
-[OAuth 2.0](https://developers.google.com/api-client-library/java/google-api-java-client/oauth2), 
-and sometimes a few lines is all you need. For example:
-
-```java
-/** Authorizes the installed application to access user's protected data. */
-private static Credential authorize() throws Exception {
-  // load client secrets
-  GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY,
-      new InputStreamReader(CalendarSample.class.getResourceAsStream("/client_secrets.json")));
-  // set up authorization code flow
-  GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(
-      httpTransport, JSON_FACTORY, clientSecrets,
-      Collections.singleton(CalendarScopes.CALENDAR)).setDataStoreFactory(dataStoreFactory)
-      .build();
-  // authorize
-  return new AuthorizationCodeInstalledApp(flow, new LocalServerReceiver()).authorize("user");
-} 
-```
-
-- **The library makes batching and media upload/download easier.**
-
-The library offers helper classes for 
-[batching](https://developers.google.com/api-client-library/java/google-api-java-client/batch), 
-[media upload](https://developers.google.com/api-client-library/java/google-api-java-client/media-upload), 
-and [media download](https://developers.google.com/api-client-library/java/google-api-java-client/media-download).
-
-- **The library runs on Google App Engine.**
-
-[App Engine-specific helpers](https://developers.google.com/api-client-library/java/google-api-java-client/app-engine) 
-make quick work of authenticated calls to APIs, and you do not need to worry about exchanging code for tokens. 
-For example:
-
-```java
-@Override
-protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
-  AppIdentityCredential credential =
-      new AppIdentityCredential(Arrays.asList(UrlshortenerScopes.URLSHORTENER));
-  Urlshortener shortener =
-      new Urlshortener.Builder(new UrlFetchTransport(), new JacksonFactory(), credential)
-      .build();
-  UrlHistory history = shortener.URL().list().execute();
-  ...
-} 
-```
-
-- **The library runs on [Android (@Beta)](#@Beta).**
-
-If you are developing for Android and the Google API you want to use is included in the 
-[Google Play Services library](https://developer.android.com/google/play-services/index.html), 
-you should use that library for the best performance and experience. 
-
-To access other Google APIs, you can use the Google Client Library for Java's Android-specific 
-helper classes, which are are well-integrated with 
-[Android AccountManager](http://developer.android.com/reference/android/accounts/AccountManager.html). 
-For example: 
-
-```java
-@Override
-public void onCreate(Bundle savedInstanceState) {
-  super.onCreate(savedInstanceState);
-  // Google Accounts
-  credential =
-      GoogleAccountCredential.usingOAuth2(this, Collections.singleton(TasksScopes.TASKS));
-  SharedPreferences settings = getPreferences(Context.MODE_PRIVATE);
-  credential.setSelectedAccountName(settings.getString(PREF_ACCOUNT_NAME, null));
-  // Tasks client
-  service =
-      new com.google.api.services.tasks.Tasks.Builder(httpTransport, jsonFactory, credential)
-          .setApplicationName("Google-TasksAndroidSample/1.0").build();
-} 
-```
-
-- **The library is easy to install.**
-
-The Google APIs Client Library for Java is easy to install, and you can download the binary 
-directly from the [Downloads page](https://developers.google.com/api-client-library/java/google-api-java-client/download), 
-or you can use Maven or Gradle.
+The Google APIs Client Library for Java is easy to install.
 
 To use Maven, add the following lines to your pom.xml file:
 
+[//]: # ({x-version-update-start:google-api-client:released})
   ```maven
   <project>
     <dependencies>
       <dependency>
         <groupId>com.google.api-client</groupId>
         <artifactId>google-api-client</artifactId>
-        <version>1.23.0</version>
+        <version>1.32.1</version>
       </dependency>
     </dependencies>
-  </project> 
-  ``` 
+  </project>
+  ```
 
 To use Gradle, add the following lines to your build.gradle file:
 
 ```gradle
 repositories {
     mavenCentral()
+    google()
 }
 dependencies {
-    compile 'com.google.api-client:google-api-client:1.23.0'
+    compile 'com.google.api-client:google-api-client:1.32.1'
 }
 ```
+[//]: # ({x-version-update-end})
+
+
+## Building locally
+
+## One time setup
+
+```
+mkdir /tmp/foo && cd /tmp/foo
+wget https://dl.google.com/dl/android/maven2/com/google/android/gms/play-services-basement/8.3.0/play-services-basement-8.3.0.aar
+unzip play-services-basement-8.3.0.aar
+mvn install:install-file \
+  -Dfile=classes.jar \
+  -DgroupId=com.google.android.google-play-services \
+  -DartifactId=google-play-services \
+  -Dversion=1 \
+  -Dpackaging=jar
+cd -
+```
+
+## CI Status
+
+Java Version | Status
+------------ | ------
+Java 7 | [![Kokoro CI](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-api-java-client/java7.svg)](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-api-java-client/java7.html)
+Java 8 | [![Kokoro CI](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-api-java-client/java8.svg)](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-api-java-client/java8.html)
+Java 11 | [![Kokoro CI](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-api-java-client/java11.svg)](https://storage.googleapis.com/cloud-devrel-public/java/badges/google-api-java-client/java11.html)
 
 ## Dependencies
-This library is built on top of two common libraries, also built by Google, and also designed to 
-work with any HTTP service on the web: 
+This library is built on top of two common libraries, also built by Google, and also designed to
+work with any HTTP service on the web:
 
-- [Google HTTP Client Library for Java](https://github.com/google/google-http-java-client)
-- [Google OAuth Client Library for Java](https://github.com/google/google-oauth-java-client)
+- [Google HTTP Client Library for Java](https://github.com/googleapis/google-http-java-client)
+- [Google OAuth Client Library for Java](https://github.com/googleapis/google-oauth-java-client)
 
 ## Important Warnings
 
@@ -243,13 +103,17 @@ might result, and you are not guaranteed a compilation error.
 
 ## Documentation
 
-- [Developer's Guide](https://developers.google.com/api-client-library/java/google-api-java-client/dev-guide)
-- [Libraries and Samples](https://developers.google.com/api-client-library/java/apis/)
-- [JavaDoc](https://developers.google.com/api-client-library/java/google-api-java-client/reference/index)
-- [Get Help](https://developers.google.com/api-client-library/java/google-api-java-client/support)
+- [Libraries and Samples](https://github.com/googleapis/google-api-java-client-services/)
+- [JavaDoc](https://googleapis.dev/java/google-api-client/latest/)
+
+## Contributing
+
+Contributions to this library are always welcome and highly encouraged.
+
+See [CONTRIBUTING](CONTRIBUTING.md) documentation for more information on how to get started.
 
-## Links
+Please note that this project is released with a Contributor Code of Conduct. By participating in
+this project you agree to abide by its terms. See [Code of Conduct](CODE_OF_CONDUCT.md) for more
+information.
 
-- [Clients Announcements](http://google-api-java-client.blogspot.com/)
-- [API Announcements](http://googledevelopers.blogspot.com/)
-- [Discuss](https://groups.google.com/forum/#!forum/google-api-java-client)
\ No newline at end of file
+For questions or concerns, please file an issue in the GitHub repository.
diff --git a/Resumable-Media-Upload-Sequence-Diagram.png b/Resumable-Media-Upload-Sequence-Diagram.png
new file mode 100644
index 000000000..6cc9b3481
Binary files /dev/null and b/Resumable-Media-Upload-Sequence-Diagram.png differ
diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 000000000..8b58ae9c0
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,7 @@
+# Security Policy
+
+To report a security issue, please use [g.co/vulnz](https://g.co/vulnz).
+
+The Google Security Team will respond within 5 working days of your report on g.co/vulnz.
+
+We use g.co/vulnz for our intake, and do coordination and disclosure here using GitHub Security Advisory to privately discuss and fix the issue.
diff --git a/checkstyle-suppressions.xml b/checkstyle-suppressions.xml
index 350c453fe..143a6d04e 100644
--- a/checkstyle-suppressions.xml
+++ b/checkstyle-suppressions.xml
@@ -4,13 +4,8 @@
      "http://www.puppycrawl.com/dtds/suppressions_1_0.dtd">
 
 <suppressions>
-
-  <suppress checks="LineLength" files="com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java"/>
-  <suppress checks="LineLength" files="com/google/api/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java"/>
-  <suppress checks="LineLength" files="com/google/api/client/googleapis/extensions/appengine/subscriptions/package-info.java"/>
-  <suppress checks="LineLength" files="com/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java"/>
-  <suppress checks="LineLength" files="com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java"/>
-  <suppress checks="LineLength" files="com/google/api/client/googleapis/subscriptions/NotificationHeaders.java"/>
+  <suppress checks="LineLength" files="com[/\\]google[/\\]api[/\\]client[/\\]googleapis[/\\]extensions[/\\]appengine[/\\]notifications[/\\]AppEngineNotificationServlet.java"/>
+  <suppress checks="LineLength" files="com[/\\]google[/\\]api[/\\]client[/\\]googleapis[/\\]extensions[/\\]servlet[/\\]notifications[/\\]NotificationServlet.java"/>
 
   <!-- Don't check JavaDoc on package-info. -->
   <suppress checks="JavadocStyleCheck" files="package-info.java"/>
diff --git a/checkstyle.xml b/checkstyle.xml
index fffe1dc92..2fcb7a388 100644
--- a/checkstyle.xml
+++ b/checkstyle.xml
@@ -53,12 +53,11 @@ page at http://checkstyle.sourceforge.net/config.html -->
     </module>
 
     <module name="ImportOrder">
-      <!-- Checks for out of order import statements. -->
-
       <property name="severity" value="warning"/>
-      <property name="groups" value="com.google,android,junit,net,org,java,javax"/>
       <!-- This ensures that static imports go first. -->
       <property name="option" value="top"/>
+      <property name="separatedStaticGroups" value="true"/>
+      <property name="caseSensitive" value="true"/>
       <property name="tokens" value="STATIC_IMPORT, IMPORT"/>
     </module>
 
@@ -73,12 +72,8 @@ page at http://checkstyle.sourceforge.net/config.html -->
     <module name="JavadocMethod">
       <property name="scope" value="protected"/>
       <property name="severity" value="warning"/>
-      <property name="allowMissingJavadoc" value="true"/>
       <property name="allowMissingParamTags" value="true"/>
       <property name="allowMissingReturnTag" value="true"/>
-      <property name="allowMissingThrowsTags" value="true"/>
-      <property name="allowThrowsTagsForSubclasses" value="true"/>
-      <property name="allowUndeclaredRTE" value="true"/>
     </module>
 
     <module name="JavadocType">
@@ -184,22 +179,6 @@ page at http://checkstyle.sourceforge.net/config.html -->
 
     -->
 
-    <module name="LineLength">
-      <!-- Checks if a line is too long. -->
-      <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="100"/>
-      <property name="severity" value="error"/>
-
-      <!--
-        The default ignore pattern exempts the following elements:
-          - import statements
-          - long URLs inside comments
-      -->
-
-      <property name="ignorePattern"
-          value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
-          default="^(package .*;\s*)|(import .*;\s*)|( *(\*|//).*https?://.*)$"/>
-    </module>
-
     <module name="LeftCurly">
       <!-- Checks for placement of the left curly brace ('{'). -->
       <property name="severity" value="warning"/>
@@ -317,7 +296,23 @@ page at http://checkstyle.sourceforge.net/config.html -->
       -->
       <property name="severity" value="warning"/>
     </module>
+  </module>
+
+
+  <module name="LineLength">
+    <!-- Checks if a line is too long. -->
+    <property name="max" value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.max}" default="100"/>
+    <property name="severity" value="error"/>
+
+    <!--
+      The default ignore pattern exempts the following elements:
+        - import statements
+        - long URLs inside comments
+    -->
 
+    <property name="ignorePattern"
+      value="${com.puppycrawl.tools.checkstyle.checks.sizes.LineLength.ignorePattern}"
+      default="^(package .*;\s*)|(import .*;\s*)|( *(\*|//).*https?://.*)$"/>
   </module>
 </module>
 
diff --git a/clirr-ignored-differences.xml b/clirr-ignored-differences.xml
index 114008428..a4a93043c 100644
--- a/clirr-ignored-differences.xml
+++ b/clirr-ignored-differences.xml
@@ -2,4 +2,8 @@
 <!-- see http://mojo.codehaus.org/clirr-maven-plugin/examples/ignored-differences.html -->
 
 <differences>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/api/client/googleapis/auth/clientlogin/**</className>
+  </difference>
 </differences>
diff --git a/codecov.yaml b/codecov.yaml
new file mode 100644
index 000000000..5724ea947
--- /dev/null
+++ b/codecov.yaml
@@ -0,0 +1,4 @@
+---
+codecov:
+  ci:
+    - source.cloud.google.com
diff --git a/docs/_config.yml b/docs/_config.yml
new file mode 100644
index 000000000..be445c594
--- /dev/null
+++ b/docs/_config.yml
@@ -0,0 +1,2 @@
+theme: jekyll-theme-dinky
+title: Google APIs Client Library for Java
diff --git a/docs/_data/navigation.yml b/docs/_data/navigation.yml
new file mode 100644
index 000000000..4a92b7885
--- /dev/null
+++ b/docs/_data/navigation.yml
@@ -0,0 +1,23 @@
+toc:
+  - page: Overview
+    url: index.html
+  - page: Setup Instructions
+    url: setup.html
+  - page: Component Modules
+    url: component-modules.html
+  - page: Android
+    url: android.html
+  - page: Google App Engine
+    url: google-app-engine.html
+  - page: Batching
+    url: batching.html
+  - page: Media Download
+    url: media-download.html
+  - page: Media Upload
+    url: media-upload.html
+  - page: OAuth 2.0
+    url: oauth-2.0.html
+  - page: Timeouts and Errors
+    url: errors.html
+  - page: Support
+    url: support.html
\ No newline at end of file
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
new file mode 100644
index 000000000..b3e7d30e6
--- /dev/null
+++ b/docs/_layouts/default.html
@@ -0,0 +1,54 @@
+<!doctype html>
+<html lang="{{ site.lang | default: "en-US" }}">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+{% seo %}
+    <link rel="stylesheet" href="{{ '/assets/css/style.css?v=' | append: site.github.build_revision | relative_url }}">
+    <script src="{{ '/assets/js/scale.fix.js' | relative_url }}"></script>
+    <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+    <!--[if lt IE 9]>
+    <script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
+    <![endif]-->
+  </head>
+  <body>
+    <div class="wrapper">
+      <header>
+        <h1 class="header">{{ site.title | default: site.github.repository_name }}</h1>
+
+        {% for entry in site.data.navigation.toc %}
+          <a href="{{ entry.url }}">{{ entry.page }}</a><br/>
+        {% endfor %}
+        <br/>
+
+        <ul>
+          {% if site.show_downloads %}
+            <li class="download"><a class="buttons" href="{{ site.github.zip_url }}">Download ZIP</a></li>
+            <li class="download"><a class="buttons" href="{{ site.github.tar_url }}">Download TAR</a></li>
+          {% endif %}
+          <li><a class="buttons github" href="{{ site.github.repository_url }}">View On GitHub</a></li>
+        </ul>
+      </header>
+
+      <section>
+        {{ content }}
+      </section>
+
+      <footer>
+        <p><small>Hosted on <a href="https://pages.github.com">GitHub Pages</a> using the Dinky theme</small></p>
+      </footer>
+    </div>
+    <!--[if !IE]><script>fixScale(document);</script><![endif]-->
+    {% if site.google_analytics %}
+      <script>
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+        (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+        m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+        })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+        ga('create', '{{ site.google_analytics }}', 'auto');
+        ga('send', 'pageview');
+      </script>
+    {% endif %}
+  </body>
+</html>
\ No newline at end of file
diff --git a/docs/android.md b/docs/android.md
new file mode 100644
index 000000000..9ed63abe0
--- /dev/null
+++ b/docs/android.md
@@ -0,0 +1,79 @@
+---
+title: Android
+---
+
+# Running on [Android (@Beta)](#@Beta)
+
+If you are developing for Android and the Google API you want to use is included
+in the [Google Play Services library][play-services], use that library for the
+best performance and experience.
+
+To access other Google APIs, use the Google APIs Client Library for Java's 
+Android-specific helper classes, which are well-integrated with
+[Android AccountManager][account-manager].
+
+For example:
+
+```java
+@Override
+public void onCreate(Bundle savedInstanceState) {
+  super.onCreate(savedInstanceState);
+  // Google Accounts
+  credential =
+      GoogleAccountCredential.usingOAuth2(this, Collections.singleton(TasksScopes.TASKS));
+  SharedPreferences settings = getPreferences(Context.MODE_PRIVATE);
+  credential.setSelectedAccountName(settings.getString(PREF_ACCOUNT_NAME, null));
+  // Tasks client
+  service =
+      new com.google.api.services.tasks.Tasks.Builder(httpTransport, jsonFactory, credential)
+          .setApplicationName("Google-TasksAndroidSample/1.0").build();
+}
+```
+
+## Getting started
+
+Begin by reading the [Android development instructions][http-client-android] for
+the Google HTTP Client Library for Java.
+
+## Authentication
+
+As described in the [Android development instructions][http-client-android], the
+best practice on Android is to use the [`AccountManager`][account-manager] class
+(`@Beta`) for centralized identity management and credential token storage.
+
+For information about the OAuth 2.0 flow, see the
+[OAuth 2.0 instructions for Android][oauth2-android].
+
+## Partial response and update
+
+Google APIs support a partial-response protocol that allows you to specify which
+fields are returned to you in the HTTP response. This can significantly reduce
+the size of the response, thereby reducing network usage, parsing response time,
+and memory usage. It works with both JSON and XML.
+
+The following snippet of code drawn from the [Google Drive API Quickstart][quickstart] 
+demonstrates how to use the partial-response protocol. The `setFields` method
+identifies the fields you want returned:
+
+```java
+// Print the names and IDs for up to 10 files.
+FileList result = service.files().list()
+        .setPageSize(10)
+        .setFields("nextPageToken, files(id, name)")
+        .execute();
+List<File> files = result.getFiles();
+if (files == null || files.isEmpty()) {
+    System.out.println("No files found.");
+} else {
+    System.out.println("Files:");
+    for (File file : files) {
+        System.out.printf("%s (%s)\n", file.getName(), file.getId());
+    }
+}
+```
+
+[play-services]: https://developer.android.com/google/play-services/index.html
+[account-manager]: http://developer.android.com/reference/android/accounts/AccountManager.html
+[http-client-android]: https://github.com/googleapis/google-http-java-client/wiki/Android
+[oauth2-android]: https://github.com/googleapis/google-api-java-client#oauth2-android
+[quickstart]: https://developers.google.com/drive/api/v3/quickstart/java
diff --git a/docs/batching.md b/docs/batching.md
new file mode 100644
index 000000000..52f943e8c
--- /dev/null
+++ b/docs/batching.md
@@ -0,0 +1,43 @@
+---
+title: Batching
+---
+
+# Batching
+
+Each HTTP connection that your client makes results in overhead. To reduce
+overhead, you can batch multiple API calls together into a single HTTP request.
+
+The main classes of interest are [BatchRequest][batch-request] and 
+[JsonBatchCallback][json-batch-callback]. The following example shows how to use
+these classes with service-specific generated libraries:
+
+```java
+JsonBatchCallback<Calendar> callback = new JsonBatchCallback<Calendar>() {
+
+  public void onSuccess(Calendar calendar, HttpHeaders responseHeaders) {
+    printCalendar(calendar);
+    addedCalendarsUsingBatch.add(calendar);
+  }
+
+  public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
+    System.out.println("Error Message: " + e.getMessage());
+  }
+};
+
+...
+
+Calendar client = Calendar.builder(transport, jsonFactory, credential)
+  .setApplicationName("BatchExample/1.0").build();
+BatchRequest batch = client.batch();
+
+Calendar entry1 = new Calendar().setSummary("Calendar for Testing 1");
+client.calendars().insert(entry1).queue(batch, callback);
+
+Calendar entry2 = new Calendar().setSummary("Calendar for Testing 2");
+client.calendars().insert(entry2).queue(batch, callback);
+
+batch.execute();
+```
+
+[batch-request]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/batch/BatchRequest.html
+[json-batch-callback]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/batch/json/JsonBatchCallback.html
\ No newline at end of file
diff --git a/docs/component-modules.md b/docs/component-modules.md
new file mode 100644
index 000000000..264788217
--- /dev/null
+++ b/docs/component-modules.md
@@ -0,0 +1,64 @@
+---
+title: Component Modules
+---
+
+# Component Modules
+
+This libraries is composed of several modules:
+
+## google-api-client
+
+The Google API Client Library for Java (`google-api-client`) is designed to be
+compatible with all supported Java platforms, including Android.
+
+## google-api-client-android
+
+Extensions to the Google API Client Library for Java
+(`google-api-client-android`) support Java Google Android (only for SDK >= 2.1)
+applications. This module depends on `google-api-client` and
+`google-http-client-android`.
+
+## google-api-client-servlet
+
+Servlet and JDO extensions to the Google API Client Library for Java
+(`google-api-client-servlet`) support Java servlet web applications. This module
+depends on `google-api-client` and `google-oauth-client-servlet`.
+
+## google-api-client-appengine
+
+Google App Engine extensions to the Google API Client Library for Java
+(`google-api-client-appengine`) support Java Google App Engine applications.
+This module depends on `google-api-client`, `google-api-client-servlet`,
+`google-oauth-client-appengine`, and `google-http-client-appengine`.
+
+## google-api-client-gson
+
+GSON extensions to the Google API Client Library for Java
+(`google-api-client-gson`). This module depends on `google-api-client` and
+`google-http-client-gson`.
+
+## google-api-client-jackson2
+
+Jackson2 extensions to the Google API Client Library for Java
+(`google-api-client-jackson2`). This module depends on `google-api-client` and
+`google-http-client-jackson2`.
+
+## google-api-client-java6
+
+Java 6 (and higher) extensions to the Google API Client Library for Java
+(`google-api-client-java6`). This module depends on `google-api-client` and
+`google-oauth-client-java6`.
+
+## google-api-client-protobuf
+
+[Protocol buffer][protobuf] extensions to the Google API Client Library for Java
+(`google-api-client-protobuf`). This module depends on
+`google-http-client-protobuf` and `google-api-client`.
+
+## google-api-client-xml
+
+XML extensions to the Google API Client Library for Java
+(`google-api-client-xml`). This module depends on `google-api-client` and
+`google-http-client-xml`.
+
+[protobuf]: https://developers.google.com/protocol-buffers/docs/overview
diff --git a/docs/errors.md b/docs/errors.md
new file mode 100644
index 000000000..b01620b71
--- /dev/null
+++ b/docs/errors.md
@@ -0,0 +1,49 @@
+---
+title: Timeout and Errors
+---
+
+# Timeout and Errors
+
+## Setting timeouts
+
+In the following example, which uses the
+[Google Analytics API][google-analytics-api], the `setConnectTimeout` and
+`setReadTimeout` methods are used to set the connect and read timeouts to three
+minutes (in milliseconds) for all requests:
+
+```java
+private HttpRequestInitializer setHttpTimeout(final HttpRequestInitializer requestInitializer) {
+  return new HttpRequestInitializer() {
+    @Override
+    public void initialize(HttpRequest httpRequest) throws IOException {
+    requestInitializer.initialize(httpRequest);
+    httpRequest.setConnectTimeout(3 * 60000);  // 3 minutes connect timeout
+    httpRequest.setReadTimeout(3 * 60000);  // 3 minutes read timeout
+  }
+};
+
+GoogleCredential credential = ....
+
+final Analytics analytics = Analytics.builder(new NetHttpTransport(), jsonFactory, setHttpTimeout(credential)).build();
+```
+
+## Handling HTTP error responses from Google APIs
+
+When an error status code is detected in an HTTP response to a Google API that
+uses the JSON format, the generated libraries throw a 
+[`GoogleJsonResponseException`][google-json-response-exception].
+
+The following example shows one way that you can handle these exceptions:
+
+```java
+Drive.Files.List listFiles = drive.files.list();
+try {
+  FileList response = listFiles.execute();
+  ...
+} catch (GoogleJsonResponseException e) {
+  System.err.println(e.getDetails());
+}
+```
+
+[google-analytics-api]: https://developers.google.com/analytics/
+[google-json-response-exception]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/json/GoogleJsonResponseException.html
diff --git a/docs/google-app-engine.md b/docs/google-app-engine.md
new file mode 100644
index 000000000..52a0a360d
--- /dev/null
+++ b/docs/google-app-engine.md
@@ -0,0 +1,59 @@
+---
+title: Running on Google App Engine
+---
+
+# Running on Google App Engine
+
+App Engine-specific helpers make quick work of authenticated calls to APIs, and
+you do not need to worry about exchanging code for tokens.
+
+For example:
+
+```java
+@Override
+protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException {
+  AppIdentityCredential credential =
+      new AppIdentityCredential(Arrays.asList(UrlshortenerScopes.URLSHORTENER));
+  Urlshortener shortener =
+      new Urlshortener.Builder(new UrlFetchTransport(), new JacksonFactory(), credential)
+      .build();
+  UrlHistory history = shortener.URL().list().execute();
+  ...
+}
+```
+
+## Auth helpers
+
+If you are building a web app that interacts with a user's data via an OAuth 
+2.0-enabled API, we've created some helpers to assist you with the process. The
+helpers aim to:
+
+* Simplify the process of obtaining access tokens
+  ([`AuthorizationCodeFlow`][authorization-code-flow]).
+* Manage tokens, after they are obtained, by marking them as
+  [`PersistenceCapable`][persistence-capable].
+* Simplify the process of making authenticated calls using the access token's
+  [credential][credential].
+* Insulate you from the details of authentication when writing servlets.
+
+## Getting started
+
+1. Install the Google API Client Library for Java:
+   * Follow the [download instructions][setup] and put the library jar files
+     into your war/WEB-INF/lib directory.
+   * Alternatively, you can use [Maven][setup].
+1. Learn about using [OAuth 2.0 with the authorization code flow for Google App Engine applications][oauth2].
+1. Learn about using [OAuth 2.0 with the Google App Engine Identity API][oauth2-gae].
+1. Take a look at the [Calendar App Engine sample][calendar-sample]. This sample
+   combines our Java library and auth helpers to show you how to access end-user
+   data from within a Google App Engine web app. The sample also uses [GWT][gwt]
+   for the user interface.
+
+[authorization-code-flow]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/AuthorizationCodeFlow.html
+[persistence-capable]: https://cloud.google.com/appengine/docs/java/datastore/
+[credential]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/Credential.html
+[setup]: https://github.com/googleapis/google-api-java-client/wiki/Setup
+[oauth2]: https://github.com/googleapis/google-api-java-client/wiki/OAuth2
+[oauth2-gae]: https://github.com/googleapis/google-api-java-client/wiki/OAuth2#gae
+[calendar-sample]: https://github.com/google/google-api-java-client-samples/tree/master/calendar-appengine-sample
+[gwt]: http://www.gwtproject.org/gle-http-java-client/http-transport.html
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
new file mode 100644
index 000000000..106bc5e4f
--- /dev/null
+++ b/docs/index.md
@@ -0,0 +1,77 @@
+---
+title: Overview
+---
+
+# Overview
+
+## Description
+
+The Google APIs Client Library for Java is a flexible, efficient, and powerful
+Java client library for accessing any HTTP-based API on the web, not just Google
+APIs.
+
+The library has the following features:
+
+- A powerful [OAuth 2.0][oauth2] library with a consistent interface.
+- Lightweight, efficient XML and JSON data models that support any data schema.
+- Support for [protocol buffers][protobuf].
+- A set of [generated libraries for Google APIs][service-clients].
+
+The library supports the following Java environments:
+
+- Java 7 (or higher)
+- Android 1.6 (or higher)
+- [Google App Engine][app-engine]
+
+This library is built on top of two common libraries, also built by Google, and
+also designed to work with any HTTP service on the web:
+
+- [Google HTTP Client Library for Java][http-client]
+- [Google OAuth Client Library for Java][oauth-client]
+
+This is an open-source library, and [contributions][contributions] are welcome.
+
+## Accessing Google APIs
+
+To use Google's Java client libraries to call any Google API, you need two 
+libraries:
+
+- The core Google APIs Client Library for Java (`google-api-java-client`), which
+  is the generic runtime library described here. This library provides
+  functionality common to all APIs, for example HTTP transport, error handling,
+  authentication, JSON parsing, media download/upload, and batching.
+- An auto-generated Java library for the API you are accessing, for example the 
+  [generated Java library for the BigQuery API][bigquery]. These generated
+  libraries include API-specific information such as the root URL, and classes 
+  that represent entities in the context of the API. These classes are useful
+  for making conversions between JSON objects and Java objects.
+
+To find the generated library for a Google API, visit
+[Google APIs Client Library for Java][service-list].
+The API-specific Java packages include both the core google-api-java-client and 
+the client-specific libraries.
+
+## Beta Features
+
+Features marked with the `@Beta` annotation at the class or method level are
+subject to change. They might be modified in any way, or even removed, in any
+major release. You should not use beta features if your code is a library itself
+(that is, if your code is used on the `CLASSPATH` of users outside your own
+control).
+
+## Deprecated Features
+
+Deprecated non-beta features will be removed eighteen months after the release
+in which they are first deprecated. You must fix your usages before this time.
+If you don't, any type of breakage might result, and you are not guaranteed a
+compilation error.
+
+[oauth2]: https://googleapis.github.io/google-api-java-client/oauth-2.0.html
+[protobuf]: https://github.com/google/protobuf/
+[service-clients]: https://github.com/googleapis/google-api-java-client-services/
+[app-engine]: https://googleapis.github.io/google-api-java-client/google-app-engine.html
+[http-client]: https://github.com/googleapis/google-http-java-client
+[oauth-client]: https://github.com/googleapis/google-oauth-java-client
+[contributions]: https://github.com/googleapis/google-api-java-client/wiki/CONTRIBUTING.md
+[bigquery]: https://github.com/google/google-api-java-client-samples/tree/master/bigquery-appengine-sample/src/main/java/com/google/api/client/sample/bigquery/appengine/dashboard
+[service-list]: https://github.com/googleapis/google-api-java-client-services#supported-google-apis
diff --git a/docs/media-download.md b/docs/media-download.md
new file mode 100644
index 000000000..088786828
--- /dev/null
+++ b/docs/media-download.md
@@ -0,0 +1,88 @@
+---
+title: Media Download
+---
+
+# Media Download
+
+## Resumable media downloads
+
+When you download a large media file from a server, use resumable media download
+to download the file chunk by chunk. The Google API generated libraries contain
+convenience methods for interacting with resumable media download, which was
+introduced in the 1.9.0-beta version of the Google API Client Library for Java.
+    
+The resumable media download protocol is similar to the resumable media upload
+protocol, which is described in the
+[Google Drive API documentation][google-drive-documentation].
+
+### Implementation details
+
+The main classes of interest are [`MediaHttpDownloader`][media-http-downloader]
+and [`MediaHttpDownloaderProgressListener`][media-http-downloader-progress-listener].
+Media content is downloaded in chunks, and chunk size is configurable. If a
+server error is encountered in a request, then the request is retried.
+
+If methods in the service-specific generated libraries support download in the
+Discovery document, then a convenient download method is created for these
+methods that takes in an [`OutputStream`][output-stream]. (For more about using
+media download with the Google APIs Discovery Service, see
+[Media download][media-download].)
+
+For example:
+
+```java
+class CustomProgressListener implements MediaHttpDownloaderProgressListener {
+  public void progressChanged(MediaHttpDownloader downloader) {
+    switch (downloader.getDownloadState()) {
+      case MEDIA_IN_PROGRESS:
+        System.out.println(downloader.getProgress());
+        break;
+      case MEDIA_COMPLETE:
+        System.out.println("Download is complete!");
+    }
+  }
+}
+
+OutputStream out = new FileOutputStream("/tmp/driveFile.jpg");
+
+DriveFiles.Get request = drive.files().get(fileId);
+request.getMediaHttpDownloader().setProgressListener(new CustomProgressListener());
+request.executeMediaAndDownloadTo(out);
+```
+
+You can also use this feature without service-specific generated libraries.
+Here is an example:
+
+```java
+OutputStream out = new FileOutputStream("/tmp/Test.jpg");
+
+MediaHttpDownloader downloader = new MediaHttpDownloader(transport, httpRequestInitializer);
+downloader.setProgressListener(new CustomProgressListener());
+downloader.download(requestUrl, out);
+```
+
+## Direct media download
+
+Resumable media download is enabled by default, but you can disable it and use
+direct media download instead, for example if you are downloading a small file.
+Direct media download was introduced in the 1.9.0-beta version of the Google API
+Client Library for Java.
+
+Direct media download downloads the whole media content in one HTTP request, as
+opposed to the resumable media download protocol, which can download in multiple
+requests. Doing a direct download reduces the number of HTTP requests but
+increases the chance of failures (such as connection failures) that can happen
+with large downloads.
+
+The usage is the same as what is described above, plus the following call that
+tells [`MediaHttpDownloader`][media-http-downloader] to do direct downloads:
+
+```java
+mediaHttpDownloader.setDirectDownloadEnabled(true);
+```
+
+[google-drive-documentation]: https://developers.google.com/drive/web/manage-uploads#resumable
+[media-http-downloader]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/media/MediaHttpDownloader.html
+[media-http-downloader-progress-listener]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/media/MediaHttpDownloaderProgressListener.html
+[output-stream]: https://docs.oracle.com/javase/7/docs/api/java/io/OutputStream.html
+[media-download]: https://developers.google.com/discovery/v1/using#discovery-doc-methods-mediadownload
\ No newline at end of file
diff --git a/docs/media-upload.md b/docs/media-upload.md
new file mode 100644
index 000000000..8418ca160
--- /dev/null
+++ b/docs/media-upload.md
@@ -0,0 +1,112 @@
+---
+title: Media Upload
+---
+
+# Media Upload
+
+## Resumable media upload
+
+When you upload a large media file to a server, use resumable media upload to
+send the file chunk by chunk. The Google API generated libraries contain
+convenience methods for interacting with resumable media upload, which was
+introduced in the 1.7.0-beta version of the Google API Client Library for Java.
+
+The resumable media upload protocol is similar to the resumable media upload
+protocol described in the
+[Google Drive API documentation][google-drive-documentation].
+
+### Protocol design
+
+The following sequence diagram shows how the resumable media upload protocol
+works: ![Resumable Media Upload Protocol Diagram][resumable-media-upload-protocol-diagram]
+
+### Implementation details
+
+The main classes of interest are [MediaHttpUploader][media-http-uploader] and 
+[MediaHttpProgressListener][media-http-progress-listener].
+
+If methods in the service-specific generated libraries contain the `mediaUpload`
+parameter in the Discovery document, then a convenience method is created for
+these methods that takes an [InputStreamContent][input-stream-content] as a 
+parameter. (For more about using media upload with the Google APIs Discovery
+Service, see [Media upload][media-upload].)
+
+For example, the `insert` method of the Drive API supports `mediaUpload`, and
+you can use the following code to upload a file:
+
+```java
+class CustomProgressListener implements MediaHttpUploaderProgressListener {
+  public void progressChanged(MediaHttpUploader uploader) throws IOException {
+    switch (uploader.getUploadState()) {
+      case INITIATION_STARTED:
+        System.out.println("Initiation has started!");
+        break;
+      case INITIATION_COMPLETE:
+        System.out.println("Initiation is complete!");
+        break;
+      case MEDIA_IN_PROGRESS:
+        System.out.println(uploader.getProgress());
+        break;
+      case MEDIA_COMPLETE:
+        System.out.println("Upload is complete!");
+    }
+  }
+}
+
+File mediaFile = new File("/tmp/driveFile.jpg");
+InputStreamContent mediaContent =
+    new InputStreamContent("image/jpeg",
+        new BufferedInputStream(new FileInputStream(mediaFile)));
+mediaContent.setLength(mediaFile.length());
+
+Drive.Files.Insert request = drive.files().insert(fileMetadata, mediaContent);
+request.getMediaHttpUploader().setProgressListener(new CustomProgressListener());
+request.execute();
+```
+
+You can also use the resumable media upload feature without the service-specific
+generated libraries. Here is an example:
+
+```java
+File mediaFile = new File("/tmp/Test.jpg");
+InputStreamContent mediaContent =
+    new InputStreamContent("image/jpeg",
+        new BufferedInputStream(new FileInputStream(mediaFile)));
+mediaContent.setLength(mediaFile.length());
+
+
+MediaHttpUploader uploader = new MediaHttpUploader(mediaContent, transport, httpRequestInitializer);
+uploader.setProgressListener(new CustomProgressListener());
+HttpResponse response = uploader.upload(requestUrl);
+if (!response.isSuccessStatusCode()) {
+  throw GoogleJsonResponseException(jsonFactory, response);
+}
+```
+
+## Direct media upload
+
+Resumable media upload is enabled by default, but you can disable it and use
+direct media upload instead, for example if you are uploading a small file.
+Direct media upload was introduced in the 1.9.0-beta version of the Google API
+Client Library for Java.
+
+Direct media upload uploads the whole file in one HTTP request, as opposed to
+the resumable media upload protocol, which uploads the file in multiple
+requests. Doing a direct upload reduces the number of HTTP requests but
+increases the chance of failures (such as connection failures) that can happen
+with large uploads.
+
+The usage for direct media upload is the same as what is described above for
+resumable media upload, plus the following call that tells
+[MediaHttpUploader][media-http-uploader] to only do direct uploads:
+
+```java
+mediaHttpUploader.setDirectUploadEnabled(true);
+```
+
+[google-drive-documentation]: https://developers.google.com/drive/web/manage-uploads#resumable
+[media-http-uploader]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/media/MediaHttpUploader.html
+[media-http-progress-listener]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/media/MediaHttpUploaderProgressListener.html
+[input-stream-content]: https://googleapis.dev/java/google-http-client/latest/com/google/api/client/http/InputStreamContent.html
+[media-upload]: https://developers.google.com/discovery/v1/using#discovery-doc-methods-mediaupload
+[resumable-media-upload-protocol-diagram]: https://github.com/googleapis/google-api-java-client/raw/master/Resumable-Media-Upload-Sequence-Diagram.png
diff --git a/docs/oauth-2.0.md b/docs/oauth-2.0.md
new file mode 100644
index 000000000..56a72b165
--- /dev/null
+++ b/docs/oauth-2.0.md
@@ -0,0 +1,606 @@
+---
+title: OAuth 2.0
+---
+
+# Using OAuth 2.0 with the Google API Client Library for Java
+
+This document explains how to use the [`GoogleCredential`][google-credential]
+utility class to do OAuth 2.0 authorization with Google services. For
+information about the generic [OAuth 2.0 functions that we provide, see OAuth
+2.0 and the Google OAuth Client Library for Java][google-oauth-client-instructions].
+
+To access protected data stored on Google services, use [OAuth 2.0][oauth2] for
+authorization. Google APIs support OAuth 2.0 flows for different types of client
+applications. In all of these flows, the client application requests an access
+token that is associated with only your client application and the owner of the
+protected data being accessed. The access token is also associated with a
+limited scope that defines the kind of data your client application has access
+to (for example "Manage your tasks"). An important goal for OAuth 2.0 is to
+provide secure and convenient access to the protected data, while minimizing the
+potential impact if an access token is stolen.
+
+The OAuth 2.0 packages in the Google API Client Library for Java are built on
+the general-purpose
+[Google OAuth 2.0 Client Library for Java][google-oauth-client-instructions].
+
+For details, see the Javadoc documentation for the following packages:
+
+* [`com.google.api.client.googleapis.auth.oauth2`][javadoc-oauth2] (from `google-api-client`)
+* [`com.google.api.client.googleapis.extensions.appengine.auth.oauth2`][javadoc-appengine-oauth2] (from google-api-client-appengine)
+
+## Google API Console
+
+Before you can access Google APIs, you need to set up a project on the
+[Google API Console][console] for auth and billing purposes, whether your client
+is an installed application, a mobile application, a web server, or a client
+that runs in browser.
+
+For instructions on setting up your credentials properly, see the 
+[API Console Help][console-help].
+
+## Credentials
+
+### GoogleCredentials
+
+[`GoogleCredentials`][google-credentials] is a thread-safe helper class for OAuth
+2.0 for accessing protected resources using an access token. For example, if you
+already have an access token, you can make a request in the following way:
+
+```java
+import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
+import com.google.api.client.json.gson.GsonFactory;
+import com.google.api.services.books.Books;
+import com.google.auth.http.HttpCredentialsAdapter;
+import com.google.auth.oauth2.AccessToken;
+import com.google.auth.oauth2.GoogleCredentials;
+
+GoogleCredentials credentials =
+    GoogleCredentials.newBuilder().setAccessToken(new AccessToken("token", null)).build();
+
+Books books =
+    new Books.Builder(
+            GoogleNetHttpTransport.newTrustedTransport(),
+            GsonFactory.getDefaultInstance(),
+            new HttpCredentialsAdapter(credentials))
+        .setApplicationName("BooksExample/1.0")
+        .build();
+```
+
+### Google App Engine identity
+
+This alternative credential is based on the 
+[Google App Engine App Identity Java API][identity-api]. Unlike the credential
+in which a client application requests access to an end-user's data, the App
+Identity API provides access to the client application's own data.
+
+Use [`AppIdentityCredential`][app-identity-credential] (from 
+`google-api-client-appengine`). This credential is much simpler because Google
+App Engine takes care of all of the details. You only specify the OAuth 2.0
+scope you need.
+
+```java
+import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
+import com.google.api.client.json.gson.GsonFactory;
+import com.google.api.services.books.Books;
+import com.google.appengine.api.appidentity.AppIdentityService;
+import com.google.appengine.api.appidentity.AppIdentityServiceFactory;
+import com.google.auth.appengine.AppEngineCredentials;
+import com.google.auth.http.HttpCredentialsAdapter;
+import com.google.auth.oauth2.GoogleCredentials;
+import java.util.Arrays;
+
+AppIdentityService appIdentityService = AppIdentityServiceFactory.getAppIdentityService();
+
+GoogleCredentials credentials =
+    AppEngineCredentials.newBuilder()
+        .setScopes(Arrays.asList("scope1", "scope2", "scope3"))
+        .setAppIdentityService(appIdentityService)
+        .build();
+
+Books books =
+    new Books.Builder(
+            GoogleNetHttpTransport.newTrustedTransport(),
+            GsonFactory.getDefaultInstance(),
+            new HttpCredentialsAdapter(credentials))
+        .setApplicationName("BooksExample/1.0")
+        .build();
+```
+
+## Data store
+
+An access token typically has an expiration date of 1 hour, after which you will
+get an error if you try to use it. [GoogleCredentials][google-credentials] takes
+care of automatically "refreshing" the token, which simply means getting a new
+access token. This is done by means of a long-lived refresh token, which is
+typically received along with the access token if you use the
+`access_type=offline` parameter during the authorization code flow (see 
+[`GoogleAuthorizationCodeFlow.Builder.setAccessType(String)`][auth-code-flow-set-access-type].
+
+Most applications will need to persist the credential's access token and/or
+refresh token. To persist the credential's access and/or refresh tokens, you can
+provide your own implementation of [`DataStoreFactory`][data-store-factory])
+with [`StoredCredential`][stored-credential]; or you can use one of the
+following implementations provided by the library:
+
+* [`AppEngineDataStoreFactory`][appengine-data-store-factory]: persists the 
+  credential using the Google App Engine Data Store API.
+* [`MemoryDataStoreFactory`][memory-data-store-factory]: "persists" the 
+  credential in memory, which is only useful as a short-term storage for the
+  lifetime of the process.
+* [`FileDataStoreFactory`][file-data-store-factory]: persists the credential in
+  a file.
+
+### Google App Engine users
+
+
+[`AppEngineCredentialStore`][appengine-credential-store] is deprecated and is being removed.
+
+We recommend that you use
+[`AppEngineDataStoreFactory`][appengine-data-store-factory] with
+[`StoredCredential`][stored-credential]. If you have credentials stored in the
+old way, you can use the added helper methods
+[`migrateTo(AppEngineDataStoreFactory)`][appengine-migrate] or
+[`migrateTo(DataStore)`][datastore-migrate] to migrate.
+
+Use [`DataStoreCredentialRefreshListener`][datastore-credential-listener] and
+set it for the credential using
+[`GoogleCredential.Builder.addRefreshListener(CredentialRefreshListener)`][add-refresh-listener].
+
+## Authorization code flow
+
+Use the authorization code flow to allow the end user to grant your application
+access to their protected data. The protocol for this flow is specified in the
+[Authorization Code Grant specification][authorization-code-grant].
+
+This flow is implemented using [`AuthorizationCodeFlow`][authorization-code-flow].
+The steps are:
+
+* An end user logs in to your application. You need to associate that user with
+  a user ID that is unique for your application.
+* Call [`AuthorizationCodeFlow.loadCredential(String)`][auth-code-flow-load],
+  based on the user ID, to check if the user's credentials are already known.
+  If so, you're done.
+* If not, call [`AuthorizationCodeFlow.newAuthorizationUrl()`][auth-code-flow-new]
+  and direct the end user's browser to an authorization page where they can grant
+  your application access to their protected data.
+* The web browser then redirects to the redirect URL with a "code" query
+  parameter that can then be used to request an access token using
+  [`AuthorizationCodeFlow.newTokenRequest(String)`][token-request].
+* Use
+  [`AuthorizationCodeFlow.createAndStoreCredential(TokenResponse, String)`][create-and-store]
+  to store and obtain a credential for accessing protected resources.
+
+Alternatively, if you are not using
+[`AuthorizationCodeFlow`][authorization-code-flow], you may use the lower-level
+classes:
+
+* Use [`DataStore.get(String)`][datastore-get] to load the credential from the
+  store, based on the user ID.
+* Use [`AuthorizationCodeRequestUrl`][auth-code-request-url] to direct the
+  browser to the authorization page.
+* Use [`AuthorizationCodeResponseUrl`][auth-code-response-url] to process the
+  authorization response and parse the authorization code.
+* Use [`AuthorizationCodeTokenRequest`][auth-code-token-request] to request an
+  access token and possibly a refresh token.
+* Create a new [`Credential`][credential] and store it using
+  [`DataStore.set(String, V)`][datastore-set].
+* Access protected resources using the [`Credential`][credential]. Expired access
+  tokens are automatically refreshed using the refresh token, if applicable.
+  Make sure to use
+  [`DataStoreCredentialRefreshListener`][datastore-credential-listener] and set
+  it for the credential using
+  [`Credential.Builder.addRefreshListener(CredentialRefreshListener)`][add-refresh-listener].
+
+### Web server applications
+
+The protocol for this flow is explained in
+[Using OAuth 2.0 for Web Server Applications][oauth-web-server].
+
+This library provides servlet helper classes to significantly simplify the
+authorization code flow for basic use cases. You just provide concrete subclasses
+of [`AbstractAuthorizationCodeServlet`][abstract-code-servlet]
+and [`AbstractAuthorizationCodeCallbackServlet`][abstract-code-callback-servlet]
+(from `google-oauth-client-servlet`) and add them to your `web.xml` file. Note
+that you still need to take care of user login for your web application and
+extract a user ID.
+
+```java
+public class CalendarServletSample extends AbstractAuthorizationCodeServlet {
+
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws IOException {
+    // do stuff
+  }
+
+  @Override
+  protected String getRedirectUri(HttpServletRequest req) throws ServletException, IOException {
+    GenericUrl url = new GenericUrl(req.getRequestURL().toString());
+    url.setRawPath("/oauth2callback");
+    return url.build();
+  }
+
+  @Override
+  protected AuthorizationCodeFlow initializeFlow() throws IOException {
+    return new GoogleAuthorizationCodeFlow.Builder(
+        new NetHttpTransport(), GsonFactory.getDefaultInstance(),
+        "[[ENTER YOUR CLIENT ID]]", "[[ENTER YOUR CLIENT SECRET]]",
+        Collections.singleton(CalendarScopes.CALENDAR)).setDataStoreFactory(
+        DATA_STORE_FACTORY).setAccessType("offline").build();
+  }
+
+  @Override
+  protected String getUserId(HttpServletRequest req) throws ServletException, IOException {
+    // return user ID
+  }
+}
+
+public class CalendarServletCallbackSample extends AbstractAuthorizationCodeCallbackServlet {
+
+  @Override
+  protected void onSuccess(HttpServletRequest req, HttpServletResponse resp, Credential credential)
+      throws ServletException, IOException {
+    resp.sendRedirect("/");
+  }
+
+  @Override
+  protected void onError(
+      HttpServletRequest req, HttpServletResponse resp, AuthorizationCodeResponseUrl errorResponse)
+      throws ServletException, IOException {
+    // handle error
+  }
+
+  @Override
+  protected String getRedirectUri(HttpServletRequest req) throws ServletException, IOException {
+    GenericUrl url = new GenericUrl(req.getRequestURL().toString());
+    url.setRawPath("/oauth2callback");
+    return url.build();
+  }
+
+  @Override
+  protected AuthorizationCodeFlow initializeFlow() throws IOException {
+    return new GoogleAuthorizationCodeFlow.Builder(
+        new NetHttpTransport(), GsonFactory.getDefaultInstance()
+        "[[ENTER YOUR CLIENT ID]]", "[[ENTER YOUR CLIENT SECRET]]",
+        Collections.singleton(CalendarScopes.CALENDAR)).setDataStoreFactory(
+        DATA_STORE_FACTORY).setAccessType("offline").build();
+  }
+
+  @Override
+  protected String getUserId(HttpServletRequest req) throws ServletException, IOException {
+    // return user ID
+  }
+}
+```
+
+### Google App Engine applications
+
+The authorization code flow on App Engine is almost identical to the servlet
+authorization code flow, except that we can leverage Google App Engine's
+[Users Java API][users-api]. The user needs to be logged in for the Users Java
+API to be enabled; for information about redirecting users to a login page if
+they are not already logged in, see
+[Security and Authentication][security-authentication] (in `web.xml`).
+
+The primary difference from the servlet case is that you provide concrete
+subclasses of [`AbstractAppEngineAuthorizationCodeServlet`][abstract-gae-code-servlet]
+and [`AbstractAppEngineAuthorizationCodeCallbackServlet`][abstract-gae-code-callback-servlet]
+(from `google-oauth-client-appengine`). They extend the abstract servlet classes
+and implement the `getUserId` method for you using the Users Java API. 
+[`AppEngineDataStoreFactory`][appengine-data-store-factory] (from
+[Google HTTP Client Library for Java][google-http-client]) is a good option for
+persisting the credential using the Google App Engine Data Store API.
+
+Example taken (slightly modified) from [calendar-appengine-sample][calendar-sample]:
+
+```java
+public class CalendarAppEngineSample extends AbstractAppEngineAuthorizationCodeServlet {
+
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws IOException {
+    // do stuff
+  }
+
+  @Override
+  protected String getRedirectUri(HttpServletRequest req) throws ServletException, IOException {
+    return Utils.getRedirectUri(req);
+  }
+
+  @Override
+  protected AuthorizationCodeFlow initializeFlow() throws IOException {
+    return Utils.newFlow();
+  }
+}
+
+class Utils {
+  static String getRedirectUri(HttpServletRequest req) {
+    GenericUrl url = new GenericUrl(req.getRequestURL().toString());
+    url.setRawPath("/oauth2callback");
+    return url.build();
+  }
+
+  static GoogleAuthorizationCodeFlow newFlow() throws IOException {
+    return new GoogleAuthorizationCodeFlow.Builder(HTTP_TRANSPORT, JSON_FACTORY,
+        getClientCredential(), Collections.singleton(CalendarScopes.CALENDAR)).setDataStoreFactory(
+        DATA_STORE_FACTORY).setAccessType("offline").build();
+  }
+}
+
+public class OAuth2Callback extends AbstractAppEngineAuthorizationCodeCallbackServlet {
+
+  private static final long serialVersionUID = 1L;
+
+  @Override
+  protected void onSuccess(HttpServletRequest req, HttpServletResponse resp, Credential credential)
+      throws ServletException, IOException {
+    resp.sendRedirect("/");
+  }
+
+  @Override
+  protected void onError(
+      HttpServletRequest req, HttpServletResponse resp, AuthorizationCodeResponseUrl errorResponse)
+      throws ServletException, IOException {
+    String nickname = UserServiceFactory.getUserService().getCurrentUser().getNickname();
+    resp.getWriter().print("<h3>" + nickname + ", why don't you want to play with me?</h1>");
+    resp.setStatus(200);
+    resp.addHeader("Content-Type", "text/html");
+  }
+
+  @Override
+  protected String getRedirectUri(HttpServletRequest req) throws ServletException, IOException {
+    return Utils.getRedirectUri(req);
+  }
+
+  @Override
+  protected AuthorizationCodeFlow initializeFlow() throws IOException {
+    return Utils.newFlow();
+  }
+}
+```
+
+For an additional sample, see
+[storage-serviceaccount-appengine-sample][storage-sample].
+
+### Service accounts
+
+[GoogleCredentials][google-credentials] also supports [service accounts][service-accounts].
+Unlike the credential in which a client application requests access to an
+end-user's data, Service Accounts provide access to the client application's
+own data. Your client application signs the request for an access token using
+a private key downloaded from the [Google API Console][console].
+
+For example, you can make a request in the following way:
+
+```java
+HttpTransport httpTransport = GoogleNetHttpTransport.newTrustedTransport();
+JsonFactory jsonFactory = GsonFactory.getDefaultInstance();
+
+//Build service account credential
+GoogleCredentials googleCredentials = GoogleCredentials.
+        fromStream(new FileInputStream("/path/to/file"));
+HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(googleCredentials);
+
+Storage storage = new Storage.Builder(httpTransport, jsonFactory, requestInitializer)
+        .setApplicationName("MyProject-1234")
+        .build();
+```
+
+For an additional sample, see [storage-serviceaccount-cmdline-sample][storage-sample].
+
+**Note:** Although you can use service accounts in applications that run from a
+Google Apps domain, service accounts are not members of your Google Apps account
+and aren't subject to domain policies set by Google Apps administrators. For
+example, a policy set in the Google Apps admin console to restrict the ability
+of Apps end users to share documents outside of the domain would not apply to
+service accounts.
+
+#### Impersonation
+
+You can also use the service account flow to impersonate a user in a domain that
+you own. This is very similar to the service account flow above, but you
+additionally call [`GoogleCredential.Builder.setServiceAccountUser(String)`][set-service-account-user].
+
+### Installed applications
+
+This is the command-line authorization code flow described in [Using OAuth 2.0 for Installed Applications][oauth2-installed-app].
+
+Example snippet from [plus-cmdline-sample][plus-sample]:
+
+```java
+public static void main(String[] args) {
+  try {
+    httpTransport = GoogleNetHttpTransport.newTrustedTransport();
+    dataStoreFactory = new FileDataStoreFactory(DATA_STORE_DIR);
+    // authorization
+    Credential credential = authorize();
+    // set up global Plus instance
+    plus = new Plus.Builder(httpTransport, JSON_FACTORY, credential).setApplicationName(
+        APPLICATION_NAME).build();
+   // ...
+}
+
+private static Credential authorize() throws Exception {
+  // load client secrets
+  GoogleClientSecrets clientSecrets = GoogleClientSecrets.load(JSON_FACTORY,
+      new InputStreamReader(PlusSample.class.getResourceAsStream("/client_secrets.json")));
+  // set up authorization code flow
+  GoogleAuthorizationCodeFlow flow = new GoogleAuthorizationCodeFlow.Builder(
+      httpTransport, JSON_FACTORY, clientSecrets,
+      Collections.singleton(PlusScopes.PLUS_ME)).setDataStoreFactory(
+      dataStoreFactory).build();
+  // authorize
+  return new AuthorizationCodeInstalledApp(flow, new LocalServerReceiver()).authorize("user");
+}
+```
+
+### Client-side applications
+
+To use the browser-based client flow described in 
+[Using OAuth 2.0 for Client-side Applications][oauth2-user-agent], you would
+typically follow these steps:
+
+1. Redirect the end user in the browser to the authorization page using 
+   [`GoogleBrowserClientRequestUrl`][browser-client-request] to grant your
+   browser application access to the end user's protected data.
+1. Use the [Google API Client Library for JavaScript][javascript-client] to 
+   process the access token found in the URL fragment at the redirect URI
+   registered at the [Google API Console][console].
+
+Sample usage for a web application:
+
+```java
+public void doGet(HttpServletRequest request, HttpServletResponse response)throws IOException {
+  String url = new GoogleBrowserClientRequestUrl("812741506391.apps.googleusercontent.com",
+      "https://oauth2.example.com/oauthcallback", Arrays.asList(
+          "https://www.googleapis.com/auth/userinfo.email",
+          "https://www.googleapis.com/auth/userinfo.profile")).setState("/profile").build();
+  response.sendRedirect(url);
+}
+```
+
+### Android (@Beta)
+
+**Which library to use with Android:**
+
+If you are developing for Android and the Google API you want to use is included
+in the [Google Play Services library][play-services], use that library for the
+best performance and experience. If the Google API you want to use with Android
+is not part of the Google Play Services library, you can use the Google API
+Client Library for Java, which supports Android 4.0 (Ice Cream Sandwich)
+(or higher), and which is described here. The support for Android in the Google
+API Client Library for Java is `@Beta`.
+
+**Background:**
+
+Starting with Eclair (SDK 2.1), user accounts are managed on an Android device
+using the Account Manager. All Android application authorization is centrally
+managed by the SDK using [AccountManager][account-manager]. You specify the
+OAuth 2.0 scope your application needs, and it returns an access token to use.
+
+The OAuth 2.0 scope is specified via the `authTokenType` parameter as `oauth2:`
+plus the scope. For example:
+
+```
+oauth2:https://www.googleapis.com/auth/tasks
+```
+
+This specifies read/write access to the Google Tasks API. If you need multiple
+OAuth 2.0 scopes, use a space-separated list.
+
+Some APIs have special `authTokenType` parameters that also work. For example,
+"Manage your tasks" is an alias for the `authtokenType` example shown above.
+
+You must also specify the API key from the [Google API Console][console].
+Otherwise, the token that the AccountManager gives you only provides you with
+anonymous quota, which is usually very low. By contrast, by specifying an API
+key you receive a higher free quota, and can optionally set up billing for usage
+above that.
+
+Example code snippet taken from [tasks-android-sample][tasks-sample]:
+
+```java
+com.google.api.services.tasks.Tasks service;
+
+@Override
+public void onCreate(Bundle savedInstanceState) {
+  credential =
+      GoogleAccountCredential.usingOAuth2(this, Collections.singleton(TasksScopes.TASKS));
+  SharedPreferences settings = getPreferences(Context.MODE_PRIVATE);
+  credential.setSelectedAccountName(settings.getString(PREF_ACCOUNT_NAME, null));
+  service =
+      new com.google.api.services.tasks.Tasks.Builder(httpTransport, jsonFactory, credential)
+          .setApplicationName("Google-TasksAndroidSample/1.0").build();
+}
+
+private void chooseAccount() {
+  startActivityForResult(credential.newChooseAccountIntent(), REQUEST_ACCOUNT_PICKER);
+}
+
+@Override
+protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+  super.onActivityResult(requestCode, resultCode, data);
+  switch (requestCode) {
+    case REQUEST_GOOGLE_PLAY_SERVICES:
+      if (resultCode == Activity.RESULT_OK) {
+        haveGooglePlayServices();
+      } else {
+        checkGooglePlayServicesAvailable();
+      }
+      break;
+    case REQUEST_AUTHORIZATION:
+      if (resultCode == Activity.RESULT_OK) {
+        AsyncLoadTasks.run(this);
+      } else {
+        chooseAccount();
+      }
+      break;
+    case REQUEST_ACCOUNT_PICKER:
+      if (resultCode == Activity.RESULT_OK && data != null && data.getExtras() != null) {
+        String accountName = data.getExtras().getString(AccountManager.KEY_ACCOUNT_NAME);
+        if (accountName != null) {
+          credential.setSelectedAccountName(accountName);
+          SharedPreferences settings = getPreferences(Context.MODE_PRIVATE);
+          SharedPreferences.Editor editor = settings.edit();
+          editor.putString(PREF_ACCOUNT_NAME, accountName);    
+          editor.commit();
+          AsyncLoadTasks.run(this);
+        }
+      }
+      break;
+  }
+}
+```
+
+[google-credentials]: https://googleapis.dev/java/google-auth-library/latest/index.html?com/google/auth/oauth2/GoogleCredentials.html
+[google-oauth-client-instructions]: https://developers.google.com/api-client-library/java/google-oauth-java-client/oauth2
+[oauth2]: https://developers.google.com/accounts/docs/OAuth2
+[javadoc-oauth2]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/auth/oauth2/package-frame.html
+[javadoc-appengine-oauth2]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/package-frame.html
+[console]: https://console.developers.google.com/
+[console-help]: https://developer.google.com/console/help/console/      
+[identity-api]: https://cloud.google.com/appengine/docs/java/appidentity/?csw=1#Asserting_Identity_to_Google_APIs
+[app-identity-credential]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.html
+[auth-code-flow-set-access-type]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.Builder.html#setAccessType-java.lang.String-
+[data-store-factory]: https://googleapis.dev/java/google-http-client/latest/com/google/api/client/util/store/DataStoreFactory.html
+[stored-credential]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/StoredCredential.html
+[appengine-data-store-factory]: https://googleapis.dev/java/google-http-client/latest/com/google/api/client/extensions/appengine/datastore/AppEngineDataStoreFactory.html
+[google-http-client]: https://github.com/googleapis/google-http-java-client
+[memory-data-store-factory]: https://googleapis.dev/java/google-http-client/latest/com/google/api/client/util/store/MemoryDataStoreFactory.html
+[file-data-store-factory]: https://googleapis.dev/java/google-http-client/latest/com/google/api/client/util/store/FileDataStoreFactory.html
+[appengine-credential-store]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/extensions/appengine/auth/oauth2/AppEngineCredentialStore.html
+[appengine-migrate]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/extensions/appengine/auth/oauth2/AppEngineCredentialStore.html#migrateTo-com.google.api.client.extensions.appengine.datastore.AppEngineDataStoreFactory-
+[datastore-migrate]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/extensions/appengine/auth/oauth2/AppEngineCredentialStore.html#migrateTo-com.google.api.client.util.store.DataStore-
+[datastore-credential-listener]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/DataStoreCredentialRefreshListener.html
+[add-refresh-listener]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.Builder.html#addRefreshListener-com.google.api.client.auth.oauth2.CredentialRefreshListener-
+[authorization-code-grant]: https://tools.ietf.org/html/rfc6749#section-4.1
+[authorization-code-flow]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/AuthorizationCodeFlow.html
+[auth-code-flow-load]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/AuthorizationCodeFlow.html#loadCredential-java.lang.String-
+[auth-code-flow-new]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/AuthorizationCodeFlow.html#newAuthorizationUrl--
+[token-request]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/AuthorizationCodeFlow.html#newTokenRequest-java.lang.String-
+[create-and-store]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/AuthorizationCodeFlow.html#createAndStoreCredential-com.google.api.client.auth.oauth2.TokenResponse-java.lang.String-
+[datastore-get]: https://googleapis.dev/java/google-http-client/latest/com/google/api/client/util/store/DataStore.html#get-java.lang.String-
+[auth-code-request-url]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/AuthorizationCodeRequestUrl.html
+[auth-code-response-url]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/AuthorizationCodeResponseUrl.html
+[auth-code-token-request]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/AuthorizationCodeTokenRequest.html
+[datastore-set]: https://googleapis.dev/java/google-http-client/latest/com/google/api/client/util/store/DataStore.html#set(java.lang.String,%20V)
+[credential]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/auth/oauth2/Credential.html
+[oauth2-web-server]: https://developers.google.com/accounts/docs/OAuth2WebServer
+[abstract-code-servlet]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/extensions/servlet/auth/oauth2/AbstractAuthorizationCodeServlet.html
+[abstract-code-callback-servlet]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/extensions/servlet/auth/oauth2/AbstractAuthorizationCodeCallbackServlet.html
+[users-api]: https://cloud.google.com/appengine/docs/java/users/
+[security-authentication]: https://cloud.google.com/appengine/docs/java/config/webxml#Security_and_Authentication
+[abstract-gae-code-servlet]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/extensions/appengine/auth/oauth2/AbstractAppEngineAuthorizationCodeServlet.html
+[abstract-gae-code-callback-servlet]: https://googleapis.dev/java/google-oauth-client/latest/com/google/api/client/extensions/appengine/auth/oauth2/AbstractAppEngineAuthorizationCodeCallbackServlet.html
+[calendar-sample]: https://github.com/google/google-api-java-client-samples/tree/master/calendar-appengine-sample
+[storage-sample]: https://github.com/GoogleCloudPlatform/cloud-storage-docs-xml-api-examples
+[service-accounts]: https://developers.google.com/accounts/docs/OAuth2ServiceAccount
+[plus-sample]: https://github.com/google/google-api-java-client-samples/tree/master/plus-serviceaccount-cmdline-sample
+[set-service-account-user]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.Builder.html#setServiceAccountUser-java.lang.String-
+[oauth2-installed-app]: https://developers.google.com/accounts/docs/OAuth2InstalledApp
+[oauth2-user-agent]: https://developers.google.com/accounts/docs/OAuth2UserAgent
+[browser-client-request]: https://googleapis.dev/java/google-api-client/latest/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.html
+[javascript-client]: https://developers.google.com/api-client-library/javascript/
+[play-services]: https://developer.android.com/google/play-services/index.html
+[account-manager]: http://developer.android.com/reference/android/accounts/AccountManager.html
+[tasks-sample]: https://github.com/google/google-api-java-client-samples/tree/master/tasks-android-sample
\ No newline at end of file
diff --git a/docs/setup.md b/docs/setup.md
new file mode 100644
index 000000000..d62852330
--- /dev/null
+++ b/docs/setup.md
@@ -0,0 +1,79 @@
+---
+title: Setup Instructions
+---
+
+# Setup Instructions
+
+You can download the Google API Client Library for Java and its dependencies in 
+a zip file, or you can use a dependency manager such as Maven or gradle to
+install the necessary jars from the Maven Central repository.
+
+## Maven
+
+The Google API Client Library for Java is in the central Maven repository. The
+Maven `groupId` for all artifacts for this library is `com.google.api-client`.
+
+To ensure all dependency versions work together and to avoid having to manually
+choose and specify versions for each dependency, we recommend first importing
+the `com.google.cloud:libraries-bom` in the `dependencyManagement` section of
+your `pom.xml`:
+
+```xml
+<dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.cloud</groupId>
+      <artifactId>libraries-bom</artifactId>
+      <version>2.2.0</version>
+      <type>pom</type>
+      <scope>import</scope>
+    </dependency>
+ </dependencies>
+</dependencyManagement>
+```
+
+Then you add the individual dependencies you need without version numbers to the
+dependencies section:
+
+```xml
+<dependency>
+  <groupId>com.google.api-client</groupId>
+  <artifactId>google-api-client</artifactId>
+</dependency>
+```
+
+On Android, you may need to explicitly exclude unused dependencies:
+
+```xml
+<dependency>
+  <groupId>com.google.api-client</groupId>
+  <artifactId>google-api-client</artifactId>
+  <exclusions>
+    <exclusion>
+      <artifactId>xpp3</artifactId>
+      <groupId>xpp3</groupId>
+    </exclusion>
+    <exclusion>
+      <artifactId>httpclient</artifactId>
+      <groupId>org.apache.httpcomponents</groupId>
+    </exclusion>
+    <exclusion>
+      <artifactId>junit</artifactId>
+      <groupId>junit</groupId>
+    </exclusion>
+    <exclusion>
+      <artifactId>android</artifactId>
+      <groupId>com.google.android</groupId>
+    </exclusion>
+  </exclusions>
+</dependency>
+```
+
+## Download the library with dependencies
+
+Download the latest assembly zip file from Maven Central and extract it on your
+computer. This zip contains the client library class jar files and the
+associated source jar files for each artifact and their dependencies. You can
+find dependency graphs and licenses for the different libraries in the
+dependencies folder. For more details about the contents of the download,
+see the contained `readme.html` file.
diff --git a/docs/support.md b/docs/support.md
new file mode 100644
index 000000000..e2806b871
--- /dev/null
+++ b/docs/support.md
@@ -0,0 +1,67 @@
+---
+title: Support
+---
+
+# Support
+
+## The Google API Client Library for Java community
+
+### Ask development questions
+
+Ask questions on StackOverflow:
+
+* When you ask questions about the Google API Client Library for Java, use the
+  [google-api-java-client][so-google-api-client] tag. Before you post a new
+  question, review the [most asked questions][so-maq].
+* For questions about Google APIs, use the [google-api][so-google-api] tag.
+* Optionally include a tag to specify the language or platform, for example
+  [java][so-java], [android][so-android], or [google-app-engine][so-java-gae].
+* For tips on asking StackOverflow questions, see [How to Ask][so-how-to-ask].
+
+<aside class="note"><strong>Note:</strong> Please do not email the project
+contributors directly.</aside>
+
+### File feature requests and defects
+
+You can suggest features and report issues on our public [Issue Tracker][issues].
+This is a great place for the community to discuss and track implementations of
+features or resolution of bug fixes, as well as share workarounds and patches.
+
+If you find a bug:
+
+* View [known bugs][bugs], and if a known bug corresponds to the issue you are
+  seeing, "star" it or comment on it.
+* If the issue you are seeing has not yet been reported,
+  [file a bug report][new-issue].
+
+If you have a feature request:
+
+* View [existing feature requests][feature-requests], and if a requested feature
+  corresponds to a feature you would like, "star" it or comment on it .
+* If the feature has not yet been requested, 
+  [file a feature request][new-issue].
+
+### Contribute
+
+This is an [open-source][api-client] library, and [contributions][contributions]
+are welcome.
+
+### Keep up with the library
+
+You can also take a look at the [release notes][releases].
+
+[so-google-api-client]: http://stackoverflow.com/questions/tagged/google-api-java-client
+[so-maq]: http://stackoverflow.com/questions/tagged/google-api-java-client?sort=faq&amp;pagesize=50
+[so-google-api]: http://stackoverflow.com/questions/tagged/google-api
+[so-java]: http://stackoverflow.com/questions/tagged/google-api-java-client+java
+[so-android]: http://stackoverflow.com/questions/tagged/google-api-java-client+android
+[so-java-gae]: http://stackoverflow.com/questions/tagged/google-api-java-client+java+google-app-engine
+[so-how-to-ask]: http://stackoverflow.com/questions/ask
+[issues]: https://github.com/googleapis/google-api-java-client/issues
+[bugs]: https://github.com/googleapis/google-api-java-client/issues?q=is%3Aissue+is%3Aopen+label%3A%22type%3A+bug%22
+[feature-requests]: https://github.com/googleapis/google-api-java-client/issues?q=is%3Aissue+is%3Aopen+label%3A%22type%3A+feature+request%22
+[new-issue]: https://github.com/google/google-api-java-client/issues/new
+[api-client]: https://github.com/googleapis/google-api-java-client
+[contributions]: https://github.com/googleapis/google-api-java-client/blob/master/CONTRIBUTING.md
+[releases]: https://github.com/googleapis/google-api-java-client/releases
+
diff --git a/findbugs-exclude.xml b/findbugs-exclude.xml
index 779eef93d..fb145e8f9 100644
--- a/findbugs-exclude.xml
+++ b/findbugs-exclude.xml
@@ -6,23 +6,18 @@
   <LastVersion value="-1" relOp="NEQ"/>
   <!-- The following have not yet been investigated -->
 
-  <!-- The following are known to be bugs and should be fixed -->
-  <And>
-    <Package name="com.google.api.client.googleapis.auth.clientlogin"/>
-  </And>
-
   <!-- The following are known to NOT be bugs and should not be fixed -->
   <And>
-    <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/> 
-    <!-- Class doesn't override equals in superclass -->   
+    <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/>
+    <!-- Class doesn't override equals in superclass -->
     <Class name="com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeRequestUrl"/>
   </And>
   <And>
-    <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/>    
+    <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/>
     <Class name="com.google.api.client.googleapis.auth.oauth2.GoogleBrowserClientRequestUrl"/>
   </And>
   <And>
-    <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/>    
+    <Bug pattern="EQ_DOESNT_OVERRIDE_EQUALS"/>
     <Class name="com.google.api.client.googleapis.GoogleUrl"/>
   </And>
   <And>
@@ -88,26 +83,26 @@
   <And>
     <Bug pattern="DM_STRING_CTOR"/>
     <!-- Method invokes inefficient new String(String) constructor -->
-    <Class name="com.google.api.client.googleapis.batch.BatchRequest"/>    
-  </And>  
+    <Class name="com.google.api.client.googleapis.batch.BatchRequest"/>
+  </And>
   <And>
     <Bug pattern="DM_STRING_CTOR"/>
     <!-- Method invokes inefficient new String(String) constructor -->
-    <Class name="com.google.api.client.googleapis.services.AbstractGoogleClient"/>    
-  </And>  
+    <Class name="com.google.api.client.googleapis.services.AbstractGoogleClient"/>
+  </And>
   <And>
     <Bug pattern="DM_STRING_CTOR"/>
     <!-- Method invokes inefficient new String(String) constructor -->
-    <Class name="com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential"/>    
-  </And>  
+    <Class name="com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential"/>
+  </And>
   <And>
     <Bug pattern="DM_STRING_CTOR"/>
     <!-- Method invokes inefficient new String(String) constructor -->
-    <Class name="com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential$RequestHandler"/>    
-  </And>  
+    <Class name="com.google.api.client.googleapis.extensions.android.gms.auth.GoogleAccountCredential$RequestHandler"/>
+  </And>
   <And>
     <Bug pattern="DM_STRING_CTOR"/>
     <!-- Method invokes inefficient new String(String) constructor -->
-    <Class name="com.google.api.client.googleapis.xml.atom.MultiKindFeedParser"/>    
-  </And>  
+    <Class name="com.google.api.client.googleapis.xml.atom.MultiKindFeedParser"/>
+  </And>
 </FindBugsFilter>
diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml
index 55c49abe6..b1eb186ad 100644
--- a/google-api-client-android/pom.xml
+++ b/google-api-client-android/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.25.0-SNAPSHOT</version>
+    <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-android</artifactId>
@@ -16,7 +16,7 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
+            <link>http://download.oracle.com/javase/7/docs/api/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
@@ -43,13 +43,9 @@
       <version>4.1.1.4</version>
       <scope>provided</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.api-client</groupId>
-      <artifactId>google-api-client</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-android</artifactId>
+      <artifactId>google-http-client</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.android.google-play-services</groupId>
diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/GoogleAccountManager.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/GoogleAccountManager.java
index 04275f996..3c7cd127e 100644
--- a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/GoogleAccountManager.java
+++ b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/GoogleAccountManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -21,7 +21,7 @@
 import com.google.api.client.util.Preconditions;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Account manager wrapper for Google accounts.
  *
  * @since 1.11
@@ -36,16 +36,12 @@ public final class GoogleAccountManager {
   /** Account manager. */
   private final AccountManager manager;
 
-  /**
-   * @param accountManager account manager
-   */
+  /** @param accountManager account manager */
   public GoogleAccountManager(AccountManager accountManager) {
     this.manager = Preconditions.checkNotNull(accountManager);
   }
 
-  /**
-   * @param context context from which to retrieve the account manager
-   */
+  /** @param context context from which to retrieve the account manager */
   public GoogleAccountManager(Context context) {
     this(AccountManager.get(context));
   }
diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/package-info.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/package-info.java
index 71655b40c..853d1004e 100644
--- a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/package-info.java
+++ b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/accounts/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -13,7 +13,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Utilities for Account Manager for Google accounts on Android Eclair (SDK 2.1) and later.
  *
  * @since 1.11
@@ -21,4 +21,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.extensions.android.accounts;
-
diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAccountCredential.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAccountCredential.java
index 7a413eb13..647cc773d 100644
--- a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAccountCredential.java
+++ b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAccountCredential.java
@@ -37,25 +37,22 @@
 import java.util.Collection;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Manages authorization and account selection for Google accounts.
  *
- * <p>
- * When fetching a token, any thrown {@link GoogleAuthException} would be wrapped:
+ * <p>When fetching a token, any thrown {@link GoogleAuthException} would be wrapped:
+ *
  * <ul>
- * <li>{@link GooglePlayServicesAvailabilityException} would be wrapped inside of
- * {@link GooglePlayServicesAvailabilityIOException}</li>
- * <li>{@link UserRecoverableAuthException} would be wrapped inside of
- * {@link UserRecoverableAuthIOException}</li>
- * <li>{@link GoogleAuthException} when be wrapped inside of {@link GoogleAuthIOException}</li>
+ *   <li>{@link GooglePlayServicesAvailabilityException} would be wrapped inside of {@link
+ *       GooglePlayServicesAvailabilityIOException}
+ *   <li>{@link UserRecoverableAuthException} would be wrapped inside of {@link
+ *       UserRecoverableAuthIOException}
+ *   <li>{@link GoogleAuthException} when be wrapped inside of {@link GoogleAuthIOException}
  * </ul>
- * </p>
  *
- * <p>
- * Upgrade warning: in prior version 1.14 exponential back-off was enabled by default when I/O
+ * <p>Upgrade warning: in prior version 1.14 exponential back-off was enabled by default when I/O
  * exception was thrown inside {@link #getToken}, but starting with version 1.15 you need to call
  * {@link #setBackOff} with {@link ExponentialBackOff} to enable it.
- * </p>
  *
  * @since 1.12
  * @author Yaniv Inbar
@@ -106,7 +103,6 @@ public GoogleAccountCredential(Context context, String scope) {
    * @param context context
    * @param scopes non empty OAuth 2.0 scope list
    * @return new instance
-   *
    * @since 1.15
    */
   public static GoogleAccountCredential usingOAuth2(Context context, Collection<String> scopes) {
@@ -128,8 +124,8 @@ public static GoogleAccountCredential usingAudience(Context context, String audi
   }
 
   /**
-   * Sets the selected Google account name (e-mail address) -- for example
-   * {@code "johndoe@gmail.com"} -- or {@code null} for none.
+   * Sets the selected Google account name (e-mail address) -- for example {@code
+   * "johndoe@gmail.com"} -- or {@code null} for none.
    */
   public final GoogleAccountCredential setSelectedAccountName(String accountName) {
     selectedAccount = accountManager.getAccountByName(accountName);
@@ -141,9 +137,7 @@ public final GoogleAccountCredential setSelectedAccountName(String accountName)
   /**
    * Sets the selected Google {@link Account} or {@code null} for none.
    *
-   * <p>
-   * Caller must ensure the given Google account exists.
-   * </p>
+   * <p>Caller must ensure the given Google account exists.
    */
   public final GoogleAccountCredential setSelectedAccount(Account selectedAccount) {
     this.selectedAccount = selectedAccount;
@@ -184,8 +178,8 @@ public final Account getSelectedAccount() {
   }
 
   /**
-   * Returns the back-off policy which is used when an I/O exception is thrown inside
-   * {@link #getToken} or {@code null} for none.
+   * Returns the back-off policy which is used when an I/O exception is thrown inside {@link
+   * #getToken} or {@code null} for none.
    *
    * @since 1.15
    */
@@ -224,8 +218,8 @@ public final GoogleAccountCredential setSleeper(Sleeper sleeper) {
   }
 
   /**
-   * Returns the selected Google account name (e-mail address), for example
-   * {@code "johndoe@gmail.com"}, or {@code null} for none.
+   * Returns the selected Google account name (e-mail address), for example {@code
+   * "johndoe@gmail.com"}, or {@code null} for none.
    */
   public final String getSelectedAccountName() {
     return accountName;
@@ -235,12 +229,11 @@ public final String getSelectedAccountName() {
    * Returns an intent to show the user to select a Google account, or create a new one if there are
    * none on the device yet.
    *
-   * <p>
-   * Must be run from the main UI thread.
-   * </p>
+   * <p>Must be run from the main UI thread.
    */
   public final Intent newChooseAccountIntent() {
-    return AccountPicker.newChooseAccountIntent(selectedAccount,
+    return AccountPicker.newChooseAccountIntent(
+        selectedAccount,
         null,
         new String[] {GoogleAccountManager.ACCOUNT_TYPE},
         true,
@@ -253,9 +246,7 @@ public final Intent newChooseAccountIntent() {
   /**
    * Returns an OAuth 2.0 access token.
    *
-   * <p>
-   * Must be run from a background thread, not the main UI thread.
-   * </p>
+   * <p>Must be run from a background thread, not the main UI thread.
    */
   public String getToken() throws IOException, GoogleAuthException {
     if (backOff != null) {
@@ -278,12 +269,12 @@ public String getToken() throws IOException, GoogleAuthException {
     }
   }
 
-
   @Beta
   class RequestHandler implements HttpExecuteInterceptor, HttpUnsuccessfulResponseHandler {
 
     /** Whether we've received a 401 error code indicating the token is invalid. */
     boolean received401;
+
     String token;
 
     @Override
@@ -301,12 +292,16 @@ public void intercept(HttpRequest request) throws IOException {
     }
 
     @Override
-    public boolean handleResponse(
-        HttpRequest request, HttpResponse response, boolean supportsRetry) {
-      if (response.getStatusCode() == 401 && !received401) {
-        received401 = true;
-        GoogleAuthUtil.invalidateToken(context, token);
-        return true;
+    public boolean handleResponse(HttpRequest request, HttpResponse response, boolean supportsRetry)
+        throws IOException {
+      try {
+        if (response.getStatusCode() == 401 && !received401) {
+          received401 = true;
+          GoogleAuthUtil.clearToken(context, token);
+          return true;
+        }
+      } catch (GoogleAuthException e) {
+        throw new GoogleAuthIOException(e);
       }
       return false;
     }
diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAuthIOException.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAuthIOException.java
index ba1c010cb..5eccef1ce 100644
--- a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAuthIOException.java
+++ b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GoogleAuthIOException.java
@@ -15,16 +15,13 @@
 import com.google.android.gms.auth.GoogleAuthException;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Wraps a {@link GoogleAuthException} into an {@link IOException} so it can be caught directly.
  *
- * <p>
- * Use {@link #getCause()} to get the wrapped {@link GoogleAuthException}.
- * </p>
+ * <p>Use {@link #getCause()} to get the wrapped {@link GoogleAuthException}.
  *
  * @since 1.12
  * @author Yaniv Inbar
diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GooglePlayServicesAvailabilityIOException.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GooglePlayServicesAvailabilityIOException.java
index 19194cf10..f06de0b27 100644
--- a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GooglePlayServicesAvailabilityIOException.java
+++ b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/GooglePlayServicesAvailabilityIOException.java
@@ -19,27 +19,24 @@
 import java.io.IOException;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Wraps a {@link GooglePlayServicesAvailabilityException} into an {@link IOException} so it can be
  * caught directly.
  *
- * <p>
- * Use {@link #getConnectionStatusCode()} to display the error dialog. Alternatively, use
- * {@link #getCause()} to get the wrapped {@link GooglePlayServicesAvailabilityException}. Example
- * usage:
- * </p>
+ * <p>Use {@link #getConnectionStatusCode()} to display the error dialog. Alternatively, use {@link
+ * #getCause()} to get the wrapped {@link GooglePlayServicesAvailabilityException}. Example usage:
  *
  * <pre>
-    } catch (final GooglePlayServicesAvailabilityIOException availabilityException) {
-      myActivity.runOnUiThread(new Runnable() {
-        public void run() {
-          Dialog dialog = GooglePlayServicesUtil.getErrorDialog(
-              availabilityException.getConnectionStatusCode(),
-              myActivity,
-              MyActivity.REQUEST_GOOGLE_PLAY_SERVICES);
-          dialog.show();
-        }
-      });
+ * } catch (final GooglePlayServicesAvailabilityIOException availabilityException) {
+ * myActivity.runOnUiThread(new Runnable() {
+ * public void run() {
+ * Dialog dialog = GooglePlayServicesUtil.getErrorDialog(
+ * availabilityException.getConnectionStatusCode(),
+ * myActivity,
+ * MyActivity.REQUEST_GOOGLE_PLAY_SERVICES);
+ * dialog.show();
+ * }
+ * });
  * </pre>
  *
  * @since 1.12
@@ -50,9 +47,7 @@ public class GooglePlayServicesAvailabilityIOException extends UserRecoverableAu
 
   private static final long serialVersionUID = 1L;
 
-  /**
-   * @since 1.21.0
-   */
+  /** @since 1.21.0 */
   public GooglePlayServicesAvailabilityIOException(
       GooglePlayServicesAvailabilityException wrapped) {
     super(wrapped);
@@ -64,8 +59,8 @@ public GooglePlayServicesAvailabilityException getCause() {
   }
 
   /**
-   * Returns the error code to use with
-   * {@link GooglePlayServicesUtil#getErrorDialog(int, Activity, int)}.
+   * Returns the error code to use with {@link GooglePlayServicesUtil#getErrorDialog(int, Activity,
+   * int)}.
    */
   public final int getConnectionStatusCode() {
     return getCause().getConnectionStatusCode();
diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/UserRecoverableAuthIOException.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/UserRecoverableAuthIOException.java
index 4f302ffe9..280d80f79 100644
--- a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/UserRecoverableAuthIOException.java
+++ b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/UserRecoverableAuthIOException.java
@@ -19,20 +19,18 @@
 import java.io.IOException;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Wraps a {@link UserRecoverableAuthException} into an {@link IOException} so it can be caught
  * directly.
  *
- * <p>
- * Use {@link #getIntent()} to allow user interaction to recover. Alternatively, use
- * {@link #getCause()} to get the wrapped {@link UserRecoverableAuthException}. Example usage:
- * </p>
+ * <p>Use {@link #getIntent()} to allow user interaction to recover. Alternatively, use {@link
+ * #getCause()} to get the wrapped {@link UserRecoverableAuthException}. Example usage:
  *
  * <pre>
-    } catch (UserRecoverableAuthIOException userRecoverableException) {
-      myActivity.startActivityForResult(
-          userRecoverableException.getIntent(), MyActivity.REQUEST_AUTHORIZATION);
-    }
+ * } catch (UserRecoverableAuthIOException userRecoverableException) {
+ * myActivity.startActivityForResult(
+ * userRecoverableException.getIntent(), MyActivity.REQUEST_AUTHORIZATION);
+ * }
  * </pre>
  *
  * @since 1.12
@@ -43,9 +41,7 @@ public class UserRecoverableAuthIOException extends GoogleAuthIOException {
 
   private static final long serialVersionUID = 1L;
 
-  /**
-   * @since 1.21.0
-   */
+  /** @since 1.21.0 */
   public UserRecoverableAuthIOException(UserRecoverableAuthException wrapped) {
     super(wrapped);
   }
@@ -56,8 +52,8 @@ public UserRecoverableAuthException getCause() {
   }
 
   /**
-   * Returns the {@link Intent} that when supplied to
-   * {@link Activity#startActivityForResult(Intent, int)} will allow user intervention.
+   * Returns the {@link Intent} that when supplied to {@link Activity#startActivityForResult(Intent,
+   * int)} will allow user intervention.
    */
   public final Intent getIntent() {
     return getCause().getIntent();
diff --git a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/package-info.java b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/package-info.java
index 5ad2c1838..c5ec537e1 100644
--- a/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/package-info.java
+++ b/google-api-client-android/src/main/java/com/google/api/client/googleapis/extensions/android/gms/auth/package-info.java
@@ -11,7 +11,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Utilities based on <a href="https://developers.google.com/android/google-play-services/">Google
  * Play services</a>.
  *
@@ -20,4 +20,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.extensions.android.gms.auth;
-
diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml
index af155dbe9..5855aa308 100644
--- a/google-api-client-appengine/pom.xml
+++ b/google-api-client-appengine/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.25.0-SNAPSHOT</version>
+    <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-appengine</artifactId>
@@ -15,10 +15,10 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
-            <link>http://code.google.com/appengine/docs/java/javadoc</link>
-            <link>http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version}</link>
-            <link>http://javadoc.google-oauth-java-client.googlecode.com/hg/${project.oauth.version}</link>
+            <link>http://download.oracle.com/javase/7/docs/api/</link>
+            <link>https://cloud.google.com/appengine/docs/standard/java/javadoc/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+            <link>https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
@@ -28,20 +28,36 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>google.api.client.appengine</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.4</version>
         <executions>
           <execution>
-            <id>jar</id>
-            <phase>compile</phase>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
             <goals>
-              <goal>jar</goal>
+              <goal>manifest</goal>
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <instructions>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
+            <Bundle-Description>App Engine extensions to the Google APIs Client Library for Java</Bundle-Description>
+            <Bundle-SymbolicName>com.google.api.client.appengine</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
@@ -55,30 +71,14 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.datanucleus</groupId>
-        <artifactId>maven-datanucleus-plugin</artifactId>
-        <version>2.2.1</version>
-        <configuration>
-          <verbose>true</verbose>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>enhance</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
-      <!--App Engine uses Java 6 and above-->
+      <!--App Engine uses Java 7 and above-->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java16</artifactId>
+            <artifactId>java17</artifactId>
             <version>1.0</version>
           </signature>
         </configuration>
@@ -91,9 +91,22 @@
       <artifactId>appengine-api-1.0-sdk</artifactId>
       <scope>provided</scope>
     </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client-gson</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.oauth-client</groupId>
-      <artifactId>google-oauth-client-appengine</artifactId>
+      <artifactId>google-oauth-client</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>
@@ -113,30 +126,5 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>com.google.appengine</groupId>
-      <artifactId>appengine-testing</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.appengine</groupId>
-      <artifactId>appengine-api-labs</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.appengine</groupId>
-      <artifactId>appengine-api-stubs</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-jackson2</artifactId>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java
index d52846ff9..cf2772af7 100644
--- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java
+++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredential.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -27,7 +27,6 @@
 import com.google.appengine.api.appidentity.AppIdentityService;
 import com.google.appengine.api.appidentity.AppIdentityService.GetAccessTokenResult;
 import com.google.appengine.api.appidentity.AppIdentityServiceFactory;
-
 import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
@@ -37,26 +36,20 @@
  * owns, based on <a href="https://developers.google.com/appengine/docs/java/appidentity/
  * #Java_Asserting_identity_to_Google_APIs">Asserting Identity to Google APIs</a>
  *
- * <p>
- * Intercepts the request by using the access token obtained from
- * {@link AppIdentityService#getAccessToken(Iterable)}.
- * </p>
+ * <p>Intercepts the request by using the access token obtained from {@link
+ * AppIdentityService#getAccessToken(Iterable)}.
  *
- * <p>
- * Sample usage:
- * </p>
+ * <p>Sample usage:
  *
  * <pre>
-  public static HttpRequestFactory createRequestFactory(
-      HttpTransport transport, JsonFactory jsonFactory, TokenResponse tokenResponse) {
-    return transport.createRequestFactory(
-        new AppIdentityCredential("https://www.googleapis.com/auth/urlshortener"));
-  }
+ * public static HttpRequestFactory createRequestFactory(
+ * HttpTransport transport, JsonFactory jsonFactory, TokenResponse tokenResponse) {
+ * return transport.createRequestFactory(
+ * new AppIdentityCredential("https://www.googleapis.com/auth/urlshortener"));
+ * }
  * </pre>
  *
- * <p>
- * Implementation is immutable and thread-safe.
- * </p>
+ * <p>Implementation is immutable and thread-safe.
  *
  * @since 1.7
  * @author Yaniv Inbar
@@ -79,14 +72,15 @@ public AppIdentityCredential(Collection<String> scopes) {
 
   /**
    * @param builder builder
-   *
    * @since 1.14
    */
   protected AppIdentityCredential(Builder builder) {
     // Lazily retrieved rather than setting as the default value in order to not add runtime
     // dependencies on AppIdentityServiceFactory unless it is actually being used.
-    appIdentityService = builder.appIdentityService == null
-        ? AppIdentityServiceFactory.getAppIdentityService() : builder.appIdentityService;
+    appIdentityService =
+        builder.appIdentityService == null
+            ? AppIdentityServiceFactory.getAppIdentityService()
+            : builder.appIdentityService;
     scopes = builder.scopes;
   }
 
@@ -122,17 +116,15 @@ public final Collection<String> getScopes() {
   /**
    * Builder for {@link AppIdentityCredential}.
    *
-   * <p>
-   * Implementation is not thread-safe.
-   * </p>
+   * <p>Implementation is not thread-safe.
    *
    * @since 1.12
    */
   public static class Builder {
 
     /**
-     * App Identity Service that provides the access token or {@code null} to use
-     * {@link AppIdentityServiceFactory#getAppIdentityService()}.
+     * App Identity Service that provides the access token or {@code null} to use {@link
+     * AppIdentityServiceFactory#getAppIdentityService()}.
      */
     AppIdentityService appIdentityService;
 
@@ -150,8 +142,8 @@ public Builder(Collection<String> scopes) {
     }
 
     /**
-     * Returns the App Identity Service that provides the access token or {@code null} to use
-     * {@link AppIdentityServiceFactory#getAppIdentityService()}.
+     * Returns the App Identity Service that provides the access token or {@code null} to use {@link
+     * AppIdentityServiceFactory#getAppIdentityService()}.
      *
      * @since 1.14
      */
@@ -160,22 +152,18 @@ public final AppIdentityService getAppIdentityService() {
     }
 
     /**
-     * Sets the App Identity Service that provides the access token or {@code null} to use
-     * {@link AppIdentityServiceFactory#getAppIdentityService()}.
+     * Sets the App Identity Service that provides the access token or {@code null} to use {@link
+     * AppIdentityServiceFactory#getAppIdentityService()}.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setAppIdentityService(AppIdentityService appIdentityService) {
       this.appIdentityService = appIdentityService;
       return this;
     }
 
-    /**
-     * Returns a new {@link AppIdentityCredential}.
-     */
+    /** Returns a new {@link AppIdentityCredential}. */
     public AppIdentityCredential build() {
       return new AppIdentityCredential(this);
     }
@@ -191,7 +179,7 @@ public final Collection<String> getScopes() {
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Credential wrapper for application identity that inherits from GoogleCredential.
    */
   @Beta
@@ -205,25 +193,26 @@ public static class AppEngineCredentialWrapper extends GoogleCredential {
      *
      * @param transport the transport for Http calls.
      * @param jsonFactory the factory for Json parsing and formatting.
-     * @throws IOException if the credential cannot be created for the current environment,
-     *                     such as when the AppIndentityService is not available.
+     * @throws IOException if the credential cannot be created for the current environment, such as
+     *     when the AppIndentityService is not available.
      */
     public AppEngineCredentialWrapper(HttpTransport transport, JsonFactory jsonFactory)
         throws IOException {
       // May be called via reflection to test whether running on App Engine, so fail even if
       // the type can be loaded but the service is not available.
-      this(getCheckedAppIdentityCredential(), Preconditions.checkNotNull(transport),
+      this(
+          getCheckedAppIdentityCredential(),
+          Preconditions.checkNotNull(transport),
           Preconditions.checkNotNull(jsonFactory));
     }
 
     AppEngineCredentialWrapper(
-        AppIdentityCredential appIdentity,
-        HttpTransport transport,
-        JsonFactory jsonFactory) {
-      super(new GoogleCredential.Builder()
-          .setRequestInitializer(appIdentity)
-          .setTransport(transport)
-          .setJsonFactory(jsonFactory));
+        AppIdentityCredential appIdentity, HttpTransport transport, JsonFactory jsonFactory) {
+      super(
+          new GoogleCredential.Builder()
+              .setRequestInitializer(appIdentity)
+              .setTransport(transport)
+              .setJsonFactory(jsonFactory));
       this.appIdentity = appIdentity;
       Collection<String> scopes = appIdentity.getScopes();
       scopesRequired = (scopes == null || scopes.isEmpty());
@@ -260,8 +249,8 @@ public GoogleCredential createScoped(Collection<String> scopes) {
 
     @Override
     protected TokenResponse executeRefreshToken() throws IOException {
-      GetAccessTokenResult tokenResult = appIdentity.getAppIdentityService()
-          .getAccessToken(appIdentity.getScopes());
+      GetAccessTokenResult tokenResult =
+          appIdentity.getAppIdentityService().getAccessToken(appIdentity.getScopes());
       TokenResponse response = new TokenResponse();
       response.setAccessToken(tokenResult.getAccessToken());
       long expiresInSeconds =
diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/package-info.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/package-info.java
index d63ca8d29..188dcee8c 100644
--- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/package-info.java
+++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -18,6 +18,4 @@
  * @since 1.7
  * @author Yaniv Inbar
  */
-
 package com.google.api.client.googleapis.extensions.appengine.auth.oauth2;
-
diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java
index 68e0da6f8..22324aa86 100644
--- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java
+++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/AppEngineNotificationServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -18,41 +18,34 @@
 import com.google.api.client.googleapis.extensions.servlet.notifications.WebhookUtils;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.store.DataStoreFactory;
-
 import java.io.IOException;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Thread-safe Webhook App Engine Servlet to receive notifications.
  *
- * <p>
- * In order to use this servlet you need to register the servlet in your web.xml. You may optionally
- * extend {@link AppEngineNotificationServlet} with custom behavior.
- * </p>
- *
- * <p>
- * It is a simple wrapper around {@link WebhookUtils#processWebhookNotification(HttpServletRequest,
- * HttpServletResponse, DataStoreFactory)} that uses
- * {@link AppEngineDataStoreFactory#getDefaultInstance()}, so you may alternatively call that method
- * instead from your {@link HttpServlet#doPost} with no loss of functionality.
- * </p>
+ * <p>In order to use this servlet you need to register the servlet in your web.xml. You may
+ * optionally extend {@link AppEngineNotificationServlet} with custom behavior.
  *
- * <b>Sample web.xml setup:</b>
+ * <p>It is a simple wrapper around {@link
+ * WebhookUtils#processWebhookNotification(HttpServletRequest, HttpServletResponse,
+ * DataStoreFactory)} that uses {@link AppEngineDataStoreFactory#getDefaultInstance()}, so you may
+ * alternatively call that method instead from your {@link HttpServlet#doPost} with no loss of
+ * functionality. <b>Sample web.xml setup:</b>
  *
  * <pre>
-  {@literal <}servlet{@literal >}
-      {@literal <}servlet-name{@literal >}AppEngineNotificationServlet{@literal <}/servlet-name{@literal >}
-      {@literal <}servlet-class{@literal >}com.google.api.client.googleapis.extensions.appengine.notifications.AppEngineNotificationServlet{@literal <}/servlet-class{@literal >}
-  {@literal <}/servlet{@literal >}
-  {@literal <}servlet-mapping{@literal >}
-      {@literal <}servlet-name{@literal >}AppEngineNotificationServlet{@literal <}/servlet-name{@literal >}
-      {@literal <}url-pattern{@literal >}/notifications{@literal <}/url-pattern{@literal >}
-  {@literal <}/servlet-mapping{@literal >}
+ * {@literal <}servlet{@literal >}
+ * {@literal <}servlet-name{@literal >}AppEngineNotificationServlet{@literal <}/servlet-name{@literal >}
+ * {@literal <}servlet-class{@literal >}com.google.api.client.googleapis.extensions.appengine.notifications.AppEngineNotificationServlet{@literal <}/servlet-class{@literal >}
+ * {@literal <}/servlet{@literal >}
+ * {@literal <}servlet-mapping{@literal >}
+ * {@literal <}servlet-name{@literal >}AppEngineNotificationServlet{@literal <}/servlet-name{@literal >}
+ * {@literal <}url-pattern{@literal >}/notifications{@literal <}/url-pattern{@literal >}
+ * {@literal <}/servlet-mapping{@literal >}
  * </pre>
  *
  * @author Yaniv Inbar
diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/package-info.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/package-info.java
index bc0e761ea..be058092c 100644
--- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/package-info.java
+++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/notifications/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,7 +13,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Support for subscribing to topics and receiving notifications on servlet-based platforms.
  *
  * @since 1.16
@@ -21,4 +21,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.extensions.appengine.notifications;
-
diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java
index bfb3001fc..eb7538ff9 100644
--- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java
+++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/MockAppIdentityService.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Google Inc.
+ * Copyright 2014 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
@@ -18,12 +18,11 @@
 import com.google.appengine.api.appidentity.AppIdentityService;
 import com.google.appengine.api.appidentity.AppIdentityServiceFailureException;
 import com.google.appengine.api.appidentity.PublicCertificate;
-
 import java.util.Collection;
 import java.util.Date;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Mock implementation of AppIdentityService interface for testing.
  *
  * @since 1.19
@@ -34,8 +33,7 @@ public class MockAppIdentityService implements AppIdentityService {
   private int getAccessTokenCallCount = 0;
   private String accessTokenText = null;
 
-  public MockAppIdentityService() {
-  }
+  public MockAppIdentityService() {}
 
   public int getGetAccessTokenCallCount() {
     return getAccessTokenCallCount;
@@ -71,8 +69,8 @@ public GetAccessTokenResult getAccessToken(Iterable<String> scopes) {
     if (scopeCount == 0) {
       throw new AppIdentityServiceFailureException("No scopes specified.");
     }
-    return new GetAccessTokenResult(accessTokenText,
-        new Date(System.currentTimeMillis() + 3600000));
+    return new GetAccessTokenResult(
+        accessTokenText, new Date(System.currentTimeMillis() + 3600000));
   }
 
   @Override
@@ -89,4 +87,9 @@ public String getServiceAccountName() {
   public ParsedAppId parseFullAppId(String fullAppId) {
     return null;
   }
+
+  @Override
+  public String getDefaultGcsBucketName() {
+    return null;
+  }
 }
diff --git a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/package-info.java b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/package-info.java
index 5b79c380b..64b65dcaf 100644
--- a/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/package-info.java
+++ b/google-api-client-appengine/src/main/java/com/google/api/client/googleapis/extensions/appengine/testing/auth/oauth2/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Google Inc.
+ * Copyright 2014 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
@@ -13,7 +13,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Test utilities for the {@code com.google.api.client.googleapis.extensions.appengine.auth.oauth2}
  * package.
  *
@@ -21,4 +21,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.extensions.appengine.testing.auth.oauth2;
-
diff --git a/google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java b/google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java
index e740ae354..961a8ffe7 100644
--- a/google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java
+++ b/google-api-client-appengine/src/test/java/com/google/api/client/googleapis/extensions/appengine/auth/oauth2/AppIdentityCredentialTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -20,7 +20,7 @@
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import java.io.IOException;
 import java.util.Arrays;
@@ -56,8 +56,7 @@ public void testUsesAppIdentityService() throws IOException {
     builder.setAppIdentityService(appIdentity);
     AppIdentityCredential appCredential = builder.build();
     HttpTransport transport = new MockHttpTransport();
-    HttpRequest request = transport.createRequestFactory().buildRequest(
-        "get", null, null);
+    HttpRequest request = transport.createRequestFactory().buildRequest("get", null, null);
 
     appCredential.intercept(request);
 
@@ -73,7 +72,7 @@ public void testAppEngineCredentialWrapper() throws IOException {
     final Collection<String> emptyScopes = Collections.emptyList();
 
     HttpTransport transport = new MockHttpTransport();
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
 
     MockAppIdentityService appIdentity = new MockAppIdentityService();
     appIdentity.setAccessTokenText(expectedAccessToken);
@@ -82,8 +81,8 @@ public void testAppEngineCredentialWrapper() throws IOException {
     builder.setAppIdentityService(appIdentity);
     AppIdentityCredential appCredential = builder.build();
 
-    GoogleCredential wrapper = new
-        AppIdentityCredential.AppEngineCredentialWrapper(appCredential, transport, jsonFactory);
+    GoogleCredential wrapper =
+        new AppIdentityCredential.AppEngineCredentialWrapper(appCredential, transport, jsonFactory);
 
     HttpRequest request = transport.createRequestFactory().buildRequest("get", null, null);
 
@@ -109,7 +108,7 @@ public void testAppEngineCredentialWrapperGetAccessToken() throws IOException {
     final String expectedAccessToken = "ExpectedAccessToken";
 
     HttpTransport transport = new MockHttpTransport();
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
 
     MockAppIdentityService appIdentity = new MockAppIdentityService();
     appIdentity.setAccessTokenText(expectedAccessToken);
@@ -118,14 +117,14 @@ public void testAppEngineCredentialWrapperGetAccessToken() throws IOException {
     builder.setAppIdentityService(appIdentity);
     AppIdentityCredential appCredential = builder.build();
 
-    GoogleCredential wrapper = new
-        AppIdentityCredential.AppEngineCredentialWrapper(appCredential, transport, jsonFactory);
+    GoogleCredential wrapper =
+        new AppIdentityCredential.AppEngineCredentialWrapper(appCredential, transport, jsonFactory);
     assertTrue(wrapper.refreshToken());
     assertEquals(expectedAccessToken, wrapper.getAccessToken());
   }
 
   public void testAppEngineCredentialWrapperNullTransportThrows() throws IOException {
-    JsonFactory jsonFactory = new JacksonFactory();
+    JsonFactory jsonFactory = new GsonFactory();
     try {
       new AppIdentityCredential.AppEngineCredentialWrapper(null, jsonFactory);
       fail();
diff --git a/google-api-client-assembly/android-properties/jackson-core-asl-1.9.11.jar.properties b/google-api-client-assembly/android-properties/jackson-core-asl-1.9.11.jar.properties
deleted file mode 100644
index d613b8e65..000000000
--- a/google-api-client-assembly/android-properties/jackson-core-asl-1.9.11.jar.properties
+++ /dev/null
@@ -1 +0,0 @@
-src=../libs-sources/jackson-core-asl-${project.jackson-core-asl.version}-sources.jar
diff --git a/google-api-client-assembly/assembly.xml b/google-api-client-assembly/assembly.xml
index 6578dd862..a239f8f8f 100644
--- a/google-api-client-assembly/assembly.xml
+++ b/google-api-client-assembly/assembly.xml
@@ -25,11 +25,102 @@
       <filtered>true</filtered>
       <outputDirectory>google-api-java-client</outputDirectory>
     </file>
+    <file>
+      <source>properties/google-api-client.jar.properties</source>
+      <destName>google-api-client-${project.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-api-client-android.jar.properties</source>
+      <destName>google-api-client-android-${project.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-api-client-gson.jar.properties</source>
+      <destName>google-api-client-gson-${project.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-api-client-jackson2.jar.properties</source>
+      <destName>google-api-client-jackson2-${project.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-api-client-protobuf.jar.properties</source>
+      <destName>google-api-client-protobuf-${project.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-api-client-xml.jar.properties</source>
+      <destName>google-api-client-xml-${project.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-http-client.jar.properties</source>
+      <destName>google-http-client-${project.http.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-http-client-android.jar.properties</source>
+      <destName>google-http-client-android-${project.http.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-http-client-gson.jar.properties</source>
+      <destName>google-http-client-gson-${project.http.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-http-client-jackson.jar.properties</source>
+      <destName>google-http-client-jackson-${project.http.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-http-client-jackson2.jar.properties</source>
+      <destName>google-http-client-jackson2-${project.http.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-http-client-jdo.jar.properties</source>
+      <destName>google-http-client-jdo-${project.http.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-http-client-protobuf.jar.properties</source>
+      <destName>google-http-client-protobuf-${project.http.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-http-client-xml.jar.properties</source>
+      <destName>google-http-client-xml-${project.http.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
+    <file>
+      <source>properties/google-oauth-client.jar.properties</source>
+      <destName>google-oauth-client-${project.oauth.version}.jar.properties</destName>
+      <outputDirectory>google-api-java-client/libs</outputDirectory>
+      <filtered>true</filtered>
+    </file>
   </files>
   <fileSets>
     <fileSet>
       <directory>dependencies</directory>
       <outputDirectory>google-api-java-client/dependencies</outputDirectory>
+      <filtered>true</filtered>
     </fileSet>
     <fileSet>
       <directory>target/libs</directory>
diff --git a/google-api-client-assembly/classpath-include b/google-api-client-assembly/classpath-include
index e5be4f925..c6e53b922 100644
--- a/google-api-client-assembly/classpath-include
+++ b/google-api-client-assembly/classpath-include
@@ -26,7 +26,6 @@
 	<classpathentry kind="lib" path="libs/gson-${project.gson.version}.jar" sourcepath="libs-sources/gson-${project.gson.version}-sources.jar"/>
 	<classpathentry kind="lib" path="libs/httpclient-${project.httpclient.version}.jar" sourcepath="libs-sources/httpclient-${project.httpclient.version}-sources.jar"/>
 	<classpathentry kind="lib" path="libs/httpcore-${project.httpcore.version}.jar" sourcepath="libs-sources/httpcore-${project.httpcore.version}-sources.jar"/>
-	<classpathentry kind="lib" path="libs/jackson-core-asl-${project.jackson-core-asl.version}.jar" sourcepath="libs-sources/jackson-core-asl-${project.jackson-core-asl.version}-sources.jar"/>
 	<classpathentry kind="lib" path="libs/jackson-core-${project.jackson-core2.version}.jar" sourcepath="libs-sources/jackson-core-${project.jackson-core2.version}-sources.jar"/>
 	<classpathentry kind="lib" path="libs/jdo2-api-${project.jdo2-api.version}.jar" sourcepath="libs-sources/jdo2-api-${project.jdo2-api.version}-sources.jar"/>
 	<classpathentry kind="lib" path="libs/jsr305-${project.jsr305.version}.jar"/>
diff --git a/google-api-client-assembly/dependencies/BSD-LICENSE.txt b/google-api-client-assembly/dependencies/BSD-LICENSE.txt
index 5ebe92c58..9473fba56 100644
--- a/google-api-client-assembly/dependencies/BSD-LICENSE.txt
+++ b/google-api-client-assembly/dependencies/BSD-LICENSE.txt
@@ -1,6 +1,6 @@
 BSD License
 
-Copyright (c) 2000-2006, www.hamcrest.org
+Copyright 2000-2006, www.hamcrest.org
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/google-api-client-assembly/dependencies/google-api-client-android-dependencies.html b/google-api-client-assembly/dependencies/google-api-client-android-dependencies.html
index 0879100c8..acd9a36ce 100644
--- a/google-api-client-assembly/dependencies/google-api-client-android-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-api-client-android-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,13 +63,13 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.api-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">google-api-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-android">google-http-client-android</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_provided"></a>
 <div class="section">
@@ -122,49 +122,55 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">google-http-client-jackson2</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">commons-codec</a></td>
-<td>1.9</td>
+<td>1.10</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/logging">commons-logging</a></td>
 <td>1.1.1</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
-<td>4.5.3</td>
+<td>4.5.5</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
-<td>4.4.6</td>
+<td>4.4.9</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr></table></div><a name="Project_Transitive_Dependencies_provided"></a>
 <div class="section">
@@ -223,7 +229,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.api-client:google-api-client-android:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.api-client:google-api-client-android:jar:${project.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Android Platform Extensions to the Google APIs Client Library for Java.</th></tr>
@@ -253,7 +259,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     well known logging systems.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/logging">http://commons.apache.org/logging</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>org.apache.httpcomponents:httpclient:jar:4.5.3 (compile) <img id="_img7" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep6', '_img7' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep6" style="display:none">
+<li>org.apache.httpcomponents:httpclient:jar:4.5.5 (compile) <img id="_img7" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep6', '_img7' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep6" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpClient</th></tr>
@@ -263,7 +269,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">http://hc.apache.org/httpcomponents-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpcore:jar:4.4.6 (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
+<li>org.apache.httpcomponents:httpcore:jar:4.4.9 (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpCore</th></tr>
@@ -272,7 +278,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Apache HttpComponents Core (blocking I/O)</p>
 <p><b>URL: </b><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">http://hc.apache.org/httpcomponents-core-ga</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div></li>
-<li>commons-codec:commons-codec:jar:1.9 (compile) <img id="_img11" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep10', '_img11' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep10" style="display:none">
+<li>commons-codec:commons-codec:jar:1.10 (compile) <img id="_img11" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep10', '_img11' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep10" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache Commons Codec</th></tr>
@@ -283,7 +289,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">http://commons.apache.org/proper/commons-codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
 <li>org.khronos:opengl-api:jar:gl1.1-android-2.1_r1 (provided) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
@@ -325,7 +331,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     These properties make JSON an ideal data-interchange language.</p>
 <p><b>URL: </b><a class="externalLink" href="http://www.json.org/java/index.html">http://www.json.org/java/index.html</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.json.org/license.html">provided without support or warranty</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>com.google.api-client:google-api-client:jar:${project.version} (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google APIs Client Library for Java</th></tr>
@@ -335,7 +341,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">https://github.com/google/google-api-java-client/google-api-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -355,7 +361,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<li>com.google.http-client:google-http-client-jackson2:jar:${project.http.version} (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson 2 extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -374,7 +380,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Core Jackson processing abstractions (aka Streaming API), implementation for JSON</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/FasterXML/jackson-core">https://github.com/FasterXML/jackson-core</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.guava:guava:jar:20.0 (compile) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (compile) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -388,7 +394,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     per the JSR-305 spec.</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/guava/guava">https://github.com/google/guava/guava</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-android:jar:1.25.0-SNAPSHOT (compile) <img id="_img33" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep32', '_img33' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep32" style="display:none">
+<li>com.google.http-client:google-http-client-android:jar:${project.http.version} (compile) <img id="_img33" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep32', '_img33' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep32" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Android Platform Extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -398,7 +404,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-android">https://github.com/google/google-http-java-client/google-http-client-android</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -407,8 +413,19 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Google HTTP Client Library for Java. Functionality that works on all supported Java platforms,
     including Java 5 (or higher) desktop (SE) and web (EE), Android, and Google App Engine.</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">https://github.com/google/google-http-java-client/google-http-client</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.android.google-play-services:google-play-services:jar:1 (provided) <img id="_img37" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep36', '_img37' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep36" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
+<ul>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img37" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep36', '_img37' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep36" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
+<li>com.google.android.google-play-services:google-play-services:jar:1 (provided) <img id="_img39" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep38', '_img39' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep38" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>google-play-services</th></tr>
@@ -421,10 +438,10 @@ <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Apache Software License, version 1.1: </b>MXP1: Xml Pull Parser 3rd Edition (XPP3)</p>
 <p><b>Public Domain: </b>MXP1: Xml Pull Parser 3rd Edition (XPP3)</p>
 <p><b>Unknown: </b>google-play-services, xmlParserAPIs</p>
-<p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
+<p><b>Apache License, Version 2.0: </b>Apache Commons Codec, Apache HttpClient, Apache HttpCore</p>
 <p><b>provided without support or warranty: </b>JSON (JavaScript Object Notation)</p>
 <p><b>Apache 2.0: </b>Google Android Java ME Library (Khronos), Google Android Library</p>
-<p><b>The Apache Software License, Version 2.0: </b>Android Platform Extensions to the Google APIs Client Library for Java., Android Platform Extensions to the Google HTTP Client Library for Java., Apache Commons Codec, Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core</p>
+<p><b>The Apache Software License, Version 2.0: </b>Android Platform Extensions to the Google APIs Client Library for Java., Android Platform Extensions to the Google HTTP Client Library for Java., Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core</p>
 <p><b>Indiana University Extreme! Lab Software License, vesion 1.1.1: </b>MXP1: Xml Pull Parser 3rd Edition (XPP3)</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
@@ -462,12 +479,12 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>release</td></tr>
 <tr class="a">
-<td>google-api-client-1.25.0-SNAPSHOT.jar</td>
-<td>195.26 kB</td>
+<td>google-api-client-${project.version}.jar</td>
+<td>199.67 kB</td>
 <td>141</td>
 <td>110</td>
 <td>22</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
 <td>jsr305-3.0.2.jar</td>
@@ -478,7 +495,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -486,46 +503,54 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-android-1.25.0-SNAPSHOT.jar</td>
-<td>11.68 kB</td>
+<td>google-http-client-android-${project.http.version}.jar</td>
+<td>11.86 kB</td>
 <td>21</td>
 <td>11</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-jackson2-1.25.0-SNAPSHOT.jar</td>
-<td>6.53 kB</td>
+<td>google-http-client-jackson2-${project.http.version}.jar</td>
+<td>6.58 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="b">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>commons-codec-1.9.jar</td>
-<td>257.78 kB</td>
-<td>227</td>
-<td>85</td>
+<tr class="a">
+<td>commons-codec-1.10.jar</td>
+<td>277.52 kB</td>
+<td>238</td>
+<td>92</td>
 <td>6</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-logging-1.1.1.jar</td>
 <td>59.26 kB</td>
 <td>42</td>
@@ -533,23 +558,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.1</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>httpclient-4.5.3.jar</td>
-<td>730.27 kB</td>
-<td>507</td>
-<td>466</td>
+<tr class="a">
+<td>httpclient-4.5.5.jar</td>
+<td>748.17 kB</td>
+<td>508</td>
+<td>467</td>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>httpcore-4.4.6.jar</td>
-<td>316.23 kB</td>
+<tr class="b">
+<td>httpcore-4.4.9.jar</td>
+<td>317.87 kB</td>
 <td>282</td>
 <td>252</td>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>json-20080701.jar</td>
 <td>36.99 kB</td>
 <td>26</td>
@@ -557,7 +582,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1</td>
 <td>1.3</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>opengl-api-gl1.1-android-2.1_r1.jar</td>
 <td>18.06 kB</td>
 <td>25</td>
@@ -565,7 +590,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>xmlParserAPIs-2.6.2.jar</td>
 <td>121.80 kB</td>
 <td>238</td>
@@ -573,7 +598,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.1</td>
 <td>release</td></tr>
-<tr class="a">
+<tr class="b">
 <td>xpp3-1.1.4c.jar</td>
 <td>117.25 kB</td>
 <td>78</td>
@@ -581,7 +606,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>13</td>
 <td>1.1</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -589,23 +614,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>18</td>
-<td>17.95 MB</td>
-<td>11,970</td>
-<td>5,923</td>
-<td>251</td>
-<td>1.6</td>
-<td>16</td></tr>
 <tr class="b">
-<td>compile: 12</td>
-<td>compile: 4.50 MB</td>
-<td>compile: 3,531</td>
-<td>compile: 3,156</td>
-<td>compile: 126</td>
-<td>-</td>
-<td>compile: 12</td></tr>
+<td>19</td>
+<td>18.01 MB</td>
+<td>12,007</td>
+<td>5,945</td>
+<td>252</td>
+<td>1.6</td>
+<td>17</td></tr>
 <tr class="a">
+<td>compile: 13</td>
+<td>compile: 4.56 MB</td>
+<td>compile: 3,568</td>
+<td>compile: 3,178</td>
+<td>compile: 127</td>
+<td>-</td>
+<td>compile: 13</td></tr>
+<tr class="b">
 <td>provided: 6</td>
 <td>provided: 13.45 MB</td>
 <td>provided: 8,439</td>
@@ -659,7 +684,7 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.api-client:google-api-client:jar:${project.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
@@ -669,95 +694,100 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-android:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-android:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jackson2:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-codec:commons-codec:jar:1.9</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-logging:commons-logging:jar:1.1.1</td>
+<td>commons-codec:commons-codec:jar:1.10</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>commons-logging:commons-logging:jar:1.1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.5</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.json:json:jar:20080701</td>
+<td>org.apache.httpcomponents:httpcore:jar:4.4.9</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.khronos:opengl-api:jar:gl1.1-android-2.1_r1</td>
+<td>org.json:json:jar:20080701</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>xerces:xmlParserAPIs:jar:2.6.2</td>
+<td>org.khronos:opengl-api:jar:gl1.1-android-2.1_r1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>xpp3:xpp3:jar:1.1.4c</td>
+<td>xerces:xmlParserAPIs:jar:2.6.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
+<td>xpp3:xpp3:jar:1.1.4c</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="a">
-<td>18 (compile: 12, provided: 6)</td>
+<tr class="b">
+<td>19 (compile: 13, provided: 6)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2010-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2010-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-api-client-appengine-dependencies.html b/google-api-client-assembly/dependencies/google-api-client-appengine-dependencies.html
index 0f675f924..2d7b5cb06 100644
--- a/google-api-client-assembly/dependencies/google-api-client-appengine-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-api-client-appengine-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,25 +63,25 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.api-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">google-api-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.api-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client-servlet">google-api-client-servlet</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-appengine">google-http-client-appengine</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-appengine">google-oauth-client-appengine</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
 <div class="section">
@@ -96,32 +96,32 @@ <h3>test<a name="test"></a></h3>
 <th>License</th></tr>
 <tr class="b">
 <td>com.google.appengine</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/appengine-api-labs/">appengine-api-labs</a></td>
+<td><a class="externalLink" href="https://cloud.google.com/appengine/docs/standard/java/quickstart">appengine-api-labs</a></td>
 <td>1.7.7</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></td></tr>
+<td><a class="externalLink" href="https://cloud.google.com/terms/">Google App Engine Terms of Service</a></td></tr>
 <tr class="a">
 <td>com.google.appengine</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/appengine-api-stubs/">appengine-api-stubs</a></td>
+<td><a class="externalLink" href="https://search.maven.org/artifact/com.google.appengine/appengine-api-stubs">appengine-api-stubs</a></td>
 <td>1.7.7</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></td></tr>
+<td><a class="externalLink" href="https://cloud.google.com/terms/">Google App Engine Terms of Service</a></td></tr>
 <tr class="b">
 <td>com.google.appengine</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/appengine-testing/">appengine-testing</a></td>
+<td><a class="externalLink" href="https://cloud.google.com/appengine/docs/standard/java/tools/localunittesting">appengine-testing</a></td>
 <td>1.7.7</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></td></tr>
+<td><a class="externalLink" href="https://cloud.google.com/terms/">Google App Engine Terms of Service</a></td></tr>
 <tr class="a">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">google-http-client-jackson2</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
@@ -142,10 +142,10 @@ <h3>provided<a name="provided"></a></h3>
 <th>License</th></tr>
 <tr class="b">
 <td>com.google.appengine</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/appengine-api-1.0-sdk/">appengine-api-1.0-sdk</a></td>
+<td><a class="externalLink" href="https://cloud.google.com/appengine/downloads/">appengine sdk</a></td>
 <td>1.7.7</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></td></tr></table></div></div><a name="Project_Transitive_Dependencies"></a>
+<td><a class="externalLink" href="https://cloud.google.com/terms/">Google App Engine Terms of Service</a></td></tr></table></div></div><a name="Project_Transitive_Dependencies"></a>
 <div class="section">
 <h2>Project Transitive Dependencies<a name="Project_Transitive_Dependencies"></a></h2>
 <p>The following is a list of transitive dependencies for this project. Transitive dependencies are the dependencies of the project dependencies.</p><a name="Project_Transitive_Dependencies_compile"></a>
@@ -168,67 +168,73 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jdo">google-http-client-jdo</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-servlet">google-oauth-client-servlet</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">commons-codec</a></td>
-<td>1.9</td>
+<td>1.10</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>javax.jdo</td>
 <td><a class="externalLink" href="http://db.apache.org/jdo/index.html">jdo2-api</a></td>
 <td>2.3-eb</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>javax.servlet</td>
 <td>servlet-api</td>
 <td>2.5</td>
 <td>jar</td>
 <td>-</td></tr>
-<tr class="a">
+<tr class="b">
 <td>javax.transaction</td>
 <td>transaction-api</td>
 <td>1.1</td>
 <td>jar</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
-<td>4.5.3</td>
+<td>4.5.5</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
-<td>4.4.6</td>
+<td>4.4.9</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr></table></div><a name="Project_Transitive_Dependencies_test"></a>
 <div class="section">
@@ -269,7 +275,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.api-client:google-api-client-appengine:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.api-client:google-api-client-appengine:jar:${project.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google App Engine extensions to the Google API Client Library for Java.</th></tr>
@@ -286,9 +292,9 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <tr class="b">
 <td>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/appengine/appengine-api-1.0-sdk/">http://code.google.com/appengine/appengine-api-1.0-sdk/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
-<li>com.google.oauth-client:google-oauth-client-appengine:jar:1.25.0-SNAPSHOT (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
+<p><b>URL: </b><a class="externalLink" href="https://cloud.google.com/appengine/downloads">appengine sdk/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="https://cloud.google.com/terms/">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
+<li>com.google.oauth-client:google-oauth-client-appengine:jar:${project.oauth.version} (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google App Engine extensions to the Google OAuth Client Library for Java.</th></tr>
@@ -298,7 +304,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-appengine">https://github.com/google/google-oauth-java-client/google-oauth-client-appengine</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img7" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep6', '_img7' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep6" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img7" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep6', '_img7' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep6" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -318,7 +324,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.oauth-client:google-oauth-client-servlet:jar:1.25.0-SNAPSHOT (compile) <img id="_img11" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep10', '_img11' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep10" style="display:none">
+<li>com.google.oauth-client:google-oauth-client-servlet:jar:${project.oauth.version} (compile) <img id="_img11" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep10', '_img11' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep10" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Servlet and JDO extensions to the Google OAuth Client Library for Java.</th></tr>
@@ -328,7 +334,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-servlet">https://github.com/google/google-oauth-java-client/google-oauth-client-servlet</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client-jdo:jar:1.25.0-SNAPSHOT (compile) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
+<li>com.google.http-client:google-http-client-jdo:jar:${project.http.version} (compile) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JDO extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -337,7 +343,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jdo">https://github.com/google/google-http-java-client/google-http-client-jdo</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<li>com.google.api-client:google-api-client:jar:${project.version} (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google APIs Client Library for Java</th></tr>
@@ -346,7 +352,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">https://github.com/google/google-api-java-client/google-api-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>com.google.api-client:google-api-client-servlet:jar:1.25.0-SNAPSHOT (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>com.google.api-client:google-api-client-servlet:jar:${project.version} (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Servlet and JDO extensions to the Google API Client Library for Java.</th></tr>
@@ -382,7 +388,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <td>
 <p><b>Description: </b>There is currently no description associated with this project.</p>
 <p><b>Project License: </b>No license is defined for this project.</p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.http-client:google-http-client-appengine:jar:1.25.0-SNAPSHOT (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<li>com.google.http-client:google-http-client-appengine:jar:${project.http.version} (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google App Engine extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -392,7 +398,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-appengine">https://github.com/google/google-http-java-client/google-http-client-appengine</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -403,7 +409,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">https://github.com/google/google-http-java-client/google-http-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpclient:jar:4.5.3 (compile) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
+<li>org.apache.httpcomponents:httpclient:jar:4.5.5 (compile) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpClient</th></tr>
@@ -413,7 +419,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">http://hc.apache.org/httpcomponents-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpcore:jar:4.4.6 (compile) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
+<li>org.apache.httpcomponents:httpcore:jar:4.4.9 (compile) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpCore</th></tr>
@@ -432,7 +438,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     well known logging systems.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">http://commons.apache.org/proper/commons-logging/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>commons-codec:commons-codec:jar:1.9 (compile) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
+<li>commons-codec:commons-codec:jar:1.10 (compile) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache Commons Codec</th></tr>
@@ -443,8 +449,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">http://commons.apache.org/proper/commons-codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li></ul></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img37" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep36', '_img37' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep36" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img37" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep36', '_img37' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep36" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
+<li>junit:junit:jar:4.8.2 (test) <img id="_img39" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep38', '_img39' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep38" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -453,34 +469,34 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>com.google.appengine:appengine-testing:jar:1.7.7 (test) <img id="_img39" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep38', '_img39' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep38" style="display:none">
+<li>com.google.appengine:appengine-testing:jar:1.7.7 (test) <img id="_img41" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep40', '_img41' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep40" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>appengine-testing</th></tr>
 <tr class="b">
 <td>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/appengine/appengine-testing/">http://code.google.com/appengine/appengine-testing/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
-<li>com.google.appengine:appengine-api-labs:jar:1.7.7 (test) <img id="_img41" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep40', '_img41' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep40" style="display:none">
+<p><b>URL: </b><a class="externalLink" href="https://cloud.google.com/appengine/docs/standard/java/tools/localunittesting">appengine-testing</a></p>
+<p><b>Project License: </b><a class="externalLink" href="https://cloud.google.com/terms/">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
+<li>com.google.appengine:appengine-api-labs:jar:1.7.7 (test) <img id="_img43" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep42', '_img43' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep42" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>appengine-api-labs</th></tr>
 <tr class="b">
 <td>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/appengine/appengine-api-labs/">http://code.google.com/appengine/appengine-api-labs/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
-<li>com.google.appengine:appengine-api-stubs:jar:1.7.7 (test) <img id="_img43" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep42', '_img43' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep42" style="display:none">
+<p><b>URL: </b><a class="externalLink" href="https://cloud.google.com/appengine/docs/standard/java/quickstart/">appengine-api-labs</a></p>
+<p><b>Project License: </b><a class="externalLink" href="https://cloud.google.com/terms/">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
+<li>com.google.appengine:appengine-api-stubs:jar:1.7.7 (test) <img id="_img45" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep44', '_img45' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep44" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>appengine-api-stubs</th></tr>
 <tr class="b">
 <td>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/appengine/appengine-api-stubs/">http://code.google.com/appengine/appengine-api-stubs/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
-<li>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT (test) <img id="_img45" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep44', '_img45' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep44" style="display:none">
+<p><b>URL: </b><a class="externalLink" href="https://search.maven.org/artifact/com.google.appengine/appengine-api-stubs">appengine-api-stubs</a></p>
+<p><b>Project License: </b><a class="externalLink" href="https://cloud.google.com/terms/">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
+<li>com.google.http-client:google-http-client-jackson2:jar:${project.http.version} (test) <img id="_img47" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep46', '_img47' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep46" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson 2 extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -490,7 +506,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">https://github.com/google/google-http-java-client/google-http-client-jackson2</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (test) <img id="_img47" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep46', '_img47' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep46" style="display:none">
+<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (test) <img id="_img49" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep48', '_img49' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep48" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson-core</th></tr>
@@ -499,7 +515,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Core Jackson processing abstractions (aka Streaming API), implementation for JSON</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/FasterXML/jackson-core">https://github.com/FasterXML/jackson-core</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.guava:guava:jar:20.0 (test) <img id="_img49" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep48', '_img49' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep48" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (test) <img id="_img51" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep50', '_img51' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep50" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -515,12 +531,12 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></div></div><a name="Licenses"></a>
 <div class="section">
 <h2>Licenses<a name="Licenses"></a></h2>
-<p><b>Google App Engine Terms of Service: </b>appengine-api-1.0-sdk, appengine-api-labs, appengine-api-stubs, appengine-testing</p>
+<p><b>Google App Engine Terms of Service: </b>appengine sdk, appengine-api-labs, appengine-api-stubs, appengine-testing</p>
 <p><b>Apache 2: </b>JDO2 API</p>
 <p><b>Unknown: </b>servlet-api, transaction-api</p>
-<p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
+<p><b>Apache License, Version 2.0: </b>Apache Commons Codec, Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Codec, Apache Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google App Engine extensions to the Google API Client Library for Java., Google App Engine extensions to the Google HTTP Client Library for Java., Google App Engine extensions to the Google OAuth Client Library for Java., Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, JDO extensions to the Google HTTP Client Library for Java., Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, Servlet and JDO extensions to the Google API Client Library for Java., Servlet and JDO extensions to the Google OAuth Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google App Engine extensions to the Google API Client Library for Java., Google App Engine extensions to the Google HTTP Client Library for Java., Google App Engine extensions to the Google OAuth Client Library for Java., Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, JDO extensions to the Google HTTP Client Library for Java., Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, Servlet and JDO extensions to the Google API Client Library for Java., Servlet and JDO extensions to the Google OAuth Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -541,20 +557,20 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-api-client-1.25.0-SNAPSHOT.jar</td>
-<td>195.26 kB</td>
+<td>google-api-client-${project.version}.jar</td>
+<td>199.67 kB</td>
 <td>141</td>
 <td>110</td>
 <td>22</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-api-client-servlet-1.25.0-SNAPSHOT.jar</td>
-<td>6.41 kB</td>
+<td>google-api-client-servlet-${project.version}.jar</td>
+<td>6.69 kB</td>
 <td>14</td>
 <td>4</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
 <td>appengine-api-1.0-sdk-1.7.7.jar</td>
@@ -597,7 +613,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -605,70 +621,78 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-appengine-1.25.0-SNAPSHOT.jar</td>
-<td>15.25 kB</td>
+<td>google-http-client-appengine-${project.http.version}.jar</td>
+<td>15.81 kB</td>
 <td>21</td>
 <td>11</td>
 <td>2</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-jackson2-1.25.0-SNAPSHOT.jar</td>
-<td>6.53 kB</td>
+<td>google-http-client-jackson2-${project.http.version}.jar</td>
+<td>6.58 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-jdo-1.25.0-SNAPSHOT.jar</td>
-<td>7.79 kB</td>
+<td>google-http-client-jdo-${project.http.version}.jar</td>
+<td>8.08 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="b">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>google-oauth-client-appengine-1.25.0-SNAPSHOT.jar</td>
-<td>8.27 kB</td>
+<tr class="a">
+<td>google-oauth-client-appengine-${project.oauth.version}.jar</td>
+<td>8.37 kB</td>
 <td>17</td>
 <td>7</td>
 <td>2</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>google-oauth-client-servlet-1.25.0-SNAPSHOT.jar</td>
-<td>22.04 kB</td>
+<tr class="b">
+<td>google-oauth-client-servlet-${project.oauth.version}.jar</td>
+<td>22.92 kB</td>
 <td>24</td>
 <td>11</td>
 <td>4</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>commons-codec-1.9.jar</td>
-<td>257.78 kB</td>
-<td>227</td>
-<td>85</td>
+<tr class="a">
+<td>commons-codec-1.10.jar</td>
+<td>277.52 kB</td>
+<td>238</td>
+<td>92</td>
 <td>6</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -676,7 +700,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>jdo2-api-2.3-eb.jar</td>
 <td>188.18 kB</td>
 <td>226</td>
@@ -684,7 +708,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>7</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>servlet-api-2.5.jar</td>
 <td>102.65 kB</td>
 <td>68</td>
@@ -692,7 +716,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>transaction-api-1.1.jar</td>
 <td>14.72 kB</td>
 <td>24</td>
@@ -700,7 +724,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.3</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -708,23 +732,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>httpclient-4.5.3.jar</td>
-<td>730.27 kB</td>
-<td>507</td>
-<td>466</td>
+<tr class="a">
+<td>httpclient-4.5.5.jar</td>
+<td>748.17 kB</td>
+<td>508</td>
+<td>467</td>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>httpcore-4.4.6.jar</td>
-<td>316.23 kB</td>
+<tr class="b">
+<td>httpcore-4.4.9.jar</td>
+<td>317.87 kB</td>
 <td>282</td>
 <td>252</td>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -732,23 +756,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>24</td>
-<td>69.15 MB</td>
-<td>17,589</td>
-<td>16,123</td>
-<td>463</td>
-<td>1.6</td>
-<td>24</td></tr>
 <tr class="b">
-<td>compile: 16</td>
-<td>compile: 2.20 MB</td>
-<td>compile: 1,930</td>
-<td>compile: 1,501</td>
-<td>compile: 114</td>
-<td>-</td>
-<td>compile: 16</td></tr>
+<td>25</td>
+<td>69.21 MB</td>
+<td>17,626</td>
+<td>16,145</td>
+<td>464</td>
+<td>1.6</td>
+<td>25</td></tr>
 <tr class="a">
+<td>compile: 17</td>
+<td>compile: 2.27 MB</td>
+<td>compile: 1,967</td>
+<td>compile: 1,523</td>
+<td>compile: 115</td>
+<td>-</td>
+<td>compile: 17</td></tr>
+<tr class="b">
 <td>test: 7</td>
 <td>test: 36.28 MB</td>
 <td>test: 9,093</td>
@@ -756,7 +780,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>test: 263</td>
 <td>-</td>
 <td>test: 7</td></tr>
-<tr class="b">
+<tr class="a">
 <td>provided: 1</td>
 <td>provided: 30.66 MB</td>
 <td>provided: 6,566</td>
@@ -800,12 +824,12 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.api-client:google-api-client:jar:${project.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.api-client:google-api-client-servlet:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.api-client:google-api-client-servlet:jar:${project.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
@@ -835,110 +859,115 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client-appengine:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-appengine:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jackson2:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client-jdo:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jdo:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.oauth-client:google-oauth-client-appengine:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.oauth-client:google-oauth-client-servlet:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.oauth-client:google-oauth-client-appengine:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-codec:commons-codec:jar:1.9</td>
+<td>com.google.oauth-client:google-oauth-client-servlet:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.10</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>javax.jdo:jdo2-api:jar:2.3-eb</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>javax.servlet:servlet-api:jar:2.5</td>
+<td>javax.jdo:jdo2-api:jar:2.3-eb</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>javax.transaction:transaction-api:jar:1.1</td>
+<td>javax.servlet:servlet-api:jar:2.5</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>junit:junit:jar:4.8.2</td>
+<td>javax.transaction:transaction-api:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.5</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
+<td>org.apache.httpcomponents:httpcore:jar:4.4.9</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="a">
-<td>24 (compile: 16, test: 7, provided: 1)</td>
+<tr class="b">
+<td>25 (compile: 17, test: 7, provided: 1)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2010-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2010-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-api-client-dependencies.html b/google-api-client-assembly/dependencies/google-api-client-dependencies.html
index 65b5feed6..9c14b32d1 100644
--- a/google-api-client-assembly/dependencies/google-api-client-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-api-client-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,19 +63,19 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">google-http-client-jackson2</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
 <div class="section">
@@ -91,13 +91,13 @@ <h3>test<a name="test"></a></h3>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-gson">google-http-client-gson</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-protobuf">google-http-client-protobuf</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
@@ -150,25 +150,31 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
-<td>4.5.3</td>
+<td>4.5.5</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
-<td>4.4.6</td>
+<td>4.4.9</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr></table></div><a name="Project_Transitive_Dependencies_test"></a>
 <div class="section">
@@ -183,7 +189,7 @@ <h3>test<a name="test"></a></h3>
 <th>License</th></tr>
 <tr class="b">
 <td>com.google.code.gson</td>
-<td><a class="externalLink" href="http://code.google.com/p/google-gson/">gson</a></td>
+<td><a class="externalLink" href="https://github.com/google/gson">gson</a></td>
 <td>2.1</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
@@ -215,7 +221,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.api-client:google-api-client:jar:${project.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google APIs Client Library for Java</th></tr>
@@ -225,7 +231,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">https://github.com/google/google-api-java-client/google-api-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -236,7 +242,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">https://github.com/google/google-oauth-java-client/google-oauth-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -247,7 +253,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">https://github.com/google/google-http-java-client/google-http-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpclient:jar:4.5.3 (compile) <img id="_img7" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep6', '_img7' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep6" style="display:none">
+<li>org.apache.httpcomponents:httpclient:jar:4.5.5 (compile) <img id="_img7" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep6', '_img7' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep6" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpClient</th></tr>
@@ -257,7 +263,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">http://hc.apache.org/httpcomponents-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpcore:jar:4.4.6 (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
+<li>org.apache.httpcomponents:httpcore:jar:4.4.9 (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpCore</th></tr>
@@ -275,8 +281,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Apache Commons Logging is a thin adapter allowing configurable bridging to other,
     well known logging systems.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">http://commons.apache.org/proper/commons-logging/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>FindBugs-jsr305</th></tr>
@@ -285,7 +301,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<li>com.google.http-client:google-http-client-jackson2:jar:${project.http.version} (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson 2 extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -295,7 +311,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">https://github.com/google/google-http-java-client/google-http-client-jackson2</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson-core</th></tr>
@@ -304,7 +320,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Core Jackson processing abstractions (aka Streaming API), implementation for JSON</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/FasterXML/jackson-core">https://github.com/FasterXML/jackson-core</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-gson:jar:1.25.0-SNAPSHOT (test) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>com.google.http-client:google-http-client-gson:jar:${project.http.version} (test) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>GSON extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -314,16 +330,16 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-gson">https://github.com/google/google-http-java-client/google-http-client-gson</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.code.gson:gson:jar:2.1 (test) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>com.google.code.gson:gson:jar:2.1 (test) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Gson</th></tr>
 <tr class="b">
 <td>
 <p><b>Description: </b>Google Gson library</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/p/google-gson/">http://code.google.com/p/google-gson/</a></p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/gson">gson</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-protobuf:jar:1.25.0-SNAPSHOT (test) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<li>com.google.http-client:google-http-client-protobuf:jar:${project.http.version} (test) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Protocol Buffer extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -333,7 +349,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-protobuf">https://github.com/google/google-http-java-client/google-http-client-protobuf</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.protobuf:protobuf-java:jar:2.6.1 (test) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<li>com.google.protobuf:protobuf-java:jar:2.6.1 (test) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Protocol Buffer Java API</th></tr>
@@ -343,7 +359,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     extensible format.</p>
 <p><b>URL: </b><a class="externalLink" href="https://developers.google.com/protocol-buffers/">https://developers.google.com/protocol-buffers/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/bsd-license.php">New BSD license</a></p></td></tr></table></div></li></ul></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -352,7 +368,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>commons-codec:commons-codec:jar:1.6 (provided) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
+<li>commons-codec:commons-codec:jar:1.6 (provided) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Commons Codec</th></tr>
@@ -364,7 +380,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>com.google.guava:guava:jar:20.0 (compile) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (compile) <img id="_img33" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep32', '_img33' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep32" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -383,7 +399,7 @@ <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>New BSD license: </b>Protocol Buffer Java API</p>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, GSON extensions to the Google HTTP Client Library for Java., Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Gson, Guava: Google Core Libraries for Java, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, Protocol Buffer extensions to the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, GSON extensions to the Google HTTP Client Library for Java., Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Gson, Guava: Google Core Libraries for Java, J2ObjC Annotations, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, Protocol Buffer extensions to the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -420,7 +436,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -428,46 +444,54 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-gson-1.25.0-SNAPSHOT.jar</td>
-<td>8.25 kB</td>
+<td>google-http-client-gson-${project.http.version}.jar</td>
+<td>8.40 kB</td>
 <td>14</td>
 <td>6</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-jackson2-1.25.0-SNAPSHOT.jar</td>
-<td>6.53 kB</td>
+<td>google-http-client-jackson2-${project.http.version}.jar</td>
+<td>6.58 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-protobuf-1.25.0-SNAPSHOT.jar</td>
-<td>5.04 kB</td>
+<td>google-http-client-protobuf-${project.http.version}.jar</td>
+<td>5.17 kB</td>
 <td>14</td>
 <td>5</td>
 <td>2</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="a">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>protobuf-java-2.6.1.jar</td>
 <td>582.66 kB</td>
 <td>286</td>
@@ -475,7 +499,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -483,7 +507,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -491,7 +515,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -499,23 +523,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>httpclient-4.5.3.jar</td>
-<td>730.27 kB</td>
-<td>507</td>
-<td>466</td>
+<tr class="b">
+<td>httpclient-4.5.5.jar</td>
+<td>748.17 kB</td>
+<td>508</td>
+<td>467</td>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>httpcore-4.4.6.jar</td>
-<td>316.23 kB</td>
+<tr class="a">
+<td>httpcore-4.4.9.jar</td>
+<td>317.87 kB</td>
 <td>282</td>
 <td>252</td>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -523,31 +547,31 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="b">
-<td>15</td>
-<td>5.25 MB</td>
-<td>4,099</td>
-<td>3,691</td>
-<td>141</td>
-<td>1.6</td>
-<td>15</td></tr>
 <tr class="a">
-<td>compile: 9</td>
-<td>compile: 4.05 MB</td>
-<td>compile: 3,142</td>
-<td>compile: 2,950</td>
-<td>compile: 95</td>
-<td>-</td>
-<td>compile: 9</td></tr>
+<td>16</td>
+<td>5.29 MB</td>
+<td>4,125</td>
+<td>3,706</td>
+<td>142</td>
+<td>1.6</td>
+<td>16</td></tr>
 <tr class="b">
+<td>compile: 10</td>
+<td>compile: 4.09 MB</td>
+<td>compile: 3,168</td>
+<td>compile: 2,965</td>
+<td>compile: 96</td>
+<td>-</td>
+<td>compile: 10</td></tr>
+<tr class="a">
 <td>test: 5</td>
-<td>test: 1,003.62 kB</td>
+<td>test: 1,003.90 kB</td>
 <td>test: 739</td>
 <td>test: 665</td>
 <td>test: 40</td>
 <td>-</td>
 <td>test: 5</td></tr>
-<tr class="a">
+<tr class="b">
 <td>provided: 1</td>
 <td>provided: 227.32 kB</td>
 <td>provided: 218</td>
@@ -601,90 +625,95 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-gson:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-gson:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jackson2:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-protobuf:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-protobuf:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.protobuf:protobuf-java:jar:2.6.1</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.protobuf:protobuf-java:jar:2.6.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.5</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
+<td>org.apache.httpcomponents:httpcore:jar:4.4.9</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="b">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="b">
-<td>15 (compile: 9, test: 5, provided: 1)</td>
+<tr class="a">
+<td>16 (compile: 10, test: 5, provided: 1)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2010-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2010-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-api-client-gson-dependencies.html b/google-api-client-assembly/dependencies/google-api-client-gson-dependencies.html
index 65fda9f78..acfc6abc8 100644
--- a/google-api-client-assembly/dependencies/google-api-client-gson-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-api-client-gson-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,13 +63,13 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.api-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">google-api-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-gson">google-http-client-gson</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div></div><a name="Project_Transitive_Dependencies"></a>
 <div class="section">
@@ -99,56 +99,62 @@ <h3>compile<a name="compile"></a></h3>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.code.gson</td>
-<td><a class="externalLink" href="http://code.google.com/p/google-gson/">gson</a></td>
+<td><a class="externalLink" href="https://github.com/google/gson">gson</a></td>
 <td>2.1</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">google-http-client-jackson2</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="a">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">commons-codec</a></td>
-<td>1.9</td>
+<td>1.10</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
-<td>4.5.3</td>
+<td>4.5.5</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
-<td>4.4.6</td>
+<td>4.4.9</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr></table></div></div><a name="Project_Dependency_Graph"></a>
 <div class="section">
@@ -173,7 +179,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.api-client:google-api-client-gson:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.api-client:google-api-client-gson:jar:${project.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>GSON extensions to the Google APIs Client Library for Java</th></tr>
@@ -183,7 +189,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client-gson">https://github.com/google/google-api-java-client/google-api-client-gson</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.api-client:google-api-client:jar:${project.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google APIs Client Library for Java</th></tr>
@@ -193,7 +199,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">https://github.com/google/google-api-java-client/google-api-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -213,7 +219,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
+<li>com.google.http-client:google-http-client-jackson2:jar:${project.http.version} (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson 2 extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -232,7 +238,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Core Jackson processing abstractions (aka Streaming API), implementation for JSON</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/FasterXML/jackson-core">https://github.com/FasterXML/jackson-core</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.guava:guava:jar:20.0 (compile) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (compile) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -246,7 +252,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     per the JSR-305 spec.</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/guava/guava">https://github.com/google/guava/guava</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-gson:jar:1.25.0-SNAPSHOT (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<li>com.google.http-client:google-http-client-gson:jar:${project.http.version} (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>GSON extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -256,7 +262,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-gson">https://github.com/google/google-http-java-client/google-http-client-gson</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -267,7 +273,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">https://github.com/google/google-http-java-client/google-http-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpclient:jar:4.5.3 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>org.apache.httpcomponents:httpclient:jar:4.5.5 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpClient</th></tr>
@@ -277,7 +283,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">http://hc.apache.org/httpcomponents-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpcore:jar:4.4.6 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>org.apache.httpcomponents:httpcore:jar:4.4.9 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpCore</th></tr>
@@ -296,7 +302,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     well known logging systems.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">http://commons.apache.org/proper/commons-logging/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>commons-codec:commons-codec:jar:1.9 (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<li>commons-codec:commons-codec:jar:1.10 (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache Commons Codec</th></tr>
@@ -307,20 +313,30 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">http://commons.apache.org/proper/commons-codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.code.gson:gson:jar:2.1 (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.code.gson:gson:jar:2.1 (compile) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Gson</th></tr>
 <tr class="b">
 <td>
 <p><b>Description: </b>Google Gson library</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/p/google-gson/">http://code.google.com/p/google-gson/</a></p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/gson/">gson</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li></ul></div></div><a name="Licenses"></a>
 <div class="section">
 <h2>Licenses<a name="Licenses"></a></h2>
-<p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Codec, Apache Commons Logging, FindBugs-jsr305, GSON extensions to the Google APIs Client Library for Java, GSON extensions to the Google HTTP Client Library for Java., Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Gson, Guava: Google Core Libraries for Java, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core</p></div><a name="Dependency_File_Details"></a>
+<p><b>Apache License, Version 2.0: </b>Apache Commons Codec, Apache HttpClient, Apache HttpCore</p>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, FindBugs-jsr305, GSON extensions to the Google APIs Client Library for Java, GSON extensions to the Google HTTP Client Library for Java., Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Gson, Guava: Google Core Libraries for Java, J2ObjC Annotations, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -341,12 +357,12 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-api-client-1.25.0-SNAPSHOT.jar</td>
-<td>195.26 kB</td>
+<td>google-api-client-${project.version}.jar</td>
+<td>199.67 kB</td>
 <td>141</td>
 <td>110</td>
 <td>22</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
 <td>jsr305-3.0.2.jar</td>
@@ -365,7 +381,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -373,46 +389,54 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-gson-1.25.0-SNAPSHOT.jar</td>
-<td>8.25 kB</td>
+<td>google-http-client-gson-${project.http.version}.jar</td>
+<td>8.40 kB</td>
 <td>14</td>
 <td>6</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-jackson2-1.25.0-SNAPSHOT.jar</td>
-<td>6.53 kB</td>
+<td>google-http-client-jackson2-${project.http.version}.jar</td>
+<td>6.58 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="a">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>commons-codec-1.9.jar</td>
-<td>257.78 kB</td>
-<td>227</td>
-<td>85</td>
+<tr class="b">
+<td>commons-codec-1.10.jar</td>
+<td>277.52 kB</td>
+<td>238</td>
+<td>92</td>
 <td>6</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -420,23 +444,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>httpclient-4.5.3.jar</td>
-<td>730.27 kB</td>
-<td>507</td>
-<td>466</td>
+<tr class="b">
+<td>httpclient-4.5.5.jar</td>
+<td>748.17 kB</td>
+<td>508</td>
+<td>467</td>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>httpcore-4.4.6.jar</td>
-<td>316.23 kB</td>
+<tr class="a">
+<td>httpcore-4.4.9.jar</td>
+<td>317.87 kB</td>
 <td>282</td>
 <td>252</td>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -444,22 +468,22 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="b">
-<td>13</td>
-<td>4.67 MB</td>
-<td>3,682</td>
-<td>3,299</td>
-<td>130</td>
-<td>1.6</td>
-<td>13</td></tr>
 <tr class="a">
-<td>compile: 13</td>
-<td>compile: 4.67 MB</td>
-<td>compile: 3,682</td>
-<td>compile: 3,299</td>
-<td>compile: 130</td>
+<td>14</td>
+<td>4.73 MB</td>
+<td>3,719</td>
+<td>3,321</td>
+<td>131</td>
+<td>1.6</td>
+<td>14</td></tr>
+<tr class="b">
+<td>compile: 14</td>
+<td>compile: 4.73 MB</td>
+<td>compile: 3,719</td>
+<td>compile: 3,321</td>
+<td>compile: 131</td>
 <td>-</td>
-<td>compile: 13</td></tr></table></div><a name="Dependency_Repository_Locations"></a>
+<td>compile: 14</td></tr></table></div><a name="Dependency_Repository_Locations"></a>
 <div class="section">
 <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a></h2>
 <table border="0" class="bodyTable">
@@ -496,7 +520,7 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.api-client:google-api-client:jar:${project.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
@@ -511,75 +535,80 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client-gson:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-gson:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jackson2:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.9</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.10</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.5</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
+<td>org.apache.httpcomponents:httpcore:jar:4.4.9</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="b">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="b">
-<td>13 (compile: 13)</td>
+<tr class="a">
+<td>14 (compile: 14)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2010-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2010-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-api-client-jackson2-dependencies.html b/google-api-client-assembly/dependencies/google-api-client-jackson2-dependencies.html
index fa3757cc3..0ef972913 100644
--- a/google-api-client-assembly/dependencies/google-api-client-jackson2-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-api-client-jackson2-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,13 +63,13 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.api-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">google-api-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">google-http-client-jackson2</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div></div><a name="Project_Transitive_Dependencies"></a>
 <div class="section">
@@ -100,43 +100,49 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="a">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">commons-codec</a></td>
-<td>1.9</td>
+<td>1.10</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
-<td>4.5.3</td>
+<td>4.5.5</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
-<td>4.4.6</td>
+<td>4.4.9</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr></table></div></div><a name="Project_Dependency_Graph"></a>
 <div class="section">
@@ -161,7 +167,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.api-client:google-api-client-jackson2:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.api-client:google-api-client-jackson2:jar:${project.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson 2 extensions to the Google APIs Client Library for Java</th></tr>
@@ -171,7 +177,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client-jackson2">https://github.com/google/google-api-java-client/google-api-client-jackson2</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.api-client:google-api-client:jar:${project.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google APIs Client Library for Java</th></tr>
@@ -181,7 +187,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">https://github.com/google/google-api-java-client/google-api-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -201,7 +207,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.guava:guava:jar:20.0 (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -215,7 +221,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     per the JSR-305 spec.</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/guava/guava">https://github.com/google/guava/guava</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT (compile) <img id="_img11" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep10', '_img11' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep10" style="display:none">
+<li>com.google.http-client:google-http-client-jackson2:jar:${project.http.version} (compile) <img id="_img11" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep10', '_img11' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep10" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson 2 extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -225,7 +231,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">https://github.com/google/google-http-java-client/google-http-client-jackson2</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -236,7 +242,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">https://github.com/google/google-http-java-client/google-http-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpclient:jar:4.5.3 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<li>org.apache.httpcomponents:httpclient:jar:4.5.5 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpClient</th></tr>
@@ -246,7 +252,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">http://hc.apache.org/httpcomponents-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpcore:jar:4.4.6 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>org.apache.httpcomponents:httpcore:jar:4.4.9 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpCore</th></tr>
@@ -265,7 +271,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     well known logging systems.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">http://commons.apache.org/proper/commons-logging/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>commons-codec:commons-codec:jar:1.9 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>commons-codec:commons-codec:jar:1.10 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache Commons Codec</th></tr>
@@ -276,8 +282,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">http://commons.apache.org/proper/commons-codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson-core</th></tr>
@@ -288,8 +304,8 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li></ul></div></div><a name="Licenses"></a>
 <div class="section">
 <h2>Licenses<a name="Licenses"></a></h2>
-<p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Codec, Apache Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, Jackson 2 extensions to the Google APIs Client Library for Java, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core</p></div><a name="Dependency_File_Details"></a>
+<p><b>Apache License, Version 2.0: </b>Apache Commons Codec, Apache HttpClient, Apache HttpCore</p>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, Jackson 2 extensions to the Google APIs Client Library for Java, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -310,12 +326,12 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-api-client-1.25.0-SNAPSHOT.jar</td>
-<td>195.26 kB</td>
+<td>google-api-client-${project.version}.jar</td>
+<td>199.67 kB</td>
 <td>141</td>
 <td>110</td>
 <td>22</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
 <td>jsr305-3.0.2.jar</td>
@@ -326,7 +342,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -334,38 +350,46 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-jackson2-1.25.0-SNAPSHOT.jar</td>
-<td>6.53 kB</td>
+<td>google-http-client-jackson2-${project.http.version}.jar</td>
+<td>6.58 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="a">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>commons-codec-1.9.jar</td>
-<td>257.78 kB</td>
-<td>227</td>
-<td>85</td>
+<tr class="b">
+<td>commons-codec-1.10.jar</td>
+<td>277.52 kB</td>
+<td>238</td>
+<td>92</td>
 <td>6</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -373,23 +397,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>httpclient-4.5.3.jar</td>
-<td>730.27 kB</td>
-<td>507</td>
-<td>466</td>
+<tr class="b">
+<td>httpclient-4.5.5.jar</td>
+<td>748.17 kB</td>
+<td>508</td>
+<td>467</td>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>httpcore-4.4.6.jar</td>
-<td>316.23 kB</td>
+<tr class="a">
+<td>httpcore-4.4.9.jar</td>
+<td>317.87 kB</td>
 <td>282</td>
 <td>252</td>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -397,22 +421,22 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="b">
-<td>11</td>
-<td>4.49 MB</td>
-<td>3,510</td>
-<td>3,145</td>
-<td>123</td>
-<td>1.6</td>
-<td>11</td></tr>
 <tr class="a">
-<td>compile: 11</td>
-<td>compile: 4.49 MB</td>
-<td>compile: 3,510</td>
-<td>compile: 3,145</td>
-<td>compile: 123</td>
+<td>12</td>
+<td>4.55 MB</td>
+<td>3,547</td>
+<td>3,167</td>
+<td>124</td>
+<td>1.6</td>
+<td>12</td></tr>
+<tr class="b">
+<td>compile: 12</td>
+<td>compile: 4.55 MB</td>
+<td>compile: 3,547</td>
+<td>compile: 3,167</td>
+<td>compile: 124</td>
 <td>-</td>
-<td>compile: 11</td></tr></table></div><a name="Dependency_Repository_Locations"></a>
+<td>compile: 12</td></tr></table></div><a name="Dependency_Repository_Locations"></a>
 <div class="section">
 <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a></h2>
 <table border="0" class="bodyTable">
@@ -449,7 +473,7 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.api-client:google-api-client:jar:${project.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
@@ -459,70 +483,75 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jackson2:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.9</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.10</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.5</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
+<td>org.apache.httpcomponents:httpcore:jar:4.4.9</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="b">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="b">
-<td>11 (compile: 11)</td>
+<tr class="a">
+<td>12 (compile: 12)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2010-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2010-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-api-client-java6-dependencies.html b/google-api-client-assembly/dependencies/google-api-client-java6-dependencies.html
index 3d6d70a21..d66494160 100644
--- a/google-api-client-assembly/dependencies/google-api-client-java6-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-api-client-java6-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,13 +63,13 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.api-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">google-api-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-java6">google-oauth-client-java6</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
 <div class="section">
@@ -116,49 +116,55 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">google-http-client-jackson2</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">commons-codec</a></td>
-<td>1.9</td>
+<td>1.10</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
-<td>4.5.3</td>
+<td>4.5.5</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
-<td>4.4.6</td>
+<td>4.4.9</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr></table></div></div><a name="Project_Dependency_Graph"></a>
 <div class="section">
@@ -183,7 +189,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.api-client:google-api-client-java6:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.api-client:google-api-client-java6:jar:${project.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Java 6 (and higher) Extensions to the Google API Client Library for Java.</th></tr>
@@ -193,7 +199,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client-java6">https://github.com/google/google-api-java-client/google-api-client-java6</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.api-client:google-api-client:jar:${project.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google APIs Client Library for Java</th></tr>
@@ -203,7 +209,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">https://github.com/google/google-api-java-client/google-api-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -214,7 +220,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">https://github.com/google/google-oauth-java-client/google-oauth-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img7" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep6', '_img7' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep6" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img7" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep6', '_img7' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep6" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -225,7 +231,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">https://github.com/google/google-http-java-client/google-http-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpclient:jar:4.5.3 (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
+<li>org.apache.httpcomponents:httpclient:jar:4.5.5 (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpClient</th></tr>
@@ -235,7 +241,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">http://hc.apache.org/httpcomponents-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpcore:jar:4.4.6 (compile) <img id="_img11" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep10', '_img11' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep10" style="display:none">
+<li>org.apache.httpcomponents:httpcore:jar:4.4.9 (compile) <img id="_img11" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep10', '_img11' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep10" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpCore</th></tr>
@@ -254,7 +260,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     well known logging systems.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">http://commons.apache.org/proper/commons-logging/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>commons-codec:commons-codec:jar:1.9 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<li>commons-codec:commons-codec:jar:1.10 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache Commons Codec</th></tr>
@@ -265,8 +271,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">http://commons.apache.org/proper/commons-codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>FindBugs-jsr305</th></tr>
@@ -275,7 +291,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>com.google.http-client:google-http-client-jackson2:jar:${project.http.version} (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson 2 extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -285,7 +301,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">https://github.com/google/google-http-java-client/google-http-client-jackson2</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson-core</th></tr>
@@ -294,7 +310,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Core Jackson processing abstractions (aka Streaming API), implementation for JSON</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/FasterXML/jackson-core">https://github.com/FasterXML/jackson-core</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.guava:guava:jar:20.0 (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -308,7 +324,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     per the JSR-305 spec.</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/guava/guava">https://github.com/google/guava/guava</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.oauth-client:google-oauth-client-java6:jar:1.25.0-SNAPSHOT (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<li>com.google.oauth-client:google-oauth-client-java6:jar:${project.oauth.version} (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Java 6 (and higher) extensions to the Google OAuth Client Library for Java.</th></tr>
@@ -317,7 +333,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-java6">https://github.com/google/google-oauth-java-client/google-oauth-client-java6</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -328,9 +344,9 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li></ul></li></ul></div></div><a name="Licenses"></a>
 <div class="section">
 <h2>Licenses<a name="Licenses"></a></h2>
-<p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
+<p><b>Apache License, Version 2.0: </b>Apache Commons Codec, Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Codec, Apache Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, Java 6 (and higher) Extensions to the Google API Client Library for Java., Java 6 (and higher) extensions to the Google OAuth Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, Java 6 (and higher) Extensions to the Google API Client Library for Java., Java 6 (and higher) extensions to the Google OAuth Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -351,12 +367,12 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-api-client-1.25.0-SNAPSHOT.jar</td>
-<td>195.26 kB</td>
+<td>google-api-client-${project.version}.jar</td>
+<td>199.67 kB</td>
 <td>141</td>
 <td>110</td>
 <td>22</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
 <td>jsr305-3.0.2.jar</td>
@@ -367,7 +383,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -375,46 +391,54 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-jackson2-1.25.0-SNAPSHOT.jar</td>
-<td>6.53 kB</td>
+<td>google-http-client-jackson2-${project.http.version}.jar</td>
+<td>6.58 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="a">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>google-oauth-client-java6-1.25.0-SNAPSHOT.jar</td>
-<td>10.97 kB</td>
-<td>16</td>
-<td>6</td>
+<tr class="b">
+<td>google-oauth-client-java6-${project.oauth.version}.jar</td>
+<td>12.66 kB</td>
+<td>18</td>
+<td>8</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>commons-codec-1.9.jar</td>
-<td>257.78 kB</td>
-<td>227</td>
-<td>85</td>
+<tr class="a">
+<td>commons-codec-1.10.jar</td>
+<td>277.52 kB</td>
+<td>238</td>
+<td>92</td>
 <td>6</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -422,7 +446,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -430,23 +454,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>httpclient-4.5.3.jar</td>
-<td>730.27 kB</td>
-<td>507</td>
-<td>466</td>
+<tr class="b">
+<td>httpclient-4.5.5.jar</td>
+<td>748.17 kB</td>
+<td>508</td>
+<td>467</td>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>httpcore-4.4.6.jar</td>
-<td>316.23 kB</td>
+<tr class="a">
+<td>httpcore-4.4.9.jar</td>
+<td>317.87 kB</td>
 <td>282</td>
 <td>252</td>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -454,23 +478,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="b">
-<td>13</td>
-<td>4.73 MB</td>
-<td>3,793</td>
-<td>3,381</td>
-<td>154</td>
-<td>1.6</td>
-<td>13</td></tr>
 <tr class="a">
-<td>compile: 12</td>
-<td>compile: 4.50 MB</td>
-<td>compile: 3,526</td>
-<td>compile: 3,151</td>
-<td>compile: 124</td>
-<td>-</td>
-<td>compile: 12</td></tr>
+<td>14</td>
+<td>4.79 MB</td>
+<td>3,832</td>
+<td>3,405</td>
+<td>155</td>
+<td>1.6</td>
+<td>14</td></tr>
 <tr class="b">
+<td>compile: 13</td>
+<td>compile: 4.56 MB</td>
+<td>compile: 3,565</td>
+<td>compile: 3,175</td>
+<td>compile: 125</td>
+<td>-</td>
+<td>compile: 13</td></tr>
+<tr class="a">
 <td>test: 1</td>
 <td>test: 231.78 kB</td>
 <td>test: 267</td>
@@ -514,7 +538,7 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.api-client:google-api-client:jar:${project.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
@@ -524,80 +548,85 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jackson2:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.oauth-client:google-oauth-client-java6:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-codec:commons-codec:jar:1.9</td>
+<td>com.google.oauth-client:google-oauth-client-java6:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.10</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.5</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
+<td>org.apache.httpcomponents:httpcore:jar:4.4.9</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="b">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="b">
-<td>13 (compile: 12, test: 1)</td>
+<tr class="a">
+<td>14 (compile: 13, test: 1)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2010-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2010-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-api-client-protobuf-dependencies.html b/google-api-client-assembly/dependencies/google-api-client-protobuf-dependencies.html
index 597458265..3504c1725 100644
--- a/google-api-client-assembly/dependencies/google-api-client-protobuf-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-api-client-protobuf-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,13 +63,13 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.api-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">google-api-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-protobuf">google-http-client-protobuf</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
 <div class="section">
@@ -116,55 +116,61 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">google-http-client-jackson2</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>com.google.protobuf</td>
 <td><a class="externalLink" href="https://developers.google.com/protocol-buffers/">protobuf-java</a></td>
 <td>2.6.1</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.opensource.org/licenses/bsd-license.php">New BSD license</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">commons-codec</a></td>
-<td>1.9</td>
+<td>1.10</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
-<td>4.5.3</td>
+<td>4.5.5</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
-<td>4.4.6</td>
+<td>4.4.9</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr></table></div></div><a name="Project_Dependency_Graph"></a>
 <div class="section">
@@ -189,7 +195,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.api-client:google-api-client-protobuf:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.api-client:google-api-client-protobuf:jar:${project.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Protocol Buffer extensions to the Google APIs Client Library for Java</th></tr>
@@ -199,7 +205,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client-protobuf">https://github.com/google/google-api-java-client/google-api-client-protobuf</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client-protobuf:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.http-client:google-http-client-protobuf:jar:${project.http.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Protocol Buffer extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -209,7 +215,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-protobuf">https://github.com/google/google-http-java-client/google-http-client-protobuf</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -229,7 +235,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>org.apache.httpcomponents:httpclient:jar:4.5.3 (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
+<li>org.apache.httpcomponents:httpclient:jar:4.5.5 (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpClient</th></tr>
@@ -239,7 +245,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">http://hc.apache.org/httpcomponents-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpcore:jar:4.4.6 (compile) <img id="_img11" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep10', '_img11' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep10" style="display:none">
+<li>org.apache.httpcomponents:httpcore:jar:4.4.9 (compile) <img id="_img11" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep10', '_img11' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep10" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpCore</th></tr>
@@ -258,7 +264,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     well known logging systems.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">http://commons.apache.org/proper/commons-logging/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>commons-codec:commons-codec:jar:1.9 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<li>commons-codec:commons-codec:jar:1.10 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache Commons Codec</th></tr>
@@ -269,8 +275,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">http://commons.apache.org/proper/commons-codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.protobuf:protobuf-java:jar:2.6.1 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.protobuf:protobuf-java:jar:2.6.1 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Protocol Buffer Java API</th></tr>
@@ -280,7 +296,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     extensible format.</p>
 <p><b>URL: </b><a class="externalLink" href="https://developers.google.com/protocol-buffers/">https://developers.google.com/protocol-buffers/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/bsd-license.php">New BSD license</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>com.google.api-client:google-api-client:jar:${project.version} (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google APIs Client Library for Java</th></tr>
@@ -290,7 +306,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">https://github.com/google/google-api-java-client/google-api-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -300,7 +316,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     including Java 5 (or higher) desktop (SE) and web (EE), Android, and Google App Engine.</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">https://github.com/google/google-oauth-java-client/google-oauth-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<li>com.google.http-client:google-http-client-jackson2:jar:${project.http.version} (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson 2 extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -310,7 +326,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">https://github.com/google/google-http-java-client/google-http-client-jackson2</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson-core</th></tr>
@@ -319,7 +335,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Core Jackson processing abstractions (aka Streaming API), implementation for JSON</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/FasterXML/jackson-core">https://github.com/FasterXML/jackson-core</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.guava:guava:jar:20.0 (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (compile) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -333,7 +349,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     per the JSR-305 spec.</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/guava/guava">https://github.com/google/guava/guava</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -345,9 +361,9 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <div class="section">
 <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>New BSD license: </b>Protocol Buffer Java API</p>
-<p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
+<p><b>Apache License, Version 2.0: </b>Apache Commons Codec, Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Codec, Apache Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, Protocol Buffer extensions to the Google APIs Client Library for Java, Protocol Buffer extensions to the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, Protocol Buffer extensions to the Google APIs Client Library for Java, Protocol Buffer extensions to the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -368,12 +384,12 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-api-client-1.25.0-SNAPSHOT.jar</td>
-<td>195.26 kB</td>
+<td>google-api-client-${project.version}.jar</td>
+<td>199.67 kB</td>
 <td>141</td>
 <td>110</td>
 <td>22</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
 <td>jsr305-3.0.2.jar</td>
@@ -384,7 +400,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -392,38 +408,46 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-jackson2-1.25.0-SNAPSHOT.jar</td>
-<td>6.53 kB</td>
+<td>google-http-client-jackson2-${project.http.version}.jar</td>
+<td>6.58 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-protobuf-1.25.0-SNAPSHOT.jar</td>
-<td>5.04 kB</td>
+<td>google-http-client-protobuf-${project.http.version}.jar</td>
+<td>5.17 kB</td>
 <td>14</td>
 <td>5</td>
 <td>2</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="b">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>protobuf-java-2.6.1.jar</td>
 <td>582.66 kB</td>
 <td>286</td>
@@ -431,15 +455,15 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>commons-codec-1.9.jar</td>
-<td>257.78 kB</td>
-<td>227</td>
-<td>85</td>
+<tr class="b">
+<td>commons-codec-1.10.jar</td>
+<td>277.52 kB</td>
+<td>238</td>
+<td>92</td>
 <td>6</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -447,7 +471,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -455,23 +479,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>httpclient-4.5.3.jar</td>
-<td>730.27 kB</td>
-<td>507</td>
-<td>466</td>
+<tr class="a">
+<td>httpclient-4.5.5.jar</td>
+<td>748.17 kB</td>
+<td>508</td>
+<td>467</td>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>httpcore-4.4.6.jar</td>
-<td>316.23 kB</td>
+<tr class="b">
+<td>httpcore-4.4.9.jar</td>
+<td>317.87 kB</td>
 <td>282</td>
 <td>252</td>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -479,23 +503,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>14</td>
-<td>5.29 MB</td>
-<td>4,077</td>
-<td>3,656</td>
-<td>156</td>
-<td>1.6</td>
-<td>14</td></tr>
 <tr class="b">
-<td>compile: 13</td>
-<td>compile: 5.06 MB</td>
-<td>compile: 3,810</td>
-<td>compile: 3,426</td>
-<td>compile: 126</td>
-<td>-</td>
-<td>compile: 13</td></tr>
+<td>15</td>
+<td>5.35 MB</td>
+<td>4,114</td>
+<td>3,678</td>
+<td>157</td>
+<td>1.6</td>
+<td>15</td></tr>
 <tr class="a">
+<td>compile: 14</td>
+<td>compile: 5.13 MB</td>
+<td>compile: 3,847</td>
+<td>compile: 3,448</td>
+<td>compile: 127</td>
+<td>-</td>
+<td>compile: 14</td></tr>
+<tr class="b">
 <td>test: 1</td>
 <td>test: 231.78 kB</td>
 <td>test: 267</td>
@@ -539,7 +563,7 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.api-client:google-api-client:jar:${project.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
@@ -549,85 +573,90 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jackson2:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client-protobuf:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-protobuf:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.protobuf:protobuf-java:jar:2.6.1</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.9</td>
+<td>com.google.protobuf:protobuf-java:jar:2.6.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.10</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.5</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
+<td>org.apache.httpcomponents:httpcore:jar:4.4.9</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="a">
-<td>14 (compile: 13, test: 1)</td>
+<tr class="b">
+<td>15 (compile: 14, test: 1)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2010-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2010-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-api-client-servlet-dependencies.html b/google-api-client-assembly/dependencies/google-api-client-servlet-dependencies.html
index c45d1dc60..a3de8b1f2 100644
--- a/google-api-client-assembly/dependencies/google-api-client-servlet-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-api-client-servlet-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,13 +63,13 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.api-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">google-api-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-servlet">google-oauth-client-servlet</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
@@ -128,61 +128,67 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">google-http-client-jackson2</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jdo">google-http-client-jdo</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="a">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">commons-codec</a></td>
-<td>1.9</td>
+<td>1.10</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>javax.transaction</td>
 <td>transaction-api</td>
 <td>1.1</td>
 <td>jar</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
-<td>4.5.3</td>
+<td>4.5.5</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
-<td>4.4.6</td>
+<td>4.4.9</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr></table></div></div><a name="Project_Dependency_Graph"></a>
 <div class="section">
@@ -207,7 +213,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.api-client:google-api-client-servlet:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.api-client:google-api-client-servlet:jar:${project.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Servlet and JDO extensions to the Google API Client Library for Java.</th></tr>
@@ -217,7 +223,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client-servlet">https://github.com/google/google-api-java-client/google-api-client-servlet</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client-servlet:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.oauth-client:google-oauth-client-servlet:jar:${project.oauth.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Servlet and JDO extensions to the Google OAuth Client Library for Java.</th></tr>
@@ -227,7 +233,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-servlet">https://github.com/google/google-oauth-java-client/google-oauth-client-servlet</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -238,7 +244,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">https://github.com/google/google-oauth-java-client/google-oauth-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img7" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep6', '_img7' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep6" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img7" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep6', '_img7' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep6" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -249,7 +255,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">https://github.com/google/google-http-java-client/google-http-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpclient:jar:4.5.3 (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
+<li>org.apache.httpcomponents:httpclient:jar:4.5.5 (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpClient</th></tr>
@@ -259,7 +265,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">http://hc.apache.org/httpcomponents-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpcore:jar:4.4.6 (compile) <img id="_img11" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep10', '_img11' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep10" style="display:none">
+<li>org.apache.httpcomponents:httpcore:jar:4.4.9 (compile) <img id="_img11" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep10', '_img11' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep10" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpCore</th></tr>
@@ -278,7 +284,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     well known logging systems.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">http://commons.apache.org/proper/commons-logging/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>commons-codec:commons-codec:jar:1.9 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<li>commons-codec:commons-codec:jar:1.10 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache Commons Codec</th></tr>
@@ -289,8 +295,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">http://commons.apache.org/proper/commons-codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>FindBugs-jsr305</th></tr>
@@ -299,7 +315,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-jdo:jar:1.25.0-SNAPSHOT (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>com.google.http-client:google-http-client-jdo:jar:${project.http.version} (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JDO extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -308,7 +324,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jdo">https://github.com/google/google-http-java-client/google-http-client-jdo</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>com.google.api-client:google-api-client:jar:${project.version} (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google APIs Client Library for Java</th></tr>
@@ -318,7 +334,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">https://github.com/google/google-api-java-client/google-api-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<li>com.google.http-client:google-http-client-jackson2:jar:${project.http.version} (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson 2 extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -328,7 +344,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">https://github.com/google/google-http-java-client/google-http-client-jackson2</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson-core</th></tr>
@@ -337,7 +353,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Core Jackson processing abstractions (aka Streaming API), implementation for JSON</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/FasterXML/jackson-core">https://github.com/FasterXML/jackson-core</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.guava:guava:jar:20.0 (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (compile) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -351,7 +367,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     per the JSR-305 spec.</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/guava/guava">https://github.com/google/guava/guava</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -360,7 +376,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>javax.servlet:servlet-api:jar:2.5 (compile) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
+<li>javax.servlet:servlet-api:jar:2.5 (compile) <img id="_img33" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep32', '_img33' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep32" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>servlet-api</th></tr>
@@ -368,7 +384,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <td>
 <p><b>Description: </b>There is currently no description associated with this project.</p>
 <p><b>Project License: </b>No license is defined for this project.</p></td></tr></table></div></li>
-<li>javax.jdo:jdo2-api:jar:2.3-eb (compile) <img id="_img33" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep32', '_img33' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep32" style="display:none">
+<li>javax.jdo:jdo2-api:jar:2.3-eb (compile) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JDO2 API</th></tr>
@@ -378,7 +394,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://db.apache.org/jdo/index.html">http://db.apache.org/jdo/index.html</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2</a></p></td></tr></table></div>
 <ul>
-<li>javax.transaction:transaction-api:jar:1.1 (compile) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
+<li>javax.transaction:transaction-api:jar:1.1 (compile) <img id="_img37" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep36', '_img37' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep36" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>transaction-api</th></tr>
@@ -390,9 +406,9 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Apache 2: </b>JDO2 API</p>
 <p><b>Unknown: </b>servlet-api, transaction-api</p>
-<p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
+<p><b>Apache License, Version 2.0: </b>Apache Commons Codec, Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Codec, Apache Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, JDO extensions to the Google HTTP Client Library for Java., Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, Servlet and JDO extensions to the Google API Client Library for Java., Servlet and JDO extensions to the Google OAuth Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, JDO extensions to the Google HTTP Client Library for Java., Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, Servlet and JDO extensions to the Google API Client Library for Java., Servlet and JDO extensions to the Google OAuth Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -413,12 +429,12 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-api-client-1.25.0-SNAPSHOT.jar</td>
-<td>195.26 kB</td>
+<td>google-api-client-${project.version}.jar</td>
+<td>199.67 kB</td>
 <td>141</td>
 <td>110</td>
 <td>22</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
 <td>jsr305-3.0.2.jar</td>
@@ -429,7 +445,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -437,54 +453,62 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-jackson2-1.25.0-SNAPSHOT.jar</td>
-<td>6.53 kB</td>
+<td>google-http-client-jackson2-${project.http.version}.jar</td>
+<td>6.58 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-jdo-1.25.0-SNAPSHOT.jar</td>
-<td>7.79 kB</td>
+<td>google-http-client-jdo-${project.http.version}.jar</td>
+<td>8.08 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="b">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>google-oauth-client-servlet-1.25.0-SNAPSHOT.jar</td>
-<td>22.04 kB</td>
+<tr class="a">
+<td>google-oauth-client-servlet-${project.oauth.version}.jar</td>
+<td>22.92 kB</td>
 <td>24</td>
 <td>11</td>
 <td>4</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>commons-codec-1.9.jar</td>
-<td>257.78 kB</td>
-<td>227</td>
-<td>85</td>
+<tr class="b">
+<td>commons-codec-1.10.jar</td>
+<td>277.52 kB</td>
+<td>238</td>
+<td>92</td>
 <td>6</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -492,7 +516,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>jdo2-api-2.3-eb.jar</td>
 <td>188.18 kB</td>
 <td>226</td>
@@ -500,7 +524,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>7</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>servlet-api-2.5.jar</td>
 <td>102.65 kB</td>
 <td>68</td>
@@ -508,7 +532,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>transaction-api-1.1.jar</td>
 <td>14.72 kB</td>
 <td>24</td>
@@ -516,7 +540,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.3</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -524,23 +548,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>httpclient-4.5.3.jar</td>
-<td>730.27 kB</td>
-<td>507</td>
-<td>466</td>
+<tr class="b">
+<td>httpclient-4.5.5.jar</td>
+<td>748.17 kB</td>
+<td>508</td>
+<td>467</td>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>httpcore-4.4.6.jar</td>
-<td>316.23 kB</td>
+<tr class="a">
+<td>httpcore-4.4.9.jar</td>
+<td>317.87 kB</td>
 <td>282</td>
 <td>252</td>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -548,23 +572,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="b">
-<td>17</td>
-<td>5.04 MB</td>
-<td>4,132</td>
-<td>3,633</td>
-<td>169</td>
-<td>1.6</td>
-<td>17</td></tr>
 <tr class="a">
-<td>compile: 16</td>
-<td>compile: 4.82 MB</td>
-<td>compile: 3,865</td>
-<td>compile: 3,403</td>
-<td>compile: 139</td>
-<td>-</td>
-<td>compile: 16</td></tr>
+<td>18</td>
+<td>5.11 MB</td>
+<td>4,169</td>
+<td>3,655</td>
+<td>170</td>
+<td>1.6</td>
+<td>18</td></tr>
 <tr class="b">
+<td>compile: 17</td>
+<td>compile: 4.88 MB</td>
+<td>compile: 3,902</td>
+<td>compile: 3,425</td>
+<td>compile: 140</td>
+<td>-</td>
+<td>compile: 17</td></tr>
+<tr class="a">
 <td>test: 1</td>
 <td>test: 231.78 kB</td>
 <td>test: 267</td>
@@ -608,7 +632,7 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.api-client:google-api-client:jar:${project.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
@@ -618,100 +642,105 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jackson2:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client-jdo:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jdo:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.oauth-client:google-oauth-client-servlet:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.9</td>
+<td>com.google.oauth-client:google-oauth-client-servlet:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.10</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>javax.jdo:jdo2-api:jar:2.3-eb</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>javax.servlet:servlet-api:jar:2.5</td>
+<td>javax.jdo:jdo2-api:jar:2.3-eb</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>javax.transaction:transaction-api:jar:1.1</td>
+<td>javax.servlet:servlet-api:jar:2.5</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>junit:junit:jar:4.8.2</td>
+<td>javax.transaction:transaction-api:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.5</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
+<td>org.apache.httpcomponents:httpcore:jar:4.4.9</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="b">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="b">
-<td>17 (compile: 16, test: 1)</td>
+<tr class="a">
+<td>18 (compile: 17, test: 1)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2010-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2010-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-api-client-xml-dependencies.html b/google-api-client-assembly/dependencies/google-api-client-xml-dependencies.html
index 73dfa340e..7b931b1de 100644
--- a/google-api-client-assembly/dependencies/google-api-client-xml-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-api-client-xml-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,13 +63,13 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.api-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">google-api-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-xml">google-http-client-xml</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
 <div class="section">
@@ -116,52 +116,58 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">google-http-client-jackson2</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">commons-codec</a></td>
-<td>1.9</td>
+<td>1.10</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
-<td>4.5.3</td>
+<td>4.5.5</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
-<td>4.4.6</td>
+<td>4.4.9</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>xpp3</td>
 <td><a class="externalLink" href="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/">xpp3</a></td>
 <td>1.1.4c</td>
@@ -189,7 +195,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.api-client:google-api-client-xml:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.api-client:google-api-client-xml:jar:${project.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>XML extensions to the Google APIs Client Library for Java</th></tr>
@@ -199,7 +205,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client-xml">https://github.com/google/google-api-java-client/google-api-client-xml</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.api-client:google-api-client:jar:${project.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google APIs Client Library for Java</th></tr>
@@ -209,7 +215,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-api-java-client/google-api-client">https://github.com/google/google-api-java-client/google-api-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -229,7 +235,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
+<li>com.google.http-client:google-http-client-jackson2:jar:${project.http.version} (compile) <img id="_img9" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep8', '_img9' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep8" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson 2 extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -248,7 +254,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Core Jackson processing abstractions (aka Streaming API), implementation for JSON</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/FasterXML/jackson-core">https://github.com/FasterXML/jackson-core</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.guava:guava:jar:20.0 (compile) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (compile) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -262,7 +268,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     per the JSR-305 spec.</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/guava/guava">https://github.com/google/guava/guava</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-xml:jar:1.25.0-SNAPSHOT (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<li>com.google.http-client:google-http-client-xml:jar:${project.http.version} (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>XML extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -272,7 +278,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-xml">https://github.com/google/google-http-java-client/google-http-client-xml</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -283,7 +289,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">https://github.com/google/google-http-java-client/google-http-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpclient:jar:4.5.3 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>org.apache.httpcomponents:httpclient:jar:4.5.5 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpClient</th></tr>
@@ -293,7 +299,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">http://hc.apache.org/httpcomponents-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.apache.httpcomponents:httpcore:jar:4.4.6 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>org.apache.httpcomponents:httpcore:jar:4.4.9 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache HttpCore</th></tr>
@@ -312,7 +318,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     well known logging systems.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">http://commons.apache.org/proper/commons-logging/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>commons-codec:commons-codec:jar:1.9 (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<li>commons-codec:commons-codec:jar:1.10 (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Apache Commons Codec</th></tr>
@@ -323,8 +329,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/proper/commons-codec/">http://commons.apache.org/proper/commons-codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>xpp3:xpp3:jar:1.1.4c (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>xpp3:xpp3:jar:1.1.4c (compile) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>MXP1: Xml Pull Parser 3rd Edition (XPP3)</th></tr>
@@ -333,7 +349,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>MXP1 is a stable XmlPull parsing engine that is based on ideas from XPP and in particular XPP2 but completely revised and rewritten to take the best advantage of latest JIT JVMs such as Hotspot in JDK 1.4+.</p>
 <p><b>URL: </b><a class="externalLink" href="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/">http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt">Indiana University Extreme! Lab Software License, vesion 1.1.1</a><a class="externalLink" href="http://creativecommons.org/licenses/publicdomain">Public Domain</a><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-1.1">Apache Software License, version 1.1</a></p></td></tr></table></div></li></ul></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -346,9 +362,9 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Apache Software License, version 1.1: </b>MXP1: Xml Pull Parser 3rd Edition (XPP3)</p>
 <p><b>Public Domain: </b>MXP1: Xml Pull Parser 3rd Edition (XPP3)</p>
-<p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
+<p><b>Apache License, Version 2.0: </b>Apache Commons Codec, Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Codec, Apache Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, XML extensions to the Google APIs Client Library for Java, XML extensions to the Google HTTP Client Library for Java.</p>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, FindBugs-jsr305, Google APIs Client Library for Java, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, XML extensions to the Google APIs Client Library for Java, XML extensions to the Google HTTP Client Library for Java.</p>
 <p><b>Indiana University Extreme! Lab Software License, vesion 1.1.1: </b>MXP1: Xml Pull Parser 3rd Edition (XPP3)</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
@@ -370,12 +386,12 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-api-client-1.25.0-SNAPSHOT.jar</td>
-<td>195.26 kB</td>
+<td>google-api-client-${project.version}.jar</td>
+<td>199.67 kB</td>
 <td>141</td>
 <td>110</td>
 <td>22</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
 <td>jsr305-3.0.2.jar</td>
@@ -386,7 +402,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -394,46 +410,54 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-jackson2-1.25.0-SNAPSHOT.jar</td>
-<td>6.53 kB</td>
+<td>google-http-client-jackson2-${project.http.version}.jar</td>
+<td>6.58 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-xml-1.25.0-SNAPSHOT.jar</td>
-<td>26.94 kB</td>
+<td>google-http-client-xml-${project.http.version}.jar</td>
+<td>28.52 kB</td>
 <td>28</td>
 <td>17</td>
 <td>4</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="b">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>commons-codec-1.9.jar</td>
-<td>257.78 kB</td>
-<td>227</td>
-<td>85</td>
+<tr class="a">
+<td>commons-codec-1.10.jar</td>
+<td>277.52 kB</td>
+<td>238</td>
+<td>92</td>
 <td>6</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -441,7 +465,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -449,23 +473,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>httpclient-4.5.3.jar</td>
-<td>730.27 kB</td>
-<td>507</td>
-<td>466</td>
+<tr class="b">
+<td>httpclient-4.5.5.jar</td>
+<td>748.17 kB</td>
+<td>508</td>
+<td>467</td>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
-<td>httpcore-4.4.6.jar</td>
-<td>316.23 kB</td>
+<tr class="a">
+<td>httpcore-4.4.9.jar</td>
+<td>317.87 kB</td>
 <td>282</td>
 <td>252</td>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>xpp3-1.1.4c.jar</td>
 <td>117.25 kB</td>
 <td>78</td>
@@ -473,7 +497,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>13</td>
 <td>1.1</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -481,23 +505,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>14</td>
-<td>4.86 MB</td>
-<td>3,883</td>
-<td>3,448</td>
-<td>170</td>
-<td>1.6</td>
-<td>14</td></tr>
 <tr class="b">
-<td>compile: 13</td>
-<td>compile: 4.63 MB</td>
-<td>compile: 3,616</td>
-<td>compile: 3,218</td>
-<td>compile: 140</td>
-<td>-</td>
-<td>compile: 13</td></tr>
+<td>15</td>
+<td>4.92 MB</td>
+<td>3,920</td>
+<td>3,470</td>
+<td>171</td>
+<td>1.6</td>
+<td>15</td></tr>
 <tr class="a">
+<td>compile: 14</td>
+<td>compile: 4.69 MB</td>
+<td>compile: 3,653</td>
+<td>compile: 3,240</td>
+<td>compile: 141</td>
+<td>-</td>
+<td>compile: 14</td></tr>
+<tr class="b">
 <td>test: 1</td>
 <td>test: 231.78 kB</td>
 <td>test: 267</td>
@@ -541,7 +565,7 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.api-client:google-api-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.api-client:google-api-client:jar:${project.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
@@ -551,85 +575,90 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jackson2:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client-xml:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-xml:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-codec:commons-codec:jar:1.9</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.10</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.5</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>xpp3:xpp3:jar:1.1.4c</td>
+<td>org.apache.httpcomponents:httpcore:jar:4.4.9</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
+<td>xpp3:xpp3:jar:1.1.4c</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="a">
-<td>14 (compile: 13, test: 1)</td>
+<tr class="b">
+<td>15 (compile: 14, test: 1)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2010-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2010-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-http-client-android-dependencies.html b/google-api-client-assembly/dependencies/google-http-client-android-dependencies.html
index cbf64c593..a89a1a136 100644
--- a/google-api-client-assembly/dependencies/google-http-client-android-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-http-client-android-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.http.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,7 +63,7 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_provided"></a>
 <div class="section">
@@ -102,24 +102,30 @@ <h3>compile<a name="compile"></a></h3>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/codec/">commons-codec</a></td>
 <td>1.6</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/logging">commons-logging</a></td>
 <td>1.1.1</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
@@ -181,7 +187,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.http-client:google-http-client-android:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.http-client:google-http-client-android:jar:${project.http.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Android Platform Extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -283,7 +289,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     These properties make JSON an ideal data-interchange language.</p>
 <p><b>URL: </b><a class="externalLink" href="http://www.json.org/java/index.html">http://www.json.org/java/index.html</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.json.org/license.html">provided without support or warranty</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -302,6 +308,16 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <td>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li></ul></div></div><a name="Licenses"></a>
 <div class="section">
 <h2>Licenses<a name="Licenses"></a></h2>
@@ -311,7 +327,7 @@ <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>provided without support or warranty: </b>JSON (JavaScript Object Notation)</p>
 <p><b>Apache 2.0: </b>Google Android Java ME Library (Khronos), Google Android Library</p>
-<p><b>The Apache Software License, Version 2.0: </b>Android Platform Extensions to the Google HTTP Client Library for Java., Commons Codec, Commons Logging, FindBugs-jsr305, Google HTTP Client Library for Java</p>
+<p><b>The Apache Software License, Version 2.0: </b>Android Platform Extensions to the Google HTTP Client Library for Java., Commons Codec, Commons Logging, FindBugs-jsr305, Google HTTP Client Library for Java, J2ObjC Annotations</p>
 <p><b>Indiana University Extreme! Lab Software License, vesion 1.1.1: </b>MXP1: Xml Pull Parser 3rd Edition (XPP3)</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
@@ -341,14 +357,22 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="b">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -356,7 +380,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.1.1.jar</td>
 <td>59.26 kB</td>
 <td>42</td>
@@ -364,7 +388,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.1</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -372,7 +396,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -380,7 +404,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>json-20080701.jar</td>
 <td>36.99 kB</td>
 <td>26</td>
@@ -388,7 +412,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1</td>
 <td>1.3</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>opengl-api-gl1.1-android-2.1_r1.jar</td>
 <td>18.06 kB</td>
 <td>25</td>
@@ -396,7 +420,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>xmlParserAPIs-2.6.2.jar</td>
 <td>121.80 kB</td>
 <td>238</td>
@@ -404,7 +428,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.1</td>
 <td>release</td></tr>
-<tr class="b">
+<tr class="a">
 <td>xpp3-1.1.4c.jar</td>
 <td>117.25 kB</td>
 <td>78</td>
@@ -412,7 +436,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>13</td>
 <td>1.1</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -420,23 +444,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="b">
-<td>11</td>
-<td>14.20 MB</td>
-<td>8,947</td>
-<td>3,046</td>
-<td>172</td>
-<td>1.6</td>
-<td>10</td></tr>
 <tr class="a">
-<td>compile: 6</td>
-<td>compile: 1.57 MB</td>
-<td>compile: 1,316</td>
-<td>compile: 1,055</td>
-<td>compile: 68</td>
-<td>-</td>
-<td>compile: 6</td></tr>
+<td>12</td>
+<td>14.22 MB</td>
+<td>8,972</td>
+<td>3,060</td>
+<td>173</td>
+<td>1.6</td>
+<td>11</td></tr>
 <tr class="b">
+<td>compile: 7</td>
+<td>compile: 1.58 MB</td>
+<td>compile: 1,341</td>
+<td>compile: 1,069</td>
+<td>compile: 69</td>
+<td>-</td>
+<td>compile: 7</td></tr>
+<tr class="a">
 <td>provided: 5</td>
 <td>provided: 12.64 MB</td>
 <td>provided: 7,631</td>
@@ -485,75 +509,80 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.1.1</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>commons-logging:commons-logging:jar:1.1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.json:json:jar:20080701</td>
+<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.khronos:opengl-api:jar:gl1.1-android-2.1_r1</td>
+<td>org.json:json:jar:20080701</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>xerces:xmlParserAPIs:jar:2.6.2</td>
+<td>org.khronos:opengl-api:jar:gl1.1-android-2.1_r1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>xpp3:xpp3:jar:1.1.4c</td>
+<td>xerces:xmlParserAPIs:jar:2.6.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
+<td>xpp3:xpp3:jar:1.1.4c</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="b">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="b">
-<td>11 (compile: 6, provided: 5)</td>
+<tr class="a">
+<td>12 (compile: 7, provided: 5)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-http-client-appengine-dependencies.html b/google-api-client-assembly/dependencies/google-http-client-appengine-dependencies.html
index a3f066752..e716cc897 100644
--- a/google-api-client-assembly/dependencies/google-http-client-appengine-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-http-client-appengine-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.http.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,7 +63,7 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
 <div class="section">
@@ -78,26 +78,26 @@ <h3>test<a name="test"></a></h3>
 <th>License</th></tr>
 <tr class="b">
 <td>com.google.appengine</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/appengine-api-stubs/">appengine-api-stubs</a></td>
+<td><a class="externalLink" href="https://search.maven.org/artifact/com.google.appengine/appengine-api-stubs">appengine-api-stubs</a></td>
 <td>1.7.7</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></td></tr>
+<td><a class="externalLink" href="https://cloud.google.com/terms/ ">Google App Engine Terms of Service</a></td></tr>
 <tr class="a">
 <td>com.google.appengine</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/appengine-testing/">appengine-testing</a></td>
+<td><a class="externalLink" href="https://cloud.google.com/appengine/docs/standard/java/tools/localunittesting">appengine-testing</a></td>
 <td>1.7.7</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></td></tr>
+<td><a class="externalLink" href="https://cloud.google.com/terms/ ">Google App Engine Terms of Service</a></td></tr>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-test">google-http-client-test</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
@@ -118,10 +118,10 @@ <h3>provided<a name="provided"></a></h3>
 <th>License</th></tr>
 <tr class="b">
 <td>com.google.appengine</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/appengine-api-1.0-sdk/">appengine-api-1.0-sdk</a></td>
+<td><a class="externalLink" href="https://cloud.google.com/appengine/downloads">appengine sdk</a></td>
 <td>1.7.7</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></td></tr></table></div></div><a name="Project_Transitive_Dependencies"></a>
+<td><a class="externalLink" href="https://cloud.google.com/terms/ ">Google App Engine Terms of Service</a></td></tr></table></div></div><a name="Project_Transitive_Dependencies"></a>
 <div class="section">
 <h2>Project Transitive Dependencies<a name="Project_Transitive_Dependencies"></a></h2>
 <p>The following is a list of transitive dependencies for this project. Transitive dependencies are the dependencies of the project dependencies.</p><a name="Project_Transitive_Dependencies_compile"></a>
@@ -142,24 +142,30 @@ <h3>compile<a name="compile"></a></h3>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/codec/">commons-codec</a></td>
 <td>1.6</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
@@ -187,7 +193,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.http-client:google-http-client-appengine:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.http-client:google-http-client-appengine:jar:${project.http.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google App Engine extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -197,7 +203,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-appengine">https://github.com/google/google-http-java-client/google-http-client-appengine</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -257,8 +263,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.http-client:google-http-client-test:jar:1.25.0-SNAPSHOT (test) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.http-client:google-http-client-test:jar:${project.http.version} (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</th></tr>
@@ -267,34 +283,34 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-test">https://github.com/google/google-http-java-client/google-http-client-test</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>com.google.appengine:appengine-api-1.0-sdk:jar:1.7.7 (provided) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>com.google.appengine:appengine-api-1.0-sdk:jar:1.7.7 (provided) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>appengine-api-1.0-sdk</th></tr>
 <tr class="b">
 <td>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/appengine/appengine-api-1.0-sdk/">http://code.google.com/appengine/appengine-api-1.0-sdk/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
-<li>com.google.appengine:appengine-testing:jar:1.7.7 (test) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<p><b>URL: </b><a class="externalLink" href="https://cloud.google.com/appengine/downloads">appengine sdk/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="https://cloud.google.com/terms/ ">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
+<li>com.google.appengine:appengine-testing:jar:1.7.7 (test) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>appengine-testing</th></tr>
 <tr class="b">
 <td>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/appengine/appengine-testing/">http://code.google.com/appengine/appengine-testing/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
-<li>com.google.appengine:appengine-api-stubs:jar:1.7.7 (test) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<p><b>URL: </b><a class="externalLink" href="https://cloud.google.com/appengine/docs/standard/java/tools/localunittesting">appengine-testing</a></p>
+<p><b>Project License: </b><a class="externalLink" href="https://cloud.google.com/terms/ ">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
+<li>com.google.appengine:appengine-api-stubs:jar:1.7.7 (test) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>appengine-api-stubs</th></tr>
 <tr class="b">
 <td>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/appengine/appengine-api-stubs/">http://code.google.com/appengine/appengine-api-stubs/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<p><b>URL: </b><a class="externalLink" href="https://search.maven.org/artifact/com.google.appengine/appengine-api-stubs">appengine-api-stubs</a></p>
+<p><b>Project License: </b><a class="externalLink" href="https://cloud.google.com/terms/ ">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
+<li>junit:junit:jar:4.8.2 (test) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -303,7 +319,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>com.google.guava:guava:jar:20.0 (test) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (test) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -322,7 +338,7 @@ <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Google App Engine Terms of Service: </b>appengine-api-1.0-sdk, appengine-api-stubs, appengine-testing</p>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google App Engine extensions to the Google HTTP Client Library for Java., Google HTTP Client Library for Java, Guava: Google Core Libraries for Java, Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google App Engine extensions to the Google HTTP Client Library for Java., Google HTTP Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -367,7 +383,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -375,22 +391,30 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-test-1.25.0-SNAPSHOT.jar</td>
-<td>51.21 kB</td>
+<td>google-http-client-test-${project.http.version}.jar</td>
+<td>51.73 kB</td>
 <td>59</td>
 <td>49</td>
 <td>2</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="b">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -398,7 +422,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -406,7 +430,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -414,7 +438,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -422,7 +446,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -430,7 +454,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -438,23 +462,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>12</td>
-<td>57.31 MB</td>
-<td>15,443</td>
-<td>14,242</td>
-<td>397</td>
-<td>1.6</td>
-<td>12</td></tr>
 <tr class="b">
-<td>compile: 6</td>
-<td>compile: 1.57 MB</td>
-<td>compile: 1,316</td>
-<td>compile: 1,055</td>
-<td>compile: 68</td>
-<td>-</td>
-<td>compile: 6</td></tr>
+<td>13</td>
+<td>57.33 MB</td>
+<td>15,468</td>
+<td>14,256</td>
+<td>398</td>
+<td>1.6</td>
+<td>13</td></tr>
 <tr class="a">
+<td>compile: 7</td>
+<td>compile: 1.59 MB</td>
+<td>compile: 1,341</td>
+<td>compile: 1,069</td>
+<td>compile: 69</td>
+<td>-</td>
+<td>compile: 7</td></tr>
+<tr class="b">
 <td>test: 5</td>
 <td>test: 25.08 MB</td>
 <td>test: 7,561</td>
@@ -462,7 +486,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>test: 243</td>
 <td>-</td>
 <td>test: 5</td></tr>
-<tr class="b">
+<tr class="a">
 <td>provided: 1</td>
 <td>provided: 30.66 MB</td>
 <td>provided: 6,566</td>
@@ -521,70 +545,75 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client-test:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-test:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
+<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="a">
-<td>12 (compile: 6, test: 5, provided: 1)</td>
+<tr class="b">
+<td>13 (compile: 7, test: 5, provided: 1)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-http-client-dependencies.html b/google-api-client-assembly/dependencies/google-http-client-dependencies.html
index e7cd19b7b..ebaaf873d 100644
--- a/google-api-client-assembly/dependencies/google-http-client-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-http-client-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.http.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -67,6 +67,12 @@ <h3>compile<a name="compile"></a></h3>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
@@ -85,7 +91,7 @@ <h3>test<a name="test"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava-testlib">guava-testlib</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
@@ -105,7 +111,7 @@ <h3>test<a name="test"></a></h3>
 <td><a class="externalLink" href="http://www.mockito.org">mockito-all</a></td>
 <td>1.9.0</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://code.google.com/p/mockito/wiki/License">The MIT License</a></td></tr></table></div><a name="Project_Dependencies_provided"></a>
+<td><a class="externalLink" href="https://github.com/mockito/mockito/blob/release/2.x/LICENSE">The MIT License</a></td></tr></table></div><a name="Project_Dependencies_provided"></a>
 <div class="section">
 <h3>provided<a name="provided"></a></h3>
 <p>The following is a list of provided dependencies for this project. These dependencies are required to compile the application, but should be provided by default when using the library:</p>
@@ -125,7 +131,7 @@ <h3>provided<a name="provided"></a></h3>
 <tr class="a">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
@@ -177,7 +183,7 @@ <h3>test<a name="test"></a></h3>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2.0</a></td></tr>
 <tr class="a">
 <td>com.googlecode.java-diff-utils</td>
-<td><a class="externalLink" href="http://code.google.com/p/java-diff-utils/">diffutils</a></td>
+<td><a class="externalLink" href="https://code.google.com/archive/p/java-diff-utils/">diffutils</a></td>
 <td>1.3.0</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Transitive_Dependencies_provided"></a>
@@ -231,7 +237,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -297,7 +303,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>com.google.guava:guava:jar:20.0 (provided) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (provided) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -311,7 +317,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     per the JSR-305 spec.</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/guava/guava">https://github.com/google/guava/guava</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>com.google.guava:guava-testlib:jar:20.0 (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>com.google.guava:guava-testlib:jar:26.0-android (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava Testing Library</th></tr>
@@ -357,7 +363,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <tr class="b">
 <td>
 <p><b>Description: </b>The DiffUtils library for computing diffs, applying patches, generationg side-by-side view in Java.</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/p/java-diff-utils/">http://code.google.com/p/java-diff-utils/</a></p>
+<p><b>URL: </b><a class="externalLink" href="https://code.google.com/archive/p/java-diff-utils/">java-diff-utils</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
 <li>org.mockito:mockito-all:jar:1.9.0 (test) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
 <table border="0" class="bodyTable">
@@ -367,7 +373,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <td>
 <p><b>Description: </b>Mock objects library for java</p>
 <p><b>URL: </b><a class="externalLink" href="http://www.mockito.org">http://www.mockito.org</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://code.google.com/p/mockito/wiki/License">The MIT License</a></p></td></tr></table></div></li>
+<p><b>Project License: </b><a class="externalLink" href="https://github.com/mockito/mockito/blob/release/2.x/LICENSE">The MIT License</a></p></td></tr></table></div></li>
 <li>org.apache.httpcomponents:httpclient:jar:4.5.3 (compile) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
@@ -398,6 +404,16 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></div></div><a name="Licenses"></a>
 <div class="section">
 <h2>Licenses<a name="Licenses"></a></h2>
@@ -407,7 +423,7 @@ <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
 <p><b>Apache 2.0: </b>Google Android Java ME Library (Khronos), Google Android Library, error-prone annotations</p>
-<p><b>The Apache Software License, Version 2.0: </b>Commons Codec, Commons Logging, FindBugs-jsr305, Google HTTP Client Library for Java, Guava Testing Library, Guava: Google Core Libraries for Java, Truth Core, java-diff-utils</p>
+<p><b>The Apache Software License, Version 2.0: </b>Commons Codec, Commons Logging, FindBugs-jsr305, Google HTTP Client Library for Java, Guava Testing Library, Guava: Google Core Libraries for Java, J2ObjC Annotations, Truth Core, java-diff-utils</p>
 <p><b>The MIT License: </b>Mockito</p>
 <p><b>Indiana University Extreme! Lab Software License, vesion 1.1.1: </b>MXP1: Xml Pull Parser 3rd Edition (XPP3)</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
@@ -446,7 +462,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>release</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -454,7 +470,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>guava-testlib-20.0.jar</td>
+<td>guava-testlib-26.0-android.jar</td>
 <td>748.27 kB</td>
 <td>595</td>
 <td>574</td>
@@ -462,6 +478,14 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="b">
 <td>truth-0.40.jar</td>
 <td>196.26 kB</td>
 <td>150</td>
@@ -469,7 +493,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>diffutils-1.3.0.jar</td>
 <td>33.33 kB</td>
 <td>35</td>
@@ -477,7 +501,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -485,7 +509,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.1.1.jar</td>
 <td>59.26 kB</td>
 <td>42</td>
@@ -493,7 +517,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.1</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -501,7 +525,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -509,7 +533,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -517,7 +541,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>opengl-api-gl1.1-android-2.1_r1.jar</td>
 <td>18.06 kB</td>
 <td>25</td>
@@ -525,7 +549,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>mockito-all-1.9.0.jar</td>
 <td>1.43 MB</td>
 <td>1,279</td>
@@ -533,7 +557,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>66</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>xmlParserAPIs-2.6.2.jar</td>
 <td>121.80 kB</td>
 <td>238</td>
@@ -541,7 +565,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.1</td>
 <td>release</td></tr>
-<tr class="a">
+<tr class="b">
 <td>xpp3-1.1.4c.jar</td>
 <td>117.25 kB</td>
 <td>78</td>
@@ -549,7 +573,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>13</td>
 <td>1.1</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -557,23 +581,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>16</td>
+<tr class="b">
+<td>17</td>
 <td>8.56 MB</td>
-<td>7,528</td>
-<td>5,551</td>
-<td>251</td>
+<td>7,551</td>
+<td>5,563</td>
+<td>252</td>
 <td>1.6</td>
-<td>14</td></tr>
-<tr class="b">
-<td>compile: 4</td>
-<td>compile: 1.10 MB</td>
-<td>compile: 877</td>
-<td>compile: 781</td>
-<td>compile: 46</td>
-<td>-</td>
-<td>compile: 4</td></tr>
+<td>15</td></tr>
 <tr class="a">
+<td>compile: 5</td>
+<td>compile: 1.11 MB</td>
+<td>compile: 900</td>
+<td>compile: 793</td>
+<td>compile: 47</td>
+<td>-</td>
+<td>compile: 5</td></tr>
+<tr class="b">
 <td>test: 6</td>
 <td>test: 2.62 MB</td>
 <td>test: 2,354</td>
@@ -581,7 +605,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>test: 108</td>
 <td>-</td>
 <td>test: 5</td></tr>
-<tr class="b">
+<tr class="a">
 <td>provided: 6</td>
 <td>provided: 4.84 MB</td>
 <td>provided: 4,297</td>
@@ -635,95 +659,100 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.guava:guava-testlib:jar:20.0</td>
+<td>com.google.guava:guava-testlib:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.truth:truth:jar:0.40</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.googlecode.java-diff-utils:diffutils:jar:1.3.0</td>
+<td>com.google.truth:truth:jar:0.40</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.googlecode.java-diff-utils:diffutils:jar:1.3.0</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.1.1</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.khronos:opengl-api:jar:gl1.1-android-2.1_r1</td>
+<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.mockito:mockito-all:jar:1.9.0</td>
+<td>org.khronos:opengl-api:jar:gl1.1-android-2.1_r1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>xerces:xmlParserAPIs:jar:2.6.2</td>
+<td>org.mockito:mockito-all:jar:1.9.0</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>xpp3:xpp3:jar:1.1.4c</td>
+<td>xerces:xmlParserAPIs:jar:2.6.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
+<td>xpp3:xpp3:jar:1.1.4c</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="a">
-<td>16 (compile: 4, test: 6, provided: 6)</td>
+<tr class="b">
+<td>17 (compile: 5, test: 6, provided: 6)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-http-client-gson-dependencies.html b/google-api-client-assembly/dependencies/google-http-client-gson-dependencies.html
index b66ff4755..f587688ae 100644
--- a/google-api-client-assembly/dependencies/google-http-client-gson-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-http-client-gson-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.http.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -62,14 +62,14 @@ <h3>compile<a name="compile"></a></h3>
 <th>License</th></tr>
 <tr class="b">
 <td>com.google.code.gson</td>
-<td><a class="externalLink" href="http://code.google.com/p/google-gson/">gson</a></td>
+<td><a class="externalLink" href="https://github.com/google/gson">gson</a></td>
 <td>2.1</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
 <div class="section">
@@ -85,13 +85,13 @@ <h3>test<a name="test"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-test">google-http-client-test</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
@@ -120,24 +120,30 @@ <h3>compile<a name="compile"></a></h3>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/codec/">commons-codec</a></td>
 <td>1.6</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
@@ -165,7 +171,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.http-client:google-http-client-gson:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.http-client:google-http-client-gson:jar:${project.http.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>GSON extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -175,7 +181,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-gson">https://github.com/google/google-http-java-client/google-http-client-gson</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -235,8 +241,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.http-client:google-http-client-test:jar:1.25.0-SNAPSHOT (test) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.http-client:google-http-client-test:jar:${project.http.version} (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</th></tr>
@@ -245,7 +261,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-test">https://github.com/google/google-http-java-client/google-http-client-test</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -254,16 +270,16 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>com.google.code.gson:gson:jar:2.1 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>com.google.code.gson:gson:jar:2.1 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Gson</th></tr>
 <tr class="b">
 <td>
 <p><b>Description: </b>Google Gson library</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/p/google-gson/">http://code.google.com/p/google-gson/</a></p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/gson">gson</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>com.google.guava:guava:jar:20.0 (test) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (test) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -281,7 +297,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, GSON extensions to the Google HTTP Client Library for Java., Google HTTP Client Library for Java, Gson, Guava: Google Core Libraries for Java, Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, GSON extensions to the Google HTTP Client Library for Java., Google HTTP Client Library for Java, Gson, Guava: Google Core Libraries for Java, J2ObjC Annotations, Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -310,7 +326,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -318,22 +334,30 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-test-1.25.0-SNAPSHOT.jar</td>
-<td>51.21 kB</td>
+<td>google-http-client-test-${project.http.version}.jar</td>
+<td>51.73 kB</td>
 <td>59</td>
 <td>49</td>
 <td>2</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="b">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -341,7 +365,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -349,7 +373,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -357,7 +381,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -365,7 +389,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -373,7 +397,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -381,23 +405,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>10</td>
-<td>4.34 MB</td>
-<td>3,644</td>
-<td>3,296</td>
-<td>124</td>
-<td>1.6</td>
-<td>10</td></tr>
 <tr class="b">
-<td>compile: 7</td>
-<td>compile: 1.74 MB</td>
-<td>compile: 1,474</td>
-<td>compile: 1,203</td>
-<td>compile: 74</td>
-<td>-</td>
-<td>compile: 7</td></tr>
+<td>11</td>
+<td>4.36 MB</td>
+<td>3,669</td>
+<td>3,310</td>
+<td>125</td>
+<td>1.6</td>
+<td>11</td></tr>
 <tr class="a">
+<td>compile: 8</td>
+<td>compile: 1.76 MB</td>
+<td>compile: 1,499</td>
+<td>compile: 1,217</td>
+<td>compile: 75</td>
+<td>-</td>
+<td>compile: 8</td></tr>
+<tr class="b">
 <td>test: 3</td>
 <td>test: 2.61 MB</td>
 <td>test: 2,170</td>
@@ -446,70 +470,75 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client-test:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-test:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
+<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="a">
-<td>10 (compile: 7, test: 3)</td>
+<tr class="b">
+<td>11 (compile: 8, test: 3)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-http-client-jackson-dependencies.html b/google-api-client-assembly/dependencies/google-http-client-jackson-dependencies.html
index 572d4f89d..bfd9c15e3 100644
--- a/google-api-client-assembly/dependencies/google-http-client-jackson-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-http-client-jackson-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.http.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,15 +63,10 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
-<td>org.codehaus.jackson</td>
-<td><a class="externalLink" href="http://jackson.codehaus.org">jackson-core-asl</a></td>
-<td>1.9.11</td>
-<td>jar</td>
-<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
+</table></div><a name="Project_Dependencies_test"></a>
 <div class="section">
 <h3>test<a name="test"></a></h3>
 <p>The following is a list of test dependencies for this project. These dependencies are only required to compile and run unit tests for the application:</p>
@@ -85,13 +80,13 @@ <h3>test<a name="test"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-test">google-http-client-test</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
@@ -120,24 +115,30 @@ <h3>compile<a name="compile"></a></h3>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/codec/">commons-codec</a></td>
 <td>1.6</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
@@ -165,7 +166,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.http-client:google-http-client-jackson:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.http-client:google-http-client-jackson:jar:${project.http.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -175,7 +176,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson">https://github.com/google/google-http-java-client/google-http-client-jackson</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -235,8 +236,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.http-client:google-http-client-test:jar:1.25.0-SNAPSHOT (test) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.http-client:google-http-client-test:jar:${project.http.version} (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</th></tr>
@@ -245,7 +256,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-test">https://github.com/google/google-http-java-client/google-http-client-test</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -254,7 +265,6 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>org.codehaus.jackson:jackson-core-asl:jar:1.9.11 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson</th></tr>
@@ -263,7 +273,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Jackson is a high-performance JSON processor (parser, generator)</p>
 <p><b>URL: </b><a class="externalLink" href="http://jackson.codehaus.org">http://jackson.codehaus.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>com.google.guava:guava:jar:20.0 (test) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (test) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -281,7 +291,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Guava: Google Core Libraries for Java, Jackson, Jackson extensions to the Google HTTP Client Library for Java., Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, Jackson, Jackson extensions to the Google HTTP Client Library for Java., Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -302,7 +312,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -310,22 +320,30 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-test-1.25.0-SNAPSHOT.jar</td>
-<td>51.21 kB</td>
+<td>google-http-client-test-${project.http.version}.jar</td>
+<td>51.73 kB</td>
 <td>59</td>
 <td>49</td>
 <td>2</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="a">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -333,7 +351,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -341,7 +359,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -349,7 +367,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -357,7 +375,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -366,14 +384,6 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>jackson-core-asl-1.9.11.jar</td>
-<td>226.69 kB</td>
-<td>137</td>
-<td>121</td>
-<td>8</td>
-<td>1.5</td>
-<td>debug</td></tr>
-<tr class="b">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -381,23 +391,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>10</td>
-<td>4.39 MB</td>
-<td>3,623</td>
-<td>3,269</td>
-<td>126</td>
-<td>1.6</td>
-<td>10</td></tr>
 <tr class="b">
-<td>compile: 7</td>
-<td>compile: 1.79 MB</td>
-<td>compile: 1,453</td>
-<td>compile: 1,176</td>
-<td>compile: 76</td>
-<td>-</td>
-<td>compile: 7</td></tr>
+<td>11</td>
+<td>4.41 MB</td>
+<td>3,648</td>
+<td>3,283</td>
+<td>127</td>
+<td>1.6</td>
+<td>11</td></tr>
 <tr class="a">
+<td>compile: 8</td>
+<td>compile: 1.81 MB</td>
+<td>compile: 1,478</td>
+<td>compile: 1,190</td>
+<td>compile: 77</td>
+<td>-</td>
+<td>compile: 8</td></tr>
+<tr class="b">
 <td>test: 3</td>
 <td>test: 2.61 MB</td>
 <td>test: 2,170</td>
@@ -441,75 +451,75 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-test:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-test:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.codehaus.jackson:jackson-core-asl:jar:1.9.11</td>
+<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="a">
-<td>10 (compile: 7, test: 3)</td>
+<tr class="b">
+<td>11 (compile: 8, test: 3)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-http-client-jackson2-dependencies.html b/google-api-client-assembly/dependencies/google-http-client-jackson2-dependencies.html
index 1dd182d93..6ba47990d 100644
--- a/google-api-client-assembly/dependencies/google-http-client-jackson2-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-http-client-jackson2-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.http.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -69,7 +69,7 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
 <div class="section">
@@ -85,13 +85,13 @@ <h3>test<a name="test"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-test">google-http-client-test</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
@@ -120,24 +120,30 @@ <h3>compile<a name="compile"></a></h3>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/codec/">commons-codec</a></td>
 <td>1.6</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
@@ -165,7 +171,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.http-client:google-http-client-jackson2:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.http-client:google-http-client-jackson2:jar:${project.http.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson 2 extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -175,7 +181,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson2">https://github.com/google/google-http-java-client/google-http-client-jackson2</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -235,8 +241,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.http-client:google-http-client-test:jar:1.25.0-SNAPSHOT (test) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.http-client:google-http-client-test:jar:${project.http.version} (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</th></tr>
@@ -245,7 +261,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-test">https://github.com/google/google-http-java-client/google-http-client-test</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -254,7 +270,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>com.fasterxml.jackson.core:jackson-core:jar:2.9.2 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson-core</th></tr>
@@ -263,7 +279,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Core Jackson processing abstractions (aka Streaming API), implementation for JSON</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/FasterXML/jackson-core">https://github.com/FasterXML/jackson-core</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>com.google.guava:guava:jar:20.0 (test) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (test) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -281,7 +297,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Guava: Google Core Libraries for Java, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, Jackson 2 extensions to the Google HTTP Client Library for Java., Jackson-core, Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -310,7 +326,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -318,22 +334,30 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-test-1.25.0-SNAPSHOT.jar</td>
-<td>51.21 kB</td>
+<td>google-http-client-test-${project.http.version}.jar</td>
+<td>51.73 kB</td>
 <td>59</td>
 <td>49</td>
 <td>2</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="b">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -341,7 +365,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -349,7 +373,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -357,7 +381,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -365,7 +389,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -373,7 +397,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -381,23 +405,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>10</td>
-<td>4.48 MB</td>
-<td>3,616</td>
-<td>3,253</td>
-<td>129</td>
-<td>1.6</td>
-<td>10</td></tr>
 <tr class="b">
-<td>compile: 7</td>
-<td>compile: 1.87 MB</td>
-<td>compile: 1,446</td>
-<td>compile: 1,160</td>
-<td>compile: 79</td>
-<td>-</td>
-<td>compile: 7</td></tr>
+<td>11</td>
+<td>4.50 MB</td>
+<td>3,641</td>
+<td>3,267</td>
+<td>130</td>
+<td>1.6</td>
+<td>11</td></tr>
 <tr class="a">
+<td>compile: 8</td>
+<td>compile: 1.89 MB</td>
+<td>compile: 1,471</td>
+<td>compile: 1,174</td>
+<td>compile: 80</td>
+<td>-</td>
+<td>compile: 8</td></tr>
+<tr class="b">
 <td>test: 3</td>
 <td>test: 2.61 MB</td>
 <td>test: 2,170</td>
@@ -446,70 +470,75 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client-test:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-test:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
+<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="a">
-<td>10 (compile: 7, test: 3)</td>
+<tr class="b">
+<td>11 (compile: 8, test: 3)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-http-client-jdo-dependencies.html b/google-api-client-assembly/dependencies/google-http-client-jdo-dependencies.html
index 8000d7bca..9508063a9 100644
--- a/google-api-client-assembly/dependencies/google-http-client-jdo-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-http-client-jdo-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.http.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,7 +63,7 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
@@ -85,13 +85,13 @@ <h3>test<a name="test"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-test">google-http-client-test</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
@@ -144,30 +144,36 @@ <h3>compile<a name="compile"></a></h3>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/codec/">commons-codec</a></td>
 <td>1.6</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>javax.transaction</td>
 <td>transaction-api</td>
 <td>1.1</td>
 <td>jar</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
@@ -195,7 +201,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.http-client:google-http-client-jdo:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.http-client:google-http-client-jdo:jar:${project.http.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JDO extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -205,7 +211,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jdo">https://github.com/google/google-http-java-client/google-http-client-jdo</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -265,8 +271,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.http-client:google-http-client-test:jar:1.25.0-SNAPSHOT (test) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.http-client:google-http-client-test:jar:${project.http.version} (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</th></tr>
@@ -275,7 +291,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-test">https://github.com/google/google-http-java-client/google-http-client-test</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -284,7 +300,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>javax.jdo:jdo2-api:jar:2.3-eb (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>javax.jdo:jdo2-api:jar:2.3-eb (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JDO2 API</th></tr>
@@ -294,7 +310,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://db.apache.org/jdo/index.html">http://db.apache.org/jdo/index.html</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2</a></p></td></tr></table></div>
 <ul>
-<li>javax.transaction:transaction-api:jar:1.1 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>javax.transaction:transaction-api:jar:1.1 (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>transaction-api</th></tr>
@@ -302,7 +318,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <td>
 <p><b>Description: </b>There is currently no description associated with this project.</p>
 <p><b>Project License: </b>No license is defined for this project.</p></td></tr></table></div></li></ul></li>
-<li>org.datanucleus:datanucleus-core:jar:3.2.2 (test) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<li>org.datanucleus:datanucleus-core:jar:3.2.2 (test) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>DataNucleus Core</th></tr>
@@ -312,7 +328,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
         It supports persistence API's being layered on top of the core functionality.</p>
 <p><b>URL: </b><a class="externalLink" href="http://www.datanucleus.org">http://www.datanucleus.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>org.datanucleus:datanucleus-api-jdo:jar:3.2.1 (test) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<li>org.datanucleus:datanucleus-api-jdo:jar:3.2.1 (test) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>DataNucleus JDO API plugin</th></tr>
@@ -321,7 +337,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Plugin providing DataNucleus implementation of JDO API.</p>
 <p><b>URL: </b><a class="externalLink" href="http://www.datanucleus.org">http://www.datanucleus.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>org.datanucleus:datanucleus-rdbms:jar:3.2.1 (test) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<li>org.datanucleus:datanucleus-rdbms:jar:3.2.1 (test) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>DataNucleus RDBMS</th></tr>
@@ -330,7 +346,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Plugin for DataNucleus providing persistence to RDBMS datastores.</p>
 <p><b>URL: </b><a class="externalLink" href="http://www.datanucleus.org">http://www.datanucleus.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>mysql:mysql-connector-java:jar:5.1.18 (test) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
+<li>mysql:mysql-connector-java:jar:5.1.18 (test) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>MySQL Connector/J</th></tr>
@@ -339,7 +355,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>MySQL JDBC Type 4 driver</p>
 <p><b>URL: </b><a class="externalLink" href="http://dev.mysql.com/doc/connector-j/en/">http://dev.mysql.com/doc/connector-j/en/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">The GNU General Public License, Version 2</a></p></td></tr></table></div></li>
-<li>com.google.guava:guava:jar:20.0 (test) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (test) <img id="_img33" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep32', '_img33' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep32" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -359,7 +375,7 @@ <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Unknown: </b>transaction-api</p>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, DataNucleus Core, DataNucleus JDO API plugin, DataNucleus RDBMS, FindBugs-jsr305, Google HTTP Client Library for Java, Guava: Google Core Libraries for Java, JDO extensions to the Google HTTP Client Library for Java., Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</p>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, DataNucleus Core, DataNucleus JDO API plugin, DataNucleus RDBMS, FindBugs-jsr305, Google HTTP Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, JDO extensions to the Google HTTP Client Library for Java., Shared classes used for testing of artifacts in the Google HTTP Client Library for Java.</p>
 <p><b>The GNU General Public License, Version 2: </b>MySQL Connector/J</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
@@ -381,7 +397,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -389,22 +405,30 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-test-1.25.0-SNAPSHOT.jar</td>
-<td>51.21 kB</td>
+<td>google-http-client-test-${project.http.version}.jar</td>
+<td>51.73 kB</td>
 <td>59</td>
 <td>49</td>
 <td>2</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="a">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -412,7 +436,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -420,7 +444,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>jdo2-api-2.3-eb.jar</td>
 <td>188.18 kB</td>
 <td>226</td>
@@ -428,7 +452,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>7</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>transaction-api-1.1.jar</td>
 <td>14.72 kB</td>
 <td>24</td>
@@ -436,7 +460,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.3</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -444,7 +468,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>mysql-connector-java-5.1.18.jar</td>
 <td>771.37 kB</td>
 <td>279</td>
@@ -452,7 +476,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>12</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -460,7 +484,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -468,7 +492,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>datanucleus-api-jdo-3.2.1.jar</td>
 <td>329.11 kB</td>
 <td>180</td>
@@ -476,7 +500,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>datanucleus-core-3.2.2.jar</td>
 <td>1.72 MB</td>
 <td>943</td>
@@ -484,7 +508,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>50</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>datanucleus-rdbms-3.2.1.jar</td>
 <td>1.69 MB</td>
 <td>768</td>
@@ -492,7 +516,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>29</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -500,23 +524,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="b">
-<td>15</td>
-<td>8.85 MB</td>
-<td>5,906</td>
-<td>5,275</td>
-<td>224</td>
-<td>1.6</td>
-<td>15</td></tr>
 <tr class="a">
-<td>compile: 8</td>
-<td>compile: 1.77 MB</td>
-<td>compile: 1,566</td>
-<td>compile: 1,255</td>
-<td>compile: 77</td>
-<td>-</td>
-<td>compile: 8</td></tr>
+<td>16</td>
+<td>8.87 MB</td>
+<td>5,931</td>
+<td>5,289</td>
+<td>225</td>
+<td>1.6</td>
+<td>16</td></tr>
 <tr class="b">
+<td>compile: 9</td>
+<td>compile: 1.78 MB</td>
+<td>compile: 1,591</td>
+<td>compile: 1,269</td>
+<td>compile: 78</td>
+<td>-</td>
+<td>compile: 9</td></tr>
+<tr class="a">
 <td>test: 7</td>
 <td>test: 7.09 MB</td>
 <td>test: 4,340</td>
@@ -567,116 +591,122 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-test:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-test:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
+<td>commons-logging:commons-logging:jar:1.2</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="a">
 <td>javax.jdo:jdo2-api:jar:2.3-eb</td>
 <td>-</td>
 <td>-</td>
 <td><a class="externalLink" href="http://www.datanucleus.org/downloads/maven2//javax/jdo/jdo2-api/2.3-eb/jdo2-api-2.3-eb.jar"><img alt="Found at http://www.datanucleus.org/downloads/maven2/" src="images/icon_success_sml.gif" /></a></td>
 <td>-</td></tr>
-<tr class="a">
+<tr class="b">
 <td>javax.transaction:transaction-api:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="a">
+<tr class="b">
 <td>mysql:mysql-connector-java:jar:5.1.18</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.datanucleus:datanucleus-api-jdo:jar:3.2.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.datanucleus:datanucleus-core:jar:3.2.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.datanucleus:datanucleus-rdbms:jar:3.2.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="a">
+<tr class="b">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>DN_M2_Repo</th>
 <th>central</th></tr>
-<tr class="b">
-<td>15 (compile: 8, test: 7)</td>
+<tr class="a">
+<td>16 (compile: 9, test: 7)</td>
 <td>0</td>
 <td>0</td>
 <td>1</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-http-client-protobuf-dependencies.html b/google-api-client-assembly/dependencies/google-http-client-protobuf-dependencies.html
index e6c844c08..ae02d6842 100644
--- a/google-api-client-assembly/dependencies/google-http-client-protobuf-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-http-client-protobuf-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.http.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,7 +63,7 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
@@ -108,24 +108,30 @@ <h3>compile<a name="compile"></a></h3>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/codec/">commons-codec</a></td>
 <td>1.6</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
@@ -153,7 +159,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.http-client:google-http-client-protobuf:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.http-client:google-http-client-protobuf:jar:${project.http.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Protocol Buffer extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -163,7 +169,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-protobuf">https://github.com/google/google-http-java-client/google-http-client-protobuf</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -223,8 +229,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>junit:junit:jar:4.8.2 (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -233,7 +249,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>com.google.protobuf:protobuf-java:jar:2.6.1 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>com.google.protobuf:protobuf-java:jar:2.6.1 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Protocol Buffer Java API</th></tr>
@@ -248,7 +264,7 @@ <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>New BSD license: </b>Protocol Buffer Java API</p>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Protocol Buffer extensions to the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, J2ObjC Annotations, Protocol Buffer extensions to the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -269,14 +285,22 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="a">
 <td>protobuf-java-2.6.1.jar</td>
 <td>582.66 kB</td>
 <td>286</td>
@@ -284,7 +308,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -292,7 +316,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -300,7 +324,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -308,7 +332,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -316,7 +340,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -324,7 +348,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -332,23 +356,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>8</td>
-<td>2.36 MB</td>
-<td>1,869</td>
-<td>1,561</td>
-<td>99</td>
-<td>1.6</td>
-<td>8</td></tr>
 <tr class="b">
-<td>compile: 7</td>
-<td>compile: 2.14 MB</td>
-<td>compile: 1,602</td>
-<td>compile: 1,331</td>
-<td>compile: 69</td>
-<td>-</td>
-<td>compile: 7</td></tr>
+<td>9</td>
+<td>2.38 MB</td>
+<td>1,894</td>
+<td>1,575</td>
+<td>100</td>
+<td>1.6</td>
+<td>9</td></tr>
 <tr class="a">
+<td>compile: 8</td>
+<td>compile: 2.15 MB</td>
+<td>compile: 1,627</td>
+<td>compile: 1,345</td>
+<td>compile: 70</td>
+<td>-</td>
+<td>compile: 8</td></tr>
+<tr class="b">
 <td>test: 1</td>
 <td>test: 231.78 kB</td>
 <td>test: 267</td>
@@ -392,65 +416,70 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.protobuf:protobuf-java:jar:2.6.1</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.protobuf:protobuf-java:jar:2.6.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
+<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="a">
-<td>8 (compile: 7, test: 1)</td>
+<tr class="b">
+<td>9 (compile: 8, test: 1)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-http-client-xml-dependencies.html b/google-api-client-assembly/dependencies/google-http-client-xml-dependencies.html
index 77cc065e1..846b56050 100644
--- a/google-api-client-assembly/dependencies/google-http-client-xml-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-http-client-xml-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.http.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,7 +63,7 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
@@ -85,7 +85,7 @@ <h3>test<a name="test"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
@@ -114,24 +114,30 @@ <h3>compile<a name="compile"></a></h3>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-codec</td>
 <td><a class="externalLink" href="http://commons.apache.org/codec/">commons-codec</a></td>
 <td>1.6</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
@@ -159,7 +165,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.http-client:google-http-client-xml:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.http-client:google-http-client-xml:jar:${project.http.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>XML extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -169,7 +175,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-xml">https://github.com/google/google-http-java-client/google-http-client-xml</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -229,8 +235,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>junit:junit:jar:4.8.2 (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -239,7 +255,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>xpp3:xpp3:jar:1.1.4c (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>xpp3:xpp3:jar:1.1.4c (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>MXP1: Xml Pull Parser 3rd Edition (XPP3)</th></tr>
@@ -248,7 +264,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>MXP1 is a stable XmlPull parsing engine that is based on ideas from XPP and in particular XPP2 but completely revised and rewritten to take the best advantage of latest JIT JVMs such as Hotspot in JDK 1.4+.</p>
 <p><b>URL: </b><a class="externalLink" href="http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/">http://www.extreme.indiana.edu/xgws/xsoap/xpp/mxp1/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt">Indiana University Extreme! Lab Software License, vesion 1.1.1</a><a class="externalLink" href="http://creativecommons.org/licenses/publicdomain">Public Domain</a><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-1.1">Apache Software License, version 1.1</a></p></td></tr></table></div></li>
-<li>com.google.guava:guava:jar:20.0 (test) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (test) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -268,7 +284,7 @@ <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Public Domain: </b>MXP1: Xml Pull Parser 3rd Edition (XPP3)</p>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Guava: Google Core Libraries for Java, XML extensions to the Google HTTP Client Library for Java.</p>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, XML extensions to the Google HTTP Client Library for Java.</p>
 <p><b>Indiana University Extreme! Lab Software License, vesion 1.1.1: </b>MXP1: Xml Pull Parser 3rd Edition (XPP3)</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
@@ -290,7 +306,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -298,14 +314,22 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="b">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -313,7 +337,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -321,7 +345,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -329,7 +353,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -337,7 +361,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -345,7 +369,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>xpp3-1.1.4c.jar</td>
 <td>117.25 kB</td>
 <td>78</td>
@@ -353,7 +377,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>13</td>
 <td>1.1</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -361,23 +385,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="b">
-<td>9</td>
-<td>4.24 MB</td>
-<td>3,505</td>
-<td>3,155</td>
-<td>129</td>
-<td>1.6</td>
-<td>9</td></tr>
 <tr class="a">
-<td>compile: 7</td>
-<td>compile: 1.68 MB</td>
-<td>compile: 1,394</td>
-<td>compile: 1,111</td>
-<td>compile: 81</td>
-<td>-</td>
-<td>compile: 7</td></tr>
+<td>10</td>
+<td>4.26 MB</td>
+<td>3,530</td>
+<td>3,169</td>
+<td>130</td>
+<td>1.6</td>
+<td>10</td></tr>
 <tr class="b">
+<td>compile: 8</td>
+<td>compile: 1.70 MB</td>
+<td>compile: 1,419</td>
+<td>compile: 1,125</td>
+<td>compile: 82</td>
+<td>-</td>
+<td>compile: 8</td></tr>
+<tr class="a">
 <td>test: 2</td>
 <td>test: 2.56 MB</td>
 <td>test: 2,111</td>
@@ -421,70 +445,75 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>xpp3:xpp3:jar:1.1.4c</td>
+<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
+<td>xpp3:xpp3:jar:1.1.4c</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="b">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="b">
-<td>9 (compile: 7, test: 2)</td>
+<tr class="a">
+<td>10 (compile: 8, test: 2)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-oauth-client-appengine-dependencies.html b/google-api-client-assembly/dependencies/google-oauth-client-appengine-dependencies.html
index 38c890077..4a02d9a48 100644
--- a/google-api-client-assembly/dependencies/google-oauth-client-appengine-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-oauth-client-appengine-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.oauth.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,19 +63,19 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-appengine">google-http-client-appengine</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-servlet">google-oauth-client-servlet</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
 <div class="section">
@@ -90,20 +90,20 @@ <h3>test<a name="test"></a></h3>
 <th>License</th></tr>
 <tr class="b">
 <td>com.google.appengine</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/appengine-api-stubs/">appengine-api-stubs</a></td>
+<td><a class="externalLink" href="https://search.maven.org/artifact/com.google.appengine/appengine-api-stubs">appengine-api-stubs</a></td>
 <td>1.7.7</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></td></tr>
+<td><a class="externalLink" href="https://cloud.google.com/terms/">Google App Engine Terms of Service</a></td></tr>
 <tr class="a">
 <td>com.google.appengine</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/appengine-testing/">appengine-testing</a></td>
+<td><a class="externalLink" href="https://cloud.google.com/appengine/docs/standard/java/tools/localunittesting">appengine-testing</a></td>
 <td>1.7.7</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></td></tr>
+<td><a class="externalLink" href="https://cloud.google.com/terms/">Google App Engine Terms of Service</a></td></tr>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
@@ -124,10 +124,10 @@ <h3>provided<a name="provided"></a></h3>
 <th>License</th></tr>
 <tr class="b">
 <td>com.google.appengine</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/appengine-api-1.0-sdk/">appengine-api-1.0-sdk</a></td>
+<td><a class="externalLink" href="https://cloud.google.com/appengine/downloads">SDK for App Engine</a></td>
 <td>1.7.7</td>
 <td>jar</td>
-<td><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></td></tr>
+<td><a class="externalLink" href=" https://cloud.google.com/terms/">Google App Engine Terms of Service</a></td></tr>
 <tr class="a">
 <td>javax.servlet</td>
 <td>servlet-api</td>
@@ -156,40 +156,46 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jdo">google-http-client-jdo</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="b">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>javax.jdo</td>
 <td><a class="externalLink" href="http://db.apache.org/jdo/index.html">jdo2-api</a></td>
 <td>2.3-eb</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>javax.transaction</td>
 <td>transaction-api</td>
 <td>1.1</td>
 <td>jar</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
@@ -233,7 +239,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.oauth-client:google-oauth-client-appengine:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.oauth-client:google-oauth-client-appengine:jar:${project.oauth.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google App Engine extensions to the Google OAuth Client Library for Java.</th></tr>
@@ -243,7 +249,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-appengine">https://github.com/google/google-oauth-java-client/google-oauth-client-appengine</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client-appengine:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.http-client:google-http-client-appengine:jar:${project.oauth.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google App Engine extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -253,7 +259,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-appengine">https://github.com/google/google-http-java-client/google-http-client-appengine</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -304,8 +310,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li></ul></li>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -316,7 +332,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">https://github.com/google/google-oauth-java-client/google-oauth-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>FindBugs-jsr305</th></tr>
@@ -325,7 +341,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.oauth-client:google-oauth-client-servlet:jar:1.25.0-SNAPSHOT (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>com.google.oauth-client:google-oauth-client-servlet:jar:${project.oauth.version} (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Servlet and JDO extensions to the Google OAuth Client Library for Java.</th></tr>
@@ -335,7 +351,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-servlet">https://github.com/google/google-oauth-java-client/google-oauth-client-servlet</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client-jdo:jar:1.25.0-SNAPSHOT (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>com.google.http-client:google-http-client-jdo:jar:${project.http.version} (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JDO extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -344,7 +360,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jdo">https://github.com/google/google-http-java-client/google-http-client-jdo</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>javax.jdo:jdo2-api:jar:2.3-eb (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<li>javax.jdo:jdo2-api:jar:2.3-eb (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JDO2 API</th></tr>
@@ -354,7 +370,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://db.apache.org/jdo/index.html">http://db.apache.org/jdo/index.html</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2</a></p></td></tr></table></div>
 <ul>
-<li>javax.transaction:transaction-api:jar:1.1 (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<li>javax.transaction:transaction-api:jar:1.1 (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>transaction-api</th></tr>
@@ -362,16 +378,16 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <td>
 <p><b>Description: </b>There is currently no description associated with this project.</p>
 <p><b>Project License: </b>No license is defined for this project.</p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.appengine:appengine-api-1.0-sdk:jar:1.7.7 (provided) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<li>com.google.appengine:appengine-api-1.0-sdk:jar:1.7.7 (provided) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>appengine-api-1.0-sdk</th></tr>
 <tr class="b">
 <td>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/appengine/appengine-api-1.0-sdk/">http://code.google.com/appengine/appengine-api-1.0-sdk/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
+<p><b>URL: </b><a class="externalLink" href="https://cloud.google.com/appengine/downloads">appengine SDK/</a></p>
+<p><b>Project License: </b><a class="externalLink" href=" https://cloud.google.com/terms/">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
+<li>junit:junit:jar:4.8.2 (test) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -380,7 +396,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>javax.servlet:servlet-api:jar:2.5 (provided) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
+<li>javax.servlet:servlet-api:jar:2.5 (provided) <img id="_img33" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep32', '_img33' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep32" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>servlet-api</th></tr>
@@ -388,7 +404,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <td>
 <p><b>Description: </b>There is currently no description associated with this project.</p>
 <p><b>Project License: </b>No license is defined for this project.</p></td></tr></table></div></li>
-<li>com.google.guava:guava:jar:20.0 (test) <img id="_img33" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep32', '_img33' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep32" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (test) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -402,24 +418,24 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     per the JSR-305 spec.</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/guava/guava">https://github.com/google/guava/guava</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>com.google.appengine:appengine-testing:jar:1.7.7 (test) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
+<li>com.google.appengine:appengine-testing:jar:1.7.7 (test) <img id="_img37" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep36', '_img37' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep36" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>appengine-testing</th></tr>
 <tr class="b">
 <td>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/appengine/appengine-testing/">http://code.google.com/appengine/appengine-testing/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
-<li>com.google.appengine:appengine-api-stubs:jar:1.7.7 (test) <img id="_img37" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep36', '_img37' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep36" style="display:none">
+<p><b>URL: </b><a class="externalLink" href="https://cloud.google.com/appengine/docs/standard/java/tools/localunittesting">appengine-testing/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="https://cloud.google.com/terms/">Google App Engine Terms of Service</a></p></td></tr></table></div></li>
+<li>com.google.appengine:appengine-api-stubs:jar:1.7.7 (test) <img id="_img39" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep38', '_img39' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep38" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>appengine-api-stubs</th></tr>
 <tr class="b">
 <td>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
-<p><b>URL: </b><a class="externalLink" href="http://code.google.com/appengine/appengine-api-stubs/">http://code.google.com/appengine/appengine-api-stubs/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://code.google.com/appengine/terms.html">Google App Engine Terms of Service</a></p></td></tr></table></div></li></ul></li></ul></div></div><a name="Licenses"></a>
+<p><b>URL: </b><a class="externalLink" href="https://search.maven.org/artifact/com.google.appengine/appengine-api-stubss">appengine-api-stubs</a></p>
+<p><b>Project License: </b><a class="externalLink" href="https://cloud.google.com/terms/">Google App Engine Terms of Service</a></p></td></tr></table></div></li></ul></li></ul></div></div><a name="Licenses"></a>
 <div class="section">
 <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Google App Engine Terms of Service: </b>appengine-api-1.0-sdk, appengine-api-stubs, appengine-testing</p>
@@ -427,7 +443,7 @@ <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Unknown: </b>servlet-api, transaction-api</p>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google App Engine extensions to the Google HTTP Client Library for Java., Google App Engine extensions to the Google OAuth Client Library for Java., Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, JDO extensions to the Google HTTP Client Library for Java., Servlet and JDO extensions to the Google OAuth Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google App Engine extensions to the Google HTTP Client Library for Java., Google App Engine extensions to the Google OAuth Client Library for Java., Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, JDO extensions to the Google HTTP Client Library for Java., Servlet and JDO extensions to the Google OAuth Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -472,7 +488,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -480,46 +496,54 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-appengine-1.25.0-SNAPSHOT.jar</td>
-<td>15.25 kB</td>
+<td>google-http-client-appengine-${project.http.version}.jar</td>
+<td>15.81 kB</td>
 <td>21</td>
 <td>11</td>
 <td>2</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-jdo-1.25.0-SNAPSHOT.jar</td>
-<td>7.79 kB</td>
+<td>google-http-client-jdo-${project.http.version}.jar</td>
+<td>8.08 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="a">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>google-oauth-client-servlet-1.25.0-SNAPSHOT.jar</td>
-<td>22.04 kB</td>
+<tr class="b">
+<td>google-oauth-client-servlet-${project.oauth.version}.jar</td>
+<td>22.92 kB</td>
 <td>24</td>
 <td>11</td>
 <td>4</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -527,7 +551,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -535,7 +559,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>jdo2-api-2.3-eb.jar</td>
 <td>188.18 kB</td>
 <td>226</td>
@@ -543,7 +567,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>7</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>servlet-api-2.5.jar</td>
 <td>102.65 kB</td>
 <td>68</td>
@@ -551,7 +575,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>transaction-api-1.1.jar</td>
 <td>14.72 kB</td>
 <td>24</td>
@@ -559,7 +583,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.3</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -567,7 +591,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -575,7 +599,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -583,7 +607,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -591,23 +615,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>18</td>
-<td>57.66 MB</td>
-<td>15,817</td>
-<td>14,509</td>
-<td>416</td>
-<td>1.6</td>
-<td>18</td></tr>
 <tr class="b">
-<td>compile: 11</td>
-<td>compile: 1.65 MB</td>
-<td>compile: 1,463</td>
-<td>compile: 1,253</td>
-<td>compile: 81</td>
-<td>-</td>
-<td>compile: 11</td></tr>
+<td>19</td>
+<td>57.68 MB</td>
+<td>15,842</td>
+<td>14,523</td>
+<td>417</td>
+<td>1.6</td>
+<td>19</td></tr>
 <tr class="a">
+<td>compile: 12</td>
+<td>compile: 1.67 MB</td>
+<td>compile: 1,488</td>
+<td>compile: 1,267</td>
+<td>compile: 82</td>
+<td>-</td>
+<td>compile: 12</td></tr>
+<tr class="b">
 <td>test: 4</td>
 <td>test: 25.03 MB</td>
 <td>test: 7,502</td>
@@ -615,7 +639,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>test: 241</td>
 <td>-</td>
 <td>test: 4</td></tr>
-<tr class="b">
+<tr class="a">
 <td>provided: 3</td>
 <td>provided: 30.98 MB</td>
 <td>provided: 6,852</td>
@@ -630,144 +654,131 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <th>Repo ID</th>
 <th>URL</th>
 <th>Release</th>
-<th>Snapshot</th></tr>
+<th>Snapshot</th>
+<th>Blacklisted</th></tr>
 <tr class="b">
 <td>apache.snapshots</td>
 <td><a class="externalLink" href="http://repository.apache.org/snapshots">http://repository.apache.org/snapshots</a></td>
 <td>-</td>
-<td>Yes</td></tr>
+<td>Yes</td>
+<td>-</td></tr>
 <tr class="a">
 <td>sonatype-nexus-snapshots</td>
 <td><a class="externalLink" href="https://oss.sonatype.org/content/repositories/snapshots">https://oss.sonatype.org/content/repositories/snapshots</a></td>
 <td>-</td>
+<td>Yes</td>
 <td>Yes</td></tr>
 <tr class="b">
 <td>central</td>
 <td><a class="externalLink" href="https://repo.maven.apache.org/maven2">https://repo.maven.apache.org/maven2</a></td>
 <td>Yes</td>
+<td>-</td>
 <td>-</td></tr></table>
 <p>Repository locations for each of the Dependencies.</p>
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Artifact</th>
 <th>apache.snapshots</th>
-<th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
 <tr class="b">
 <td>com.google.appengine:appengine-api-1.0-sdk:jar:1.7.7</td>
 <td>-</td>
-<td>-</td>
 <td>-</td></tr>
 <tr class="a">
 <td>com.google.appengine:appengine-api-stubs:jar:1.7.7</td>
 <td>-</td>
-<td>-</td>
 <td>-</td></tr>
 <tr class="b">
 <td>com.google.appengine:appengine-testing:jar:1.7.7</td>
 <td>-</td>
-<td>-</td>
 <td>-</td></tr>
 <tr class="a">
 <td>com.google.code.findbugs:jsr305:jar:3.0.2</td>
 <td>-</td>
-<td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.guava:guava:jar:20.0</td>
-<td>-</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
-<td>-</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client-appengine:jar:1.25.0-SNAPSHOT</td>
-<td>-</td>
+<td>com.google.http-client:google-http-client-appengine:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-jdo:jar:1.25.0-SNAPSHOT</td>
-<td>-</td>
+<td>com.google.http-client:google-http-client-jdo:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
-<td>-</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.oauth-client:google-oauth-client-servlet:jar:1.25.0-SNAPSHOT</td>
-<td>-</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-codec:commons-codec:jar:1.6</td>
-<td>-</td>
+<td>com.google.oauth-client:google-oauth-client-servlet:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-logging:commons-logging:jar:1.2</td>
-<td>-</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>javax.jdo:jdo2-api:jar:2.3-eb</td>
-<td>-</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>javax.servlet:servlet-api:jar:2.5</td>
-<td>-</td>
+<td>javax.jdo:jdo2-api:jar:2.3-eb</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>javax.transaction:transaction-api:jar:1.1</td>
-<td>-</td>
+<td>javax.servlet:servlet-api:jar:2.5</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>junit:junit:jar:4.8.2</td>
-<td>-</td>
+<td>javax.transaction:transaction-api:jar:1.1</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
-<td>-</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
-<td>-</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
+<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
-<th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="a">
-<td>18 (compile: 11, test: 4, provided: 3)</td>
-<td>0</td>
+<tr class="b">
+<td>19 (compile: 12, test: 4, provided: 3)</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-oauth-client-dependencies.html b/google-api-client-assembly/dependencies/google-oauth-client-dependencies.html
index a74170e48..b49a5e633 100644
--- a/google-api-client-assembly/dependencies/google-oauth-client-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-oauth-client-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.oauth.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -69,7 +69,7 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
 <div class="section">
@@ -85,13 +85,13 @@ <h3>test<a name="test"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson">google-http-client-jackson</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
@@ -114,18 +114,24 @@ <h3>compile<a name="compile"></a></h3>
 <th>Type</th>
 <th>License</th></tr>
 <tr class="b">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
@@ -141,12 +147,7 @@ <h3>test<a name="test"></a></h3>
 <th>Version</th>
 <th>Type</th>
 <th>License</th></tr>
-<tr class="b">
-<td>org.codehaus.jackson</td>
-<td><a class="externalLink" href="http://jackson.codehaus.org">jackson-core-asl</a></td>
-<td>1.9.11</td>
-<td>jar</td>
-<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Transitive_Dependencies_provided"></a>
+</table></div><a name="Project_Transitive_Dependencies_provided"></a>
 <div class="section">
 <h3>provided<a name="provided"></a></h3>
 <p>The following is a list of provided dependencies for this project. These dependencies are required to compile the application, but should be provided by default when using the library:</p>
@@ -185,7 +186,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -196,7 +197,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">https://github.com/google/google-oauth-java-client/google-oauth-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -247,8 +248,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img13" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep12', '_img13' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep12" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>FindBugs-jsr305</th></tr>
@@ -257,7 +268,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>com.google.http-client:google-http-client-jackson:jar:1.25.0-SNAPSHOT (test) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<li>com.google.http-client:google-http-client-jackson:jar:${project.http.version} (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -267,16 +278,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson">https://github.com/google/google-http-java-client/google-http-client-jackson</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.codehaus.jackson:jackson-core-asl:jar:1.9.11 (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
-<table border="0" class="bodyTable">
-<tr class="a">
-<th>Jackson</th></tr>
-<tr class="b">
-<td>
-<p><b>Description: </b>Jackson is a high-performance JSON processor (parser, generator)</p>
-<p><b>URL: </b><a class="externalLink" href="http://jackson.codehaus.org">http://jackson.codehaus.org</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -285,7 +287,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>com.google.guava:guava:jar:20.0 (test) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (test) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -303,7 +305,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, Jackson, Jackson extensions to the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, Jackson, Jackson extensions to the Google HTTP Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -324,7 +326,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -332,22 +334,30 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-jackson-1.25.0-SNAPSHOT.jar</td>
-<td>6.22 kB</td>
+<td>google-http-client-jackson-${project.http.version}.jar</td>
+<td>6.27 kB</td>
 <td>12</td>
 <td>4</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="a">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -355,7 +365,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -363,7 +373,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -371,7 +381,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -379,7 +389,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -388,14 +398,6 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>jackson-core-asl-1.9.11.jar</td>
-<td>226.69 kB</td>
-<td>137</td>
-<td>121</td>
-<td>8</td>
-<td>1.5</td>
-<td>debug</td></tr>
-<tr class="b">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -403,23 +405,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>10</td>
-<td>4.35 MB</td>
-<td>3,576</td>
-<td>3,224</td>
-<td>125</td>
-<td>1.6</td>
-<td>10</td></tr>
 <tr class="b">
-<td>compile: 5</td>
-<td>compile: 1.35 MB</td>
-<td>compile: 1,098</td>
-<td>compile: 979</td>
-<td>compile: 62</td>
-<td>-</td>
-<td>compile: 5</td></tr>
+<td>11</td>
+<td>4.37 MB</td>
+<td>3,601</td>
+<td>3,238</td>
+<td>126</td>
+<td>1.6</td>
+<td>11</td></tr>
 <tr class="a">
+<td>compile: 6</td>
+<td>compile: 1.36 MB</td>
+<td>compile: 1,123</td>
+<td>compile: 993</td>
+<td>compile: 63</td>
+<td>-</td>
+<td>compile: 6</td></tr>
+<tr class="b">
 <td>test: 4</td>
 <td>test: 2.78 MB</td>
 <td>test: 2,260</td>
@@ -427,7 +429,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>test: 57</td>
 <td>-</td>
 <td>test: 4</td></tr>
-<tr class="b">
+<tr class="a">
 <td>provided: 1</td>
 <td>provided: 227.32 kB</td>
 <td>provided: 218</td>
@@ -471,75 +473,75 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-jackson:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jackson:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.codehaus.jackson:jackson-core-asl:jar:1.9.11</td>
+<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="a">
-<td>10 (compile: 5, test: 4, provided: 1)</td>
+<tr class="b">
+<td>11 (compile: 6, test: 4, provided: 1)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-oauth-client-java6-dependencies.html b/google-api-client-assembly/dependencies/google-oauth-client-java6-dependencies.html
index 099b706b8..c897ff992 100644
--- a/google-api-client-assembly/dependencies/google-oauth-client-java6-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-oauth-client-java6-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.oauth.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,7 +63,7 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Dependencies_test"></a>
 <div class="section">
@@ -79,13 +79,13 @@ <h3>test<a name="test"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson">google-http-client-jackson</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
@@ -116,22 +116,28 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
@@ -147,12 +153,7 @@ <h3>test<a name="test"></a></h3>
 <th>Version</th>
 <th>Type</th>
 <th>License</th></tr>
-<tr class="b">
-<td>org.codehaus.jackson</td>
-<td><a class="externalLink" href="http://jackson.codehaus.org">jackson-core-asl</a></td>
-<td>1.9.11</td>
-<td>jar</td>
-<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr></table></div><a name="Project_Transitive_Dependencies_provided"></a>
+</table></div><a name="Project_Transitive_Dependencies_provided"></a>
 <div class="section">
 <h3>provided<a name="provided"></a></h3>
 <p>The following is a list of provided dependencies for this project. These dependencies are required to compile the application, but should be provided by default when using the library:</p>
@@ -191,7 +192,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.oauth-client:google-oauth-client-java6:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.oauth-client:google-oauth-client-java6:jar:${project.oauth.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Java 6 (and higher) extensions to the Google OAuth Client Library for Java.</th></tr>
@@ -201,7 +202,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-java6">https://github.com/google/google-oauth-java-client/google-oauth-client-java6</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -212,7 +213,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">https://github.com/google/google-oauth-java-client/google-oauth-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -263,8 +264,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>FindBugs-jsr305</th></tr>
@@ -273,7 +284,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-jackson:jar:1.25.0-SNAPSHOT (test) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>com.google.http-client:google-http-client-jackson:jar:${project.http.version} (test) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jackson extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -283,16 +294,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jackson">https://github.com/google/google-http-java-client/google-http-client-jackson</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>org.codehaus.jackson:jackson-core-asl:jar:1.9.11 (test) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
-<table border="0" class="bodyTable">
-<tr class="a">
-<th>Jackson</th></tr>
-<tr class="b">
-<td>
-<p><b>Description: </b>Jackson is a high-performance JSON processor (parser, generator)</p>
-<p><b>URL: </b><a class="externalLink" href="http://jackson.codehaus.org">http://jackson.codehaus.org</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -301,7 +303,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>com.google.guava:guava:jar:20.0 (test) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (test) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -319,7 +321,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, Jackson, Jackson extensions to the Google HTTP Client Library for Java., Java 6 (and higher) extensions to the Google OAuth Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, Jackson, Jackson extensions to the Google HTTP Client Library for Java., Java 6 (and higher) extensions to the Google OAuth Client Library for Java.</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <table border="0" class="bodyTable">
@@ -340,7 +342,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -348,30 +350,38 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-jackson-1.25.0-SNAPSHOT.jar</td>
-<td>6.22 kB</td>
+<td>google-http-client-jackson-${project.http.version}.jar</td>
+<td>6.27 kB</td>
 <td>12</td>
 <td>4</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="a">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -379,7 +389,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -387,7 +397,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -395,7 +405,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -403,7 +413,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -412,14 +422,6 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>jackson-core-asl-1.9.11.jar</td>
-<td>226.69 kB</td>
-<td>137</td>
-<td>121</td>
-<td>8</td>
-<td>1.5</td>
-<td>debug</td></tr>
-<tr class="a">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -427,23 +429,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="b">
-<td>11</td>
-<td>4.41 MB</td>
-<td>3,633</td>
-<td>3,271</td>
-<td>128</td>
-<td>1.6</td>
-<td>11</td></tr>
 <tr class="a">
-<td>compile: 6</td>
-<td>compile: 1.40 MB</td>
-<td>compile: 1,155</td>
-<td>compile: 1,026</td>
-<td>compile: 65</td>
-<td>-</td>
-<td>compile: 6</td></tr>
+<td>12</td>
+<td>4.43 MB</td>
+<td>3,658</td>
+<td>3,285</td>
+<td>129</td>
+<td>1.6</td>
+<td>12</td></tr>
 <tr class="b">
+<td>compile: 7</td>
+<td>compile: 1.42 MB</td>
+<td>compile: 1,180</td>
+<td>compile: 1,040</td>
+<td>compile: 66</td>
+<td>-</td>
+<td>compile: 7</td></tr>
+<tr class="a">
 <td>test: 4</td>
 <td>test: 2.78 MB</td>
 <td>test: 2,260</td>
@@ -451,7 +453,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>test: 57</td>
 <td>-</td>
 <td>test: 4</td></tr>
-<tr class="a">
+<tr class="b">
 <td>provided: 1</td>
 <td>provided: 227.32 kB</td>
 <td>provided: 218</td>
@@ -495,80 +497,80 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-jackson:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jackson:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.codehaus.jackson:jackson-core-asl:jar:1.9.11</td>
+<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="a">
+<tr class="b">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>central</th></tr>
-<tr class="b">
-<td>11 (compile: 6, test: 4, provided: 1)</td>
+<tr class="a">
+<td>12 (compile: 7, test: 4, provided: 1)</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-oauth-client-jetty-dependencies.html b/google-api-client-assembly/dependencies/google-oauth-client-jetty-dependencies.html
index ec4ac3083..76ff2a23a 100644
--- a/google-api-client-assembly/dependencies/google-oauth-client-jetty-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-oauth-client-jetty-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.oauth.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,7 +63,7 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-java6">google-oauth-client-java6</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
@@ -110,40 +110,46 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="a">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.mortbay.jetty</td>
 <td><a class="externalLink" href="http://www.eclipse.org/jetty/jetty-parent/project/jetty-util">jetty-util</a></td>
 <td>6.1.26</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0">Apache Software License - Version 2.0</a>-<a class="externalLink" href="http://www.eclipse.org/org/documents/epl-v10.php">Eclipse Public License - Version 1.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.mortbay.jetty</td>
 <td><a class="externalLink" href="http://jetty.mortbay.org/servlet-api">servlet-api</a></td>
 <td>2.5-20081211</td>
@@ -187,7 +193,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.oauth-client:google-oauth-client-jetty:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.oauth-client:google-oauth-client-jetty:jar:${project.oauth.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jetty extensions to the Google OAuth Client Library for Java.</th></tr>
@@ -197,7 +203,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-jetty">https://github.com/google/google-oauth-java-client/google-oauth-client-jetty</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client-java6:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.oauth-client:google-oauth-client-java6:jar:${project.oauth.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Java 6 (and higher) extensions to the Google OAuth Client Library for Java.</th></tr>
@@ -207,7 +213,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-java6">https://github.com/google/google-oauth-java-client/google-oauth-client-java6</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -218,7 +224,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">https://github.com/google/google-oauth-java-client/google-oauth-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img7" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep6', '_img7' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep6" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img7" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep6', '_img7' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep6" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -269,8 +275,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>FindBugs-jsr305</th></tr>
@@ -279,7 +295,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>org.mortbay.jetty:jetty:jar:6.1.26 (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>org.mortbay.jetty:jetty:jar:6.1.26 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jetty Server</th></tr>
@@ -289,7 +305,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty">http://www.eclipse.org/jetty/jetty-parent/project/modules/jetty</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0">Apache Software License - Version 2.0</a><a class="externalLink" href="http://www.eclipse.org/org/documents/epl-v10.php">Eclipse Public License - Version 1.0</a></p></td></tr></table></div>
 <ul>
-<li>org.mortbay.jetty:jetty-util:jar:6.1.26 (compile) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>org.mortbay.jetty:jetty-util:jar:6.1.26 (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Jetty Utilities</th></tr>
@@ -298,7 +314,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Utility classes for Jetty</p>
 <p><b>URL: </b><a class="externalLink" href="http://www.eclipse.org/jetty/jetty-parent/project/jetty-util">http://www.eclipse.org/jetty/jetty-parent/project/jetty-util</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0">Apache Software License - Version 2.0</a><a class="externalLink" href="http://www.eclipse.org/org/documents/epl-v10.php">Eclipse Public License - Version 1.0</a></p></td></tr></table></div></li>
-<li>org.mortbay.jetty:servlet-api:jar:2.5-20081211 (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<li>org.mortbay.jetty:servlet-api:jar:2.5-20081211 (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Servlet Specification API</th></tr>
@@ -307,7 +323,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Servlet Specification API</p>
 <p><b>URL: </b><a class="externalLink" href="http://jetty.mortbay.org/servlet-api">http://jetty.mortbay.org/servlet-api</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0">Apache License Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -322,7 +338,7 @@ <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Apache Software License - Version 2.0: </b>Jetty Server, Jetty Utilities</p>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Java 6 (and higher) extensions to the Google OAuth Client Library for Java., Jetty extensions to the Google OAuth Client Library for Java.</p>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, FindBugs-jsr305, Google HTTP Client Library for Java, Google OAuth Client Library for Java, J2ObjC Annotations, Java 6 (and higher) extensions to the Google OAuth Client Library for Java., Jetty extensions to the Google OAuth Client Library for Java.</p>
 <p><b>Apache License Version 2.0: </b>Servlet Specification API</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
@@ -344,30 +360,38 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="a">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
-<td>google-oauth-client-java6-1.25.0-SNAPSHOT.jar</td>
-<td>10.97 kB</td>
-<td>16</td>
-<td>6</td>
+<tr class="b">
+<td>google-oauth-client-java6-${project.oauth.version}.jar</td>
+<td>12.66 kB</td>
+<td>18</td>
+<td>8</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -375,7 +399,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -383,7 +407,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -391,7 +415,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -399,7 +423,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -407,7 +431,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>jetty-6.1.26.jar</td>
 <td>527.26 kB</td>
 <td>267</td>
@@ -415,7 +439,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>14</td>
 <td>1.4</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>jetty-util-6.1.26.jar</td>
 <td>172.98 kB</td>
 <td>120</td>
@@ -423,7 +447,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.4</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>servlet-api-2.5-20081211.jar</td>
 <td>130.99 kB</td>
 <td>79</td>
@@ -431,7 +455,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.4</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -439,23 +463,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="a">
-<td>12</td>
-<td>2.67 MB</td>
-<td>2,122</td>
-<td>1,722</td>
-<td>124</td>
-<td>1.6</td>
-<td>12</td></tr>
 <tr class="b">
-<td>compile: 10</td>
-<td>compile: 2.23 MB</td>
-<td>compile: 1,637</td>
-<td>compile: 1,416</td>
-<td>compile: 88</td>
-<td>-</td>
-<td>compile: 10</td></tr>
+<td>13</td>
+<td>2.70 MB</td>
+<td>2,149</td>
+<td>1,738</td>
+<td>125</td>
+<td>1.6</td>
+<td>13</td></tr>
 <tr class="a">
+<td>compile: 11</td>
+<td>compile: 2.25 MB</td>
+<td>compile: 1,664</td>
+<td>compile: 1,432</td>
+<td>compile: 89</td>
+<td>-</td>
+<td>compile: 11</td></tr>
+<tr class="b">
 <td>test: 1</td>
 <td>test: 231.78 kB</td>
 <td>test: 267</td>
@@ -463,7 +487,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>test: 30</td>
 <td>-</td>
 <td>test: 1</td></tr>
-<tr class="b">
+<tr class="a">
 <td>provided: 1</td>
 <td>provided: 227.32 kB</td>
 <td>provided: 218</td>
@@ -533,111 +557,118 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.oauth-client:google-oauth-client-java6:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.oauth-client:google-oauth-client-java6:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>junit:junit:jar:4.8.2</td>
+<td>commons-logging:commons-logging:jar:1.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
+<td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
+<td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.mortbay.jetty:jetty:jar:6.1.26</td>
+<td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>org.mortbay.jetty:jetty-util:jar:6.1.26</td>
+<td>org.mortbay.jetty:jetty:jar:6.1.26</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>org.mortbay.jetty:servlet-api:jar:2.5-20081211</td>
+<td>org.mortbay.jetty:jetty-util:jar:6.1.26</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
+<td>org.mortbay.jetty:servlet-api:jar:2.5-20081211</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="a">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>java.net</th>
 <th>m1.java.net</th>
 <th>central</th></tr>
-<tr class="a">
-<td>12 (compile: 10, test: 1, provided: 1)</td>
+<tr class="b">
+<td>13 (compile: 11, test: 1, provided: 1)</td>
 <td>0</td>
 <td>0</td>
 <td>0</td>
 <td>0</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/google-oauth-client-servlet-dependencies.html b/google-api-client-assembly/dependencies/google-oauth-client-servlet-dependencies.html
index 1731d69e2..22121a702 100644
--- a/google-api-client-assembly/dependencies/google-oauth-client-servlet-dependencies.html
+++ b/google-api-client-assembly/dependencies/google-oauth-client-servlet-dependencies.html
@@ -1,52 +1,52 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<!-- Generated by Apache Maven Doxia at Jul 25, 2018 -->
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <title>Project Dependencies</title>
-    <style type="text/css" media="all">
-      @import url("./css/maven-base.css");
-      @import url("./css/maven-theme.css");
-      @import url("./css/site.css");
-    </style>
-    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
-    <meta name="Date-Revision-yyyymmdd" content="20180725" />
-    <meta http-equiv="Content-Language" content="en" />
-        
-        </head>
-  <body class="composite">
-    <div id="banner">
-                      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="breadcrumbs">
-            
-        
-                <div class="xleft">
-        <span id="publishDate">Last Published: 2018-07-25</span>
-                  &nbsp;| <span id="projectVersion">Version: 1.25.0-SNAPSHOT</span>
-                      </div>
-            <div class="xright">        
-        
-      </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-    <div id="leftColumn">
-      <div id="navcolumn">
-             
-        
-                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
-        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
-      </a>
-                   
-        
-            </div>
-    </div>
-    <div id="bodyColumn">
-      <div id="contentBox">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- Generated by Apache Maven Doxia at Aug 20, 2018 -->
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <title>Project Dependencies</title>
+    <style type="text/css" media="all">
+      @import url("./css/maven-base.css");
+      @import url("./css/maven-theme.css");
+      @import url("./css/site.css");
+    </style>
+    <link rel="stylesheet" href="./css/print.css" type="text/css" media="print" />
+    <meta name="Date-Revision-yyyymmdd" content="20180820" />
+    <meta http-equiv="Content-Language" content="en" />
+        
+        </head>
+  <body class="composite">
+    <div id="banner">
+                      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="breadcrumbs">
+            
+        
+                <div class="xleft">
+        <span id="publishDate">Last Published: 2018-08-20</span>
+                  &nbsp;| <span id="projectVersion">Version: ${project.oauth.version}</span>
+                      </div>
+            <div class="xright">        
+        
+      </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+    <div id="leftColumn">
+      <div id="navcolumn">
+             
+        
+                                      <a href="http://maven.apache.org/" title="Built by Maven" class="poweredBy">
+        <img class="poweredBy" alt="Built by Maven" src="./images/logos/maven-feather.png" />
+      </a>
+                   
+        
+            </div>
+    </div>
+    <div id="bodyColumn">
+      <div id="contentBox">
         <a name="Project_Dependencies"></a>
 <div class="section">
 <h2>Project Dependencies<a name="Project_Dependencies"></a></h2><a name="Project_Dependencies_compile"></a>
@@ -63,13 +63,13 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="b">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jdo">google-http-client-jdo</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
 <td>com.google.oauth-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">google-oauth-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.oauth.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
@@ -91,7 +91,7 @@ <h3>test<a name="test"></a></h3>
 <tr class="b">
 <td>com.google.guava</td>
 <td><a class="externalLink" href="https://github.com/google/guava/guava">guava</a></td>
-<td>20.0</td>
+<td>26.0-android</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="a">
@@ -162,28 +162,34 @@ <h3>compile<a name="compile"></a></h3>
 <tr class="a">
 <td>com.google.http-client</td>
 <td><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client">google-http-client</a></td>
-<td>1.25.0-SNAPSHOT</td>
+<td>${project.http.version}</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
 <tr class="b">
+<td>com.google.j2objc</td>
+<td><a class="externalLink" href="https://github.com/google/j2objc/">j2objc-annotations</a></td>
+<td>1.1</td>
+<td>jar</td>
+<td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
+<tr class="a">
 <td>commons-logging</td>
 <td><a class="externalLink" href="http://commons.apache.org/proper/commons-logging/">commons-logging</a></td>
 <td>1.2</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>javax.transaction</td>
 <td>transaction-api</td>
 <td>1.1</td>
 <td>jar</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-client">httpclient</a></td>
 <td>4.5.3</td>
 <td>jar</td>
 <td><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache License, Version 2.0</a></td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents</td>
 <td><a class="externalLink" href="http://hc.apache.org/httpcomponents-core-ga">httpcore</a></td>
 <td>4.4.6</td>
@@ -227,7 +233,7 @@ <h2>Project Dependency Graph<a name="Project_Dependency_Graph"></a></h2><script
 <div class="section">
 <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <ul>
-<li>com.google.oauth-client:google-oauth-client-servlet:jar:1.25.0-SNAPSHOT <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
+<li>com.google.oauth-client:google-oauth-client-servlet:jar:${project.oauth.version} <img id="_img1" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep0', '_img1' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep0" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Servlet and JDO extensions to the Google OAuth Client Library for Java.</th></tr>
@@ -237,7 +243,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client-servlet">https://github.com/google/google-oauth-java-client/google-oauth-client-servlet</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
+<li>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version} (compile) <img id="_img3" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep2', '_img3' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep2" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google OAuth Client Library for Java</th></tr>
@@ -248,7 +254,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-oauth-java-client/google-oauth-client">https://github.com/google/google-oauth-java-client/google-oauth-client</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div>
 <ul>
-<li>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
+<li>com.google.http-client:google-http-client:jar:${project.http.version} (compile) <img id="_img5" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep4', '_img5' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep4" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Google HTTP Client Library for Java</th></tr>
@@ -299,8 +305,18 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
      widely used encoders and decoders, the codec package also maintains a
      collection of phonetic encoding utilities.</p>
 <p><b>URL: </b><a class="externalLink" href="http://commons.apache.org/codec/">http://commons.apache.org/codec/</a></p>
-<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li></ul></li>
-<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.j2objc:j2objc-annotations:jar:1.1 (compile) <img id="_img15" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep14', '_img15' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep14" style="display:none">
+<table border="0" class="bodyTable">
+<tr class="a">
+<th>J2ObjC Annotations</th></tr>
+<tr class="b">
+<td>
+<p><b>Description: </b>A set of annotations that provide additional information to the J2ObjC
+    translator to modify the result of translation.</p>
+<p><b>URL: </b><a class="externalLink" href="https://github.com/google/j2objc/">https://github.com/google/j2objc/</a></p>
+<p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
+<li>com.google.code.findbugs:jsr305:jar:3.0.2 (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>FindBugs-jsr305</th></tr>
@@ -309,7 +325,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JSR305 Annotations for Findbugs</p>
 <p><b>URL: </b><a class="externalLink" href="http://findbugs.sourceforge.net/">http://findbugs.sourceforge.net/</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li></ul></li>
-<li>com.google.http-client:google-http-client-jdo:jar:1.25.0-SNAPSHOT (compile) <img id="_img17" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep16', '_img17' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep16" style="display:none">
+<li>com.google.http-client:google-http-client-jdo:jar:${project.http.version} (compile) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JDO extensions to the Google HTTP Client Library for Java.</th></tr>
@@ -318,7 +334,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Sonatype helps open source projects to set up Maven repositories on https://oss.sonatype.org/</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/google-http-java-client/google-http-client-jdo">https://github.com/google/google-http-java-client/google-http-client-jdo</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>junit:junit:jar:4.8.2 (test) <img id="_img19" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep18', '_img19' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep18" style="display:none">
+<li>junit:junit:jar:4.8.2 (test) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JUnit</th></tr>
@@ -327,7 +343,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>JUnit is a regression testing framework. It is used by the developer who implements unit tests in Java.</p>
 <p><b>URL: </b><a class="externalLink" href="http://junit.org">http://junit.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.opensource.org/licenses/cpl1.0.txt">Common Public License Version 1.0</a></p></td></tr></table></div></li>
-<li>javax.servlet:servlet-api:jar:2.5 (provided) <img id="_img21" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep20', '_img21' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep20" style="display:none">
+<li>javax.servlet:servlet-api:jar:2.5 (provided) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>servlet-api</th></tr>
@@ -335,7 +351,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <td>
 <p><b>Description: </b>There is currently no description associated with this project.</p>
 <p><b>Project License: </b>No license is defined for this project.</p></td></tr></table></div></li>
-<li>javax.jdo:jdo2-api:jar:2.3-eb (compile) <img id="_img23" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep22', '_img23' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep22" style="display:none">
+<li>javax.jdo:jdo2-api:jar:2.3-eb (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>JDO2 API</th></tr>
@@ -345,7 +361,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>URL: </b><a class="externalLink" href="http://db.apache.org/jdo/index.html">http://db.apache.org/jdo/index.html</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">Apache 2</a></p></td></tr></table></div>
 <ul>
-<li>javax.transaction:transaction-api:jar:1.1 (compile) <img id="_img25" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep24', '_img25' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep24" style="display:none">
+<li>javax.transaction:transaction-api:jar:1.1 (compile) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>transaction-api</th></tr>
@@ -353,7 +369,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <td>
 <p><b>Description: </b>There is currently no description associated with this project.</p>
 <p><b>Project License: </b>No license is defined for this project.</p></td></tr></table></div></li></ul></li>
-<li>com.google.guava:guava:jar:20.0 (test) <img id="_img27" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep26', '_img27' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep26" style="display:none">
+<li>com.google.guava:guava:jar:26.0-android (test) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>Guava: Google Core Libraries for Java</th></tr>
@@ -367,7 +383,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
     per the JSR-305 spec.</p>
 <p><b>URL: </b><a class="externalLink" href="https://github.com/google/guava/guava">https://github.com/google/guava/guava</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>org.datanucleus:datanucleus-core:jar:3.2.2 (test) <img id="_img29" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep28', '_img29' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep28" style="display:none">
+<li>org.datanucleus:datanucleus-core:jar:3.2.2 (test) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>DataNucleus Core</th></tr>
@@ -377,7 +393,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
         It supports persistence API's being layered on top of the core functionality.</p>
 <p><b>URL: </b><a class="externalLink" href="http://www.datanucleus.org">http://www.datanucleus.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>org.datanucleus:datanucleus-api-jdo:jar:3.2.1 (test) <img id="_img31" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep30', '_img31' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep30" style="display:none">
+<li>org.datanucleus:datanucleus-api-jdo:jar:3.2.1 (test) <img id="_img33" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep32', '_img33' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep32" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>DataNucleus JDO API plugin</th></tr>
@@ -386,7 +402,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Plugin providing DataNucleus implementation of JDO API.</p>
 <p><b>URL: </b><a class="externalLink" href="http://www.datanucleus.org">http://www.datanucleus.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>org.datanucleus:datanucleus-rdbms:jar:3.2.1 (test) <img id="_img33" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep32', '_img33' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep32" style="display:none">
+<li>org.datanucleus:datanucleus-rdbms:jar:3.2.1 (test) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>DataNucleus RDBMS</th></tr>
@@ -395,7 +411,7 @@ <h3>Dependency Tree<a name="Dependency_Tree"></a></h3>
 <p><b>Description: </b>Plugin for DataNucleus providing persistence to RDBMS datastores.</p>
 <p><b>URL: </b><a class="externalLink" href="http://www.datanucleus.org">http://www.datanucleus.org</a></p>
 <p><b>Project License: </b><a class="externalLink" href="http://www.apache.org/licenses/LICENSE-2.0.txt">The Apache Software License, Version 2.0</a></p></td></tr></table></div></li>
-<li>mysql:mysql-connector-java:jar:5.1.18 (test) <img id="_img35" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep34', '_img35' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep34" style="display:none">
+<li>mysql:mysql-connector-java:jar:5.1.18 (test) <img id="_img37" src="./images/icon_info_sml.gif" alt="Information" onclick="toggleDependencyDetail( '_dep36', '_img37' );" style="cursor: pointer;vertical-align:text-bottom;"></img><div id="_dep36" style="display:none">
 <table border="0" class="bodyTable">
 <tr class="a">
 <th>MySQL Connector/J</th></tr>
@@ -410,7 +426,7 @@ <h2>Licenses<a name="Licenses"></a></h2>
 <p><b>Unknown: </b>servlet-api, transaction-api</p>
 <p><b>Apache License, Version 2.0: </b>Apache HttpClient, Apache HttpCore</p>
 <p><b>Common Public License Version 1.0: </b>JUnit</p>
-<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, DataNucleus Core, DataNucleus JDO API plugin, DataNucleus RDBMS, FindBugs-jsr305, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, JDO extensions to the Google HTTP Client Library for Java., Servlet and JDO extensions to the Google OAuth Client Library for Java.</p>
+<p><b>The Apache Software License, Version 2.0: </b>Apache Commons Logging, Commons Codec, DataNucleus Core, DataNucleus JDO API plugin, DataNucleus RDBMS, FindBugs-jsr305, Google HTTP Client Library for Java, Google OAuth Client Library for Java, Guava: Google Core Libraries for Java, J2ObjC Annotations, JDO extensions to the Google HTTP Client Library for Java., Servlet and JDO extensions to the Google OAuth Client Library for Java.</p>
 <p><b>The GNU General Public License, Version 2: </b>MySQL Connector/J</p></div><a name="Dependency_File_Details"></a>
 <div class="section">
 <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
@@ -432,7 +448,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.5</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>guava-20.0.jar</td>
+<td>guava-26.0-android.jar</td>
 <td>2.33 MB</td>
 <td>1,844</td>
 <td>1,814</td>
@@ -440,30 +456,38 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-http-client-1.25.0-SNAPSHOT.jar</td>
-<td>251.08 kB</td>
-<td>221</td>
-<td>198</td>
+<td>google-http-client-${project.http.version}.jar</td>
+<td>261.81 kB</td>
+<td>223</td>
+<td>200</td>
 <td>16</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="a">
-<td>google-http-client-jdo-1.25.0-SNAPSHOT.jar</td>
-<td>7.79 kB</td>
+<td>google-http-client-jdo-${project.http.version}.jar</td>
+<td>8.08 kB</td>
 <td>13</td>
 <td>5</td>
 <td>1</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
 <tr class="b">
-<td>google-oauth-client-1.25.0-SNAPSHOT.jar</td>
-<td>60.17 kB</td>
+<td>j2objc-annotations-1.1.jar</td>
+<td>8.58 kB</td>
+<td>23</td>
+<td>12</td>
+<td>1</td>
+<td>1.5</td>
+<td>debug</td></tr>
+<tr class="a">
+<td>google-oauth-client-${project.oauth.version}.jar</td>
+<td>61.64 kB</td>
 <td>57</td>
 <td>47</td>
 <td>3</td>
-<td>1.5</td>
+<td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>commons-codec-1.6.jar</td>
 <td>227.32 kB</td>
 <td>218</td>
@@ -471,7 +495,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>commons-logging-1.2.jar</td>
 <td>60.38 kB</td>
 <td>42</td>
@@ -479,7 +503,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.2</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>jdo2-api-2.3-eb.jar</td>
 <td>188.18 kB</td>
 <td>226</td>
@@ -487,7 +511,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>7</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>servlet-api-2.5.jar</td>
 <td>102.65 kB</td>
 <td>68</td>
@@ -495,7 +519,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>transaction-api-1.1.jar</td>
 <td>14.72 kB</td>
 <td>24</td>
@@ -503,7 +527,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>2</td>
 <td>1.3</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>junit-4.8.2.jar</td>
 <td>231.78 kB</td>
 <td>267</td>
@@ -511,7 +535,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>30</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>mysql-connector-java-5.1.18.jar</td>
 <td>771.37 kB</td>
 <td>279</td>
@@ -519,7 +543,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>12</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>httpclient-4.5.3.jar</td>
 <td>730.27 kB</td>
 <td>507</td>
@@ -527,7 +551,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>24</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>httpcore-4.4.6.jar</td>
 <td>316.23 kB</td>
 <td>282</td>
@@ -535,7 +559,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>17</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>datanucleus-api-jdo-3.2.1.jar</td>
 <td>329.11 kB</td>
 <td>180</td>
@@ -543,7 +567,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>6</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <td>datanucleus-core-3.2.2.jar</td>
 <td>1.72 MB</td>
 <td>943</td>
@@ -551,7 +575,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>50</td>
 <td>1.5</td>
 <td>debug</td></tr>
-<tr class="b">
+<tr class="a">
 <td>datanucleus-rdbms-3.2.1.jar</td>
 <td>1.69 MB</td>
 <td>768</td>
@@ -559,7 +583,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>29</td>
 <td>1.6</td>
 <td>debug</td></tr>
-<tr class="a">
+<tr class="b">
 <th>Total</th>
 <th>Size</th>
 <th>Entries</th>
@@ -567,23 +591,23 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <th>Packages</th>
 <th>JDK Rev</th>
 <th>Debug</th></tr>
-<tr class="b">
-<td>17</td>
-<td>8.97 MB</td>
-<td>5,985</td>
-<td>5,320</td>
-<td>228</td>
-<td>1.6</td>
-<td>17</td></tr>
 <tr class="a">
-<td>compile: 9</td>
-<td>compile: 1.61 MB</td>
-<td>compile: 1,418</td>
-<td>compile: 1,231</td>
-<td>compile: 75</td>
-<td>-</td>
-<td>compile: 9</td></tr>
+<td>18</td>
+<td>8.99 MB</td>
+<td>6,010</td>
+<td>5,334</td>
+<td>229</td>
+<td>1.6</td>
+<td>18</td></tr>
 <tr class="b">
+<td>compile: 10</td>
+<td>compile: 1.63 MB</td>
+<td>compile: 1,443</td>
+<td>compile: 1,245</td>
+<td>compile: 76</td>
+<td>-</td>
+<td>compile: 10</td></tr>
+<tr class="a">
 <td>test: 6</td>
 <td>test: 7.04 MB</td>
 <td>test: 4,281</td>
@@ -591,7 +615,7 @@ <h2>Dependency File Details<a name="Dependency_File_Details"></a></h2>
 <td>test: 145</td>
 <td>-</td>
 <td>test: 6</td></tr>
-<tr class="a">
+<tr class="b">
 <td>provided: 2</td>
 <td>provided: 329.96 kB</td>
 <td>provided: 286</td>
@@ -642,128 +666,134 @@ <h2>Dependency Repository Locations<a name="Dependency_Repository_Locations"></a
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.guava:guava:jar:20.0</td>
+<td>com.google.guava:guava:jar:26.0-android</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.http-client:google-http-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>com.google.http-client:google-http-client-jdo:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.http-client:google-http-client-jdo:jar:${project.http.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>com.google.oauth-client:google-oauth-client:jar:1.25.0-SNAPSHOT</td>
+<td>com.google.j2objc:j2objc-annotations:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
-<td>commons-codec:commons-codec:jar:1.6</td>
+<td>com.google.oauth-client:google-oauth-client:jar:${project.oauth.version}</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="b">
-<td>commons-logging:commons-logging:jar:1.2</td>
+<td>commons-codec:commons-codec:jar:1.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
 <tr class="a">
+<td>commons-logging:commons-logging:jar:1.2</td>
+<td>-</td>
+<td>-</td>
+<td>-</td>
+<td>-</td></tr>
+<tr class="b">
 <td>javax.jdo:jdo2-api:jar:2.3-eb</td>
 <td>-</td>
 <td>-</td>
 <td><a class="externalLink" href="http://www.datanucleus.org/downloads/maven2//javax/jdo/jdo2-api/2.3-eb/jdo2-api-2.3-eb.jar"><img alt="Found at http://www.datanucleus.org/downloads/maven2/" src="images/icon_success_sml.gif" /></a></td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>javax.servlet:servlet-api:jar:2.5</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="a">
+<tr class="b">
 <td>javax.transaction:transaction-api:jar:1.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>junit:junit:jar:4.8.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="a">
+<tr class="b">
 <td>mysql:mysql-connector-java:jar:5.1.18</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.apache.httpcomponents:httpclient:jar:4.5.3</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.apache.httpcomponents:httpcore:jar:4.4.6</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.datanucleus:datanucleus-api-jdo:jar:3.2.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="a">
+<tr class="b">
 <td>org.datanucleus:datanucleus-core:jar:3.2.2</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="b">
+<tr class="a">
 <td>org.datanucleus:datanucleus-rdbms:jar:3.2.1</td>
 <td>-</td>
 <td>-</td>
 <td>-</td>
 <td>-</td></tr>
-<tr class="a">
+<tr class="b">
 <th>Total</th>
 <th>apache.snapshots</th>
 <th>sonatype-nexus-snapshots</th>
 <th>DN_M2_Repo</th>
 <th>central</th></tr>
-<tr class="b">
-<td>17 (compile: 9, test: 6, provided: 2)</td>
+<tr class="a">
+<td>18 (compile: 10, test: 6, provided: 2)</td>
 <td>0</td>
 <td>0</td>
 <td>1</td>
-<td>0</td></tr></table></div>
-      </div>
-    </div>
-    <div class="clear">
-      <hr/>
-    </div>
-    <div id="footer">
-      <div class="xright">
-              Copyright &#169;                    2011-2018
-                        <a href="http://www.google.com/">Google</a>.
-            All Rights Reserved.      
-        
-                  </div>
-      <div class="clear">
-        <hr/>
-      </div>
-    </div>
-  </body>
-</html>
+<td>0</td></tr></table></div>
+      </div>
+    </div>
+    <div class="clear">
+      <hr/>
+    </div>
+    <div id="footer">
+      <div class="xright">
+              Copyright &#169;                    2011-2018
+                        <a href="http://www.google.com/">Google</a>.
+            All Rights Reserved.      
+        
+                  </div>
+      <div class="clear">
+        <hr/>
+      </div>
+    </div>
+  </body>
+</html>
diff --git a/google-api-client-assembly/dependencies/xpp3_LICENSE.txt b/google-api-client-assembly/dependencies/xpp3_LICENSE.txt
index d84c14b3d..4d7310cd7 100644
--- a/google-api-client-assembly/dependencies/xpp3_LICENSE.txt
+++ b/google-api-client-assembly/dependencies/xpp3_LICENSE.txt
@@ -2,7 +2,7 @@ Indiana University Extreme! Lab Software License
 
 Version 1.1.1
 
-Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
+Copyright 2002 Extreme! Lab, Indiana University. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml
index c6f5d7431..c7b1499ea 100644
--- a/google-api-client-assembly/pom.xml
+++ b/google-api-client-assembly/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.25.0-SNAPSHOT</version>
+    <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <groupId>com.google.api-client</groupId>
@@ -13,16 +13,6 @@
   <name>Assembly for the Google APIs Client Library for Java</name>
 
   <dependencies>
-    <dependency>
-      <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-assembly</artifactId>
-      <type>pom</type>
-    </dependency>
-    <dependency>
-      <groupId>com.google.oauth-client</groupId>
-      <artifactId>google-oauth-client-assembly</artifactId>
-      <type>pom</type>
-    </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
@@ -62,6 +52,19 @@
   </dependencies>
 
   <build>
+    <pluginManagement>
+      <plugins>
+        <plugin>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <configuration>
+            <descriptors>
+              <descriptor>assembly.xml</descriptor>
+            </descriptors>
+            <finalName>google-api-java-client</finalName>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
     <plugins>
       <plugin>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -102,12 +105,6 @@
             <goals>
               <goal>single</goal>
             </goals>
-            <configuration>
-              <descriptors>
-                <descriptor>assembly.xml</descriptor>
-              </descriptors>
-              <finalName>google-api-java-client</finalName>
-            </configuration>
           </execution>
         </executions>
       </plugin>
diff --git a/google-api-client-assembly/android-properties/google-api-client-android-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-api-client-android.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-api-client-android-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-api-client-android.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-api-client-gson-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-api-client-gson.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-api-client-gson-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-api-client-gson.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-api-client-jackson2-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-api-client-jackson2.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-api-client-jackson2-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-api-client-jackson2.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-api-client-protobuf-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-api-client-protobuf.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-api-client-protobuf-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-api-client-protobuf.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-api-client-xml-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-api-client-xml.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-api-client-xml-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-api-client-xml.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-api-client-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-api-client.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-api-client-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-api-client.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-http-client-android-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-http-client-android.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-http-client-android-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-http-client-android.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-http-client-gson-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-http-client-gson.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-http-client-gson-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-http-client-gson.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-http-client-jackson-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-http-client-jackson.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-http-client-jackson-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-http-client-jackson.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-http-client-jackson2-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-http-client-jackson2.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-http-client-jackson2-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-http-client-jackson2.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-http-client-jdo-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-http-client-jdo.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-http-client-jdo-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-http-client-jdo.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-http-client-protobuf-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-http-client-protobuf.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-http-client-protobuf-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-http-client-protobuf.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-http-client-xml-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-http-client-xml.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-http-client-xml-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-http-client-xml.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-http-client-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-http-client.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-http-client-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-http-client.jar.properties
diff --git a/google-api-client-assembly/android-properties/google-oauth-client-1.25.0-SNAPSHOT.jar.properties b/google-api-client-assembly/properties/google-oauth-client.jar.properties
similarity index 100%
rename from google-api-client-assembly/android-properties/google-oauth-client-1.25.0-SNAPSHOT.jar.properties
rename to google-api-client-assembly/properties/google-oauth-client.jar.properties
diff --git a/google-api-client-assembly/readme.html b/google-api-client-assembly/readme.html
index cc4ee4e9f..43822f309 100644
--- a/google-api-client-assembly/readme.html
+++ b/google-api-client-assembly/readme.html
@@ -6,16 +6,16 @@ <h2>${project.name} ${project.version}</h2>
   <h3>Overview</h3>
   <p>
     High-level details about this library can be found at <a
-      href="http://code.google.com/p/google-api-java-client">http://code.google.com/p/google-api-java-client</a>
+      href="https://github.com/googleapis/google-api-java-client">google-api-java-client</a>
   </p>
   <ul>
     <li><a
-      href='http://code.google.com/p/google-api-java-client/wiki/ReleaseNotes#Version_${project.version}'>Release
+      href='https://github.com/googleapis/google-api-java-client#Version_${project.version}'>Release
         Notes</a></li>
     <li><a
       href='http://javadoc.google-api-java-client.googlecode.com/hg/${project.version}/index.html'>JavaDoc</a></li>
     <li><a
-      href='http://code.google.com/p/google-api-java-client/wiki/DeveloperGuide'>Developer's
+      href='https://developers.google.com/api-client-library/java/google-api-java-client/dev-guide'>Developer's
         Guide</a></li>
     <li><a href='http://groups.google.com/group/google-api-java-client'>Support</a></li>
   </ul>
@@ -68,7 +68,7 @@ <h3>Dependencies and Licenses</h3>
 
   <h3>Maven Usage</h3>
   For information on how to add these libraries to your Maven project please see
-  <a href='http://code.google.com/p/google-api-java-client/wiki/Setup#Maven'>http://code.google.com/p/google-api-java-client/wiki/Setup#Maven</a>.
+  <a href='https://github.com/googleapis/google-api-java-client#Maven'>Maven</a>.
 
   <h3>Eclipse</h3>
   A .classpath file snippet that can be included in your project's .classpath
@@ -90,7 +90,7 @@ <h3>ProGuard</h3>
   </p>
   <p>
     Please read <a
-      href="http://code.google.com/p/google-http-java-client/wiki/Setup#ProGuard">Setup
+      href="https://github.com/googleapis/google-http-java-client#ProGuard">Setup
       ProGuard</a> for more details.
   </p>
 
@@ -123,12 +123,6 @@ <h3>Dependencies for all Platforms</h3>
         <li>jackson-core-${project.jackson-core2.version}.jar</li>
       </ul>
     </li>
-    <li>google-http-client-jackson-${project.http.version}.jar (when using
-      Jackson 1)
-      <ul>
-        <li>jackson-core-asl-${project.jackson-core-asl.version}.jar</li>
-      </ul>
-    </li>
     <li>google-api-client-xml-${project.version}.jar (when using XML)
       <ul>
         <li>google-http-client-xml-${project.version}.jar</li>
@@ -148,8 +142,8 @@ <h3>Android Dependencies</h3>
   <a href='libs'>libs</a> folder also contains properties files that specify the
   location of source jars for Android projects in Eclipse.
   <br /> Please see the
-  <a href='http://code.google.com/p/google-api-java-client/wiki/Android'>Android
-    wiki</a> for the Android Developer's Guide.
+  <a href='https://github.com/googleapis/google-api-java-client'>Android
+    </a> for the Android Developer's Guide.
 
   <h3>Google App Engine Dependencies</h3>
   The following are the jars from the
@@ -165,7 +159,7 @@ <h3>Google App Engine Dependencies</h3>
     <li>transaction-api-${project.transaction-api.version}.jar</li>
   </ul>
   Please see the
-  <a href='http://code.google.com/p/google-api-java-client/wiki/GoogleAppEngine'>GoogleAppEngine
+  <a href='https://developers.google.com/api-client-library/java/google-api-java-client/dev-guide'>GoogleAppEngine
     wiki</a> for the Google App Engine Developer's Guide.
 
   <h3>Servlet Dependencies</h3>
diff --git a/google-api-client-bom/README.md b/google-api-client-bom/README.md
new file mode 100644
index 000000000..4a1f87634
--- /dev/null
+++ b/google-api-client-bom/README.md
@@ -0,0 +1,28 @@
+# Google API Client Library Bill of Materials
+
+The `google-api-client-bom` module is a pom that can be used to import consistent 
+versions of `google-api-client` components.
+
+To use it in Maven, add the following to your `pom.xml`:
+
+[//]: # ({x-version-update-start:google-api-client:released})
+```xml
+<dependencyManagement>
+  <dependencies>
+    <dependency>
+      <groupId>com.google.api-client</groupId>
+      <artifactId>google-api-client-bom</artifactId>
+      <version>1.30.3</version>
+      <type>pom</type>
+      <scope>import</scope>
+    </dependency>
+  </dependencies>
+</dependencyManagement>
+```
+[//]: # ({x-version-update-end})
+
+## License
+
+Apache 2.0 - See [LICENSE] for more information.
+
+[LICENSE]: https://github.com/googleapis/google-api-java-client/blob/master/LICENSE
diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml
new file mode 100644
index 000000000..14f523c98
--- /dev/null
+++ b/google-api-client-bom/pom.xml
@@ -0,0 +1,199 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.api-client</groupId>
+  <artifactId>google-api-client-bom</artifactId>
+  <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
+  <packaging>pom</packaging>
+
+  <name>Google API Client Library for Java BOM</name>
+  <url>https://github.com/googleapis/google-api-java-client/tree/master/google-api-client-bom</url>
+  <description>
+    BOM for Google API Client Library for Java
+  </description>
+
+  <organization>
+    <name>Google LLC</name>
+  </organization>
+
+  <developers>
+    <developer>
+      <id>chingor13</id>
+      <name>Jeff Ching</name>
+      <email>chingor@google.com</email>
+      <organization>Google LLC</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+  </developers>
+
+  <scm>
+    <connection>scm:git:https://github.com/googleapis/google-api-java-client.git</connection>
+    <developerConnection>scm:git:git@github.com:googleapis/google-api-java-client.git</developerConnection>
+    <url>https://github.com/googleapis/google-api-java-client</url>
+  </scm>
+
+  <distributionManagement>
+    <snapshotRepository>
+      <id>sonatype-nexus-snapshots</id>
+      <url>https://google.oss.sonatype.org/content/repositories/snapshots</url>
+    </snapshotRepository>
+    <repository>
+      <id>sonatype-nexus-staging</id>
+      <url>https://google.oss.sonatype.org/service/local/staging/deploy/maven2/</url>
+    </repository>
+    <site>
+      <id>github-pages-site</id>
+      <name>Deployment through GitHub's site deployment plugin</name>
+      <url>site/google-cloud-bom</url>
+    </site>
+  </distributionManagement>
+
+  <licenses>
+    <license>
+      <name>The Apache Software License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client</artifactId>
+        <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
+      </dependency>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client-android</artifactId>
+        <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
+      </dependency>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client-appengine</artifactId>
+        <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
+      </dependency>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client-assembly</artifactId>
+        <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
+        <type>pom</type>
+      </dependency>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client-gson</artifactId>
+        <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
+      </dependency>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client-jackson2</artifactId>
+        <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
+      </dependency>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client-java6</artifactId>
+        <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
+      </dependency>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client-protobuf</artifactId>
+        <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
+      </dependency>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client-servlet</artifactId>
+        <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
+      </dependency>
+      <dependency>
+        <groupId>com.google.api-client</groupId>
+        <artifactId>google-api-client-xml</artifactId>
+        <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.8</version>
+        <extensions>true</extensions>
+        <configuration>
+          <serverId>sonatype-nexus-staging</serverId>
+          <nexusUrl>https://google.oss.sonatype.org/</nexusUrl>
+          <autoReleaseAfterClose>false</autoReleaseAfterClose>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-javadoc-plugin</artifactId>
+        <version>3.2.0</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-site-plugin</artifactId>
+        <version>3.9.1</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.coveo</groupId>
+        <artifactId>fmt-maven-plugin</artifactId>
+        <version>2.11</version>
+        <configuration>
+          <style>google</style>
+          <verbose>true</verbose>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.google.googlejavaformat</groupId>
+            <artifactId>google-java-format</artifactId>
+            <version>1.10.0</version>
+          </dependency>
+        </dependencies>
+      </plugin>
+    </plugins>
+  </build>
+
+  <profiles>
+    <profile>
+      <id>release-sign-artifacts</id>
+      <activation>
+        <property>
+          <name>performRelease</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>3.0.1</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+                <configuration>
+                  <gpgArguments>
+                    <arg>--pinentry-mode</arg>
+                    <arg>loopback</arg>
+                  </gpgArguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+</project>
diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml
index 4bf4862fa..913d2daf3 100644
--- a/google-api-client-gson/pom.xml
+++ b/google-api-client-gson/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.25.0-SNAPSHOT</version>
+    <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-gson</artifactId>
@@ -15,8 +15,8 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
-            <link>http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version}</link>
+            <link>http://download.oracle.com/javase/7/docs/api/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
@@ -26,20 +26,36 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>google.api.client.gson</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.4</version>
         <executions>
           <execution>
-            <id>jar</id>
-            <phase>compile</phase>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
             <goals>
-              <goal>jar</goal>
+              <goal>manifest</goal>
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <instructions>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
+            <Bundle-Description>GSON extensions to the Google APIs Client Library for Java</Bundle-Description>
+            <Bundle-SymbolicName>com.google.api.client.googleapis.notifications.json.gson</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
@@ -60,6 +76,10 @@
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-gson</artifactId>
diff --git a/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/GsonNotificationCallback.java b/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/GsonNotificationCallback.java
index 7df0ed25b..c22415f3e 100644
--- a/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/GsonNotificationCallback.java
+++ b/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/GsonNotificationCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -21,45 +21,39 @@
 import com.google.api.client.util.Beta;
 
 /**
- * {@link Beta} <br/>
- * A {@link TypedNotificationCallback} which uses an JSON content encoding with
- * {@link GsonFactory#getDefaultInstance()}.
+ * {@link Beta} <br>
+ * A {@link TypedNotificationCallback} which uses an JSON content encoding with {@link
+ * GsonFactory#getDefaultInstance()}.
  *
- * <p>
- * Must NOT be implemented in form of an anonymous class as this will break serialization.
- * </p>
+ * <p>Must NOT be implemented in form of an anonymous class as this will break serialization.
  *
- * <p>
- * Implementation should be thread-safe.
- * </p>
- *
- * <b>Example usage:</b>
+ * <p>Implementation should be thread-safe. <b>Example usage:</b>
  *
  * <pre>
-  static class MyNotificationCallback
-      extends GsonNotificationCallback{@literal <}ListResponse{@literal >} {
-
-    private static final long serialVersionUID = 1L;
-
-    {@literal @}Override
-    protected void onNotification(
-        StoredChannel channel, TypedNotification{@literal <}ListResponse{@literal >} notification) {
-      ListResponse content = notification.getContent();
-      switch (notification.getResourceState()) {
-        case ResourceStates.SYNC:
-          break;
-        case ResourceStates.EXISTS:
-          break;
-        case ResourceStates.NOT_EXISTS:
-          break;
-      }
-    }
-
-    {@literal @}Override
-    protected Class{@literal <}ListResponse{@literal >} getDataClass() throws IOException {
-      return ListResponse.class;
-    }
-  }
+ * static class MyNotificationCallback
+ * extends GsonNotificationCallback{@literal <}ListResponse{@literal >} {
+ *
+ * private static final long serialVersionUID = 1L;
+ *
+ * {@literal @}Override
+ * protected void onNotification(
+ * StoredChannel channel, TypedNotification{@literal <}ListResponse{@literal >} notification) {
+ * ListResponse content = notification.getContent();
+ * switch (notification.getResourceState()) {
+ * case ResourceStates.SYNC:
+ * break;
+ * case ResourceStates.EXISTS:
+ * break;
+ * case ResourceStates.NOT_EXISTS:
+ * break;
+ * }
+ * }
+ *
+ * {@literal @}Override
+ * protected Class{@literal <}ListResponse{@literal >} getDataClass() throws IOException {
+ * return ListResponse.class;
+ * }
+ * }
  * </pre>
  *
  * @param <T> Type of the data contained within a notification
diff --git a/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/package-info.java b/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/package-info.java
index 7587ca56b..c7f997f04 100644
--- a/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/package-info.java
+++ b/google-api-client-gson/src/main/java/com/google/api/client/googleapis/notifications/json/gson/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,13 +13,12 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
- * Notification channel handling based on the <a
- * href="http://code.google.com/p/google-gson/">GSON</a> JSON library.
+ * {@link com.google.api.client.util.Beta} <br>
+ * Notification channel handling based on the <a href="https://github.com/google/gson/">GSON</a>
+ * JSON library.
  *
  * @author Yaniv Inbar
  * @since 1.16
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.notifications.json.gson;
-
diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml
index 52dfe2393..33568b65d 100644
--- a/google-api-client-jackson2/pom.xml
+++ b/google-api-client-jackson2/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.25.0-SNAPSHOT</version>
+    <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-jackson2</artifactId>
@@ -15,8 +15,8 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
-            <link>http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version}</link>
+            <link>http://download.oracle.com/javase/7/docs/api/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
@@ -26,20 +26,36 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>google.api.client.jackson2</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.4</version>
         <executions>
           <execution>
-            <id>jar</id>
-            <phase>compile</phase>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
             <goals>
-              <goal>jar</goal>
+              <goal>manifest</goal>
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <instructions>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
+            <Bundle-Description>Low-level implementation of the JSON parser library based on the Jackson 2 JSON library.</Bundle-Description>
+            <Bundle-SymbolicName>com.google.api.client.jackson2</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
@@ -62,7 +78,11 @@
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-jackson2</artifactId>
+      <artifactId>google-http-client-gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
     </dependency>
   </dependencies>
 </project>
diff --git a/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java b/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java
index 564df173a..52267bc49 100644
--- a/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java
+++ b/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/JacksonNotificationCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -17,49 +17,43 @@
 import com.google.api.client.googleapis.notifications.TypedNotificationCallback;
 import com.google.api.client.googleapis.notifications.json.JsonNotificationCallback;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.util.Beta;
 
 /**
- * {@link Beta} <br/>
- * A {@link TypedNotificationCallback} which uses an JSON content encoding with
- * {@link JacksonFactory#getDefaultInstance()}.
+ * {@link Beta} <br>
+ * A {@link TypedNotificationCallback} which uses an JSON content encoding with {@link
+ * GsonFactory#getDefaultInstance()}.
  *
- * <p>
- * Must NOT be implemented in form of an anonymous class as this will break serialization.
- * </p>
+ * <p>Must NOT be implemented in form of an anonymous class as this will break serialization.
  *
- * <p>
- * Implementation should be thread-safe.
- * </p>
- *
- * <b>Example usage:</b>
+ * <p>Implementation should be thread-safe. <b>Example usage:</b>
  *
  * <pre>
-  static class MyNotificationCallback
-      extends GsonNotificationCallback{@literal <}ListResponse{@literal >} {
-
-    private static final long serialVersionUID = 1L;
-
-    {@literal @}Override
-    protected void onNotification(
-        StoredChannel channel, TypedNotification{@literal <}ListResponse{@literal >} notification) {
-      ListResponse content = notification.getContent();
-      switch (notification.getResourceState()) {
-        case ResourceStates.SYNC:
-          break;
-        case ResourceStates.EXISTS:
-          break;
-        case ResourceStates.NOT_EXISTS:
-          break;
-      }
-    }
-
-    {@literal @}Override
-    protected Class{@literal <}ListResponse{@literal >} getDataClass() throws IOException {
-      return ListResponse.class;
-    }
-  }
+ * static class MyNotificationCallback
+ * extends JacksonNotificationCallback{@literal <}ListResponse{@literal >} {
+ *
+ * private static final long serialVersionUID = 1L;
+ *
+ * {@literal @}Override
+ * protected void onNotification(
+ * StoredChannel channel, TypedNotification{@literal <}ListResponse{@literal >} notification) {
+ * ListResponse content = notification.getContent();
+ * switch (notification.getResourceState()) {
+ * case ResourceStates.SYNC:
+ * break;
+ * case ResourceStates.EXISTS:
+ * break;
+ * case ResourceStates.NOT_EXISTS:
+ * break;
+ * }
+ * }
+ *
+ * {@literal @}Override
+ * protected Class{@literal <}ListResponse{@literal >} getDataClass() throws IOException {
+ * return ListResponse.class;
+ * }
+ * }
  * </pre>
  *
  * @param <T> Type of the data contained within a notification
@@ -73,6 +67,6 @@ public abstract class JacksonNotificationCallback<T> extends JsonNotificationCal
 
   @Override
   protected JsonFactory getJsonFactory() {
-    return JacksonFactory.getDefaultInstance();
+    return GsonFactory.getDefaultInstance();
   }
 }
diff --git a/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/package-info.java b/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/package-info.java
index 866f26b93..8d6611c26 100644
--- a/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/package-info.java
+++ b/google-api-client-jackson2/src/main/java/com/google/api/client/googleapis/notifications/json/jackson2/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,7 +13,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Notification channel handling based on the <a
  * href="http://wiki.fasterxml.com/JacksonRelease20">Jackson 2</a> JSON library.
  *
@@ -22,4 +22,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.notifications.json.jackson2;
-
diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml
index 764d2ca22..a573ba6ab 100644
--- a/google-api-client-java6/pom.xml
+++ b/google-api-client-java6/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.25.0-SNAPSHOT</version>
+    <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-java6</artifactId>
@@ -15,8 +15,8 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/6/docs/api/</link>
-            <link>http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version}</link>
+            <link>http://download.oracle.com/javase/7/docs/api/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
@@ -26,20 +26,36 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>google.api.client.java6</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.4</version>
         <executions>
           <execution>
-            <id>jar</id>
-            <phase>compile</phase>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
             <goals>
-              <goal>jar</goal>
+              <goal>manifest</goal>
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <instructions>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
+            <Bundle-Description>Java 6 extensions to the Google APIs Client Library for Java</Bundle-Description>
+            <Bundle-SymbolicName>com.google.api.client.java6</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
@@ -53,14 +69,14 @@
           </execution>
         </executions>
       </plugin>
-      <!--Set minimum requirement to Java 6-->
+      <!--Set minimum requirement to Java 7-->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>animal-sniffer-maven-plugin</artifactId>
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java16</artifactId>
+            <artifactId>java17</artifactId>
             <version>1.0</version>
           </signature>
         </configuration>
@@ -76,10 +92,5 @@
       <groupId>com.google.oauth-client</groupId>
       <artifactId>google-oauth-client-java6</artifactId>
     </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
-    </dependency>
   </dependencies>
 </project>
diff --git a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java
index b21785ada..1a97fb27a 100644
--- a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java
+++ b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -16,16 +16,13 @@
 
 import com.google.api.client.extensions.java6.auth.oauth2.AbstractPromptReceiver;
 import com.google.api.client.googleapis.auth.oauth2.GoogleOAuthConstants;
-
 import java.io.IOException;
 
 /**
  * Google OAuth 2.0 abstract verification code receiver that prompts user to paste the code copied
  * from the browser.
  *
- * <p>
- * Implementation is thread-safe.
- * </p>
+ * <p>Implementation is thread-safe.
  *
  * @since 1.11
  * @author Yaniv Inbar
diff --git a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java
index 8a57bb907..a07b65a90 100644
--- a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java
+++ b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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,4 +19,3 @@
  * @author Yaniv Inbar
  */
 package com.google.api.client.googleapis.extensions.java6.auth.oauth2;
-
diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml
index 679e8e0c7..52b823e4a 100644
--- a/google-api-client-protobuf/pom.xml
+++ b/google-api-client-protobuf/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.25.0-SNAPSHOT</version>
+    <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-protobuf</artifactId>
@@ -14,7 +14,7 @@
       <extension>
         <groupId>kr.motd.maven</groupId>
         <artifactId>os-maven-plugin</artifactId>
-        <version>1.4.0.Final</version>
+        <version>1.6.2</version>
       </extension>
     </extensions>
     <plugins>
@@ -22,8 +22,8 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
-            <link>http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version}</link>
+            <link>http://download.oracle.com/javase/7/docs/api/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
@@ -33,20 +33,36 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>google.api.client.protobuf</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.4</version>
         <executions>
           <execution>
-            <id>jar</id>
-            <phase>compile</phase>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
             <goals>
-              <goal>jar</goal>
+              <goal>manifest</goal>
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <instructions>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
+            <Bundle-Description>Protobuf extensions to the Google APIs Client Library for Java</Bundle-Description>
+            <Bundle-SymbolicName>com.google.api.client.protobuf</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
@@ -61,11 +77,11 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>com.google.protobuf.tools</groupId>
-        <artifactId>maven-protoc-plugin</artifactId>
-        <version>0.4.2</version>
+        <groupId>org.xolstice.maven.plugins</groupId>
+        <artifactId>protobuf-maven-plugin</artifactId>
+        <version>0.6.1</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:${project.protobuf-java.version}-build2:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:${project.protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
         </configuration>
         <executions>
           <execution>
@@ -82,6 +98,10 @@
       <groupId>com.google.http-client</groupId>
       <artifactId>google-http-client-protobuf</artifactId>
     </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
@@ -91,5 +111,10 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+      <scope>compile</scope>
+    </dependency>
   </dependencies>
 </project>
diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java
index 04fc6c074..0dd2ac2e4 100644
--- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java
+++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -22,7 +22,7 @@
 import com.google.api.client.util.Beta;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Thread-safe Google protocol buffer client.
  *
  * @since 1.16
@@ -31,9 +31,7 @@
 @Beta
 public abstract class AbstractGoogleProtoClient extends AbstractGoogleClient {
 
-  /**
-   * @param builder builder
-   */
+  /** @param builder builder */
   protected AbstractGoogleProtoClient(Builder builder) {
     super(builder);
   }
@@ -44,12 +42,11 @@ public ProtoObjectParser getObjectParser() {
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Builder for {@link AbstractGoogleProtoClient}.
    *
-   * <p>
-   * Implementation is not thread-safe.
-   * </p>
+   * <p>Implementation is not thread-safe.
+   *
    * @since 1.16
    */
   @Beta
@@ -61,7 +58,10 @@ public abstract static class Builder extends AbstractGoogleClient.Builder {
      * @param servicePath service path
      * @param httpRequestInitializer HTTP request initializer or {@code null} for none
      */
-    protected Builder(HttpTransport transport, String rootUrl, String servicePath,
+    protected Builder(
+        HttpTransport transport,
+        String rootUrl,
+        String servicePath,
         HttpRequestInitializer httpRequestInitializer) {
       super(transport, rootUrl, servicePath, new ProtoObjectParser(), httpRequestInitializer);
     }
diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClientRequest.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClientRequest.java
index 943457d91..eb473ffb2 100644
--- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClientRequest.java
+++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/AbstractGoogleProtoClientRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -22,16 +22,13 @@
 import com.google.api.client.http.protobuf.ProtoHttpContent;
 import com.google.api.client.util.Beta;
 import com.google.protobuf.MessageLite;
-
 import java.io.IOException;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Google protocol buffer request for a {@link AbstractGoogleProtoClient}.
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @param <T> type of the response
  * @since 1.16
@@ -47,16 +44,24 @@ public abstract class AbstractGoogleProtoClientRequest<T> extends AbstractGoogle
    * @param abstractGoogleProtoClient Google protocol buffer client
    * @param requestMethod HTTP Method
    * @param uriTemplate URI template for the path relative to the base URL. If it starts with a "/"
-   *        the base path from the base URL will be stripped out. The URI template can also be a
-   *        full URL. URI template expansion is done using
-   *        {@link UriTemplate#expand(String, String, Object, boolean)}
+   *     the base path from the base URL will be stripped out. The URI template can also be a full
+   *     URL. URI template expansion is done using {@link UriTemplate#expand(String, String, Object,
+   *     boolean)}
    * @param message message to serialize or {@code null} for none
    * @param responseClass response class to parse into
    */
-  protected AbstractGoogleProtoClientRequest(AbstractGoogleProtoClient abstractGoogleProtoClient,
-      String requestMethod, String uriTemplate, MessageLite message, Class<T> responseClass) {
-    super(abstractGoogleProtoClient, requestMethod, uriTemplate, message == null
-        ? null : new ProtoHttpContent(message), responseClass);
+  protected AbstractGoogleProtoClientRequest(
+      AbstractGoogleProtoClient abstractGoogleProtoClient,
+      String requestMethod,
+      String uriTemplate,
+      MessageLite message,
+      Class<T> responseClass) {
+    super(
+        abstractGoogleProtoClient,
+        requestMethod,
+        uriTemplate,
+        message == null ? null : new ProtoHttpContent(message),
+        responseClass);
     this.message = message;
   }
 
@@ -78,27 +83,23 @@ public AbstractGoogleProtoClientRequest<T> setRequestHeaders(HttpHeaders headers
   /**
    * Queues the request into the specified batch request container.
    *
-   * <p>
-   * Batched requests are then executed when {@link BatchRequest#execute()} is called.
-   * </p>
-   * <p>
-   * Example usage:
-   * </p>
+   * <p>Batched requests are then executed when {@link BatchRequest#execute()} is called.
+   *
+   * <p>Example usage:
    *
    * <pre>
    *
-    request.queue(batchRequest, new BatchCallback{@literal <}SomeResponseType, Void{@literal >}() {
-
-      public void onSuccess(SomeResponseType content, HttpHeaders responseHeaders) {
-        log("Success");
-      }
-
-      public void onFailure(Void unused, HttpHeaders responseHeaders) {
-        log(e.getMessage());
-      }
-    });
-   * </pre>
+   * request.queue(batchRequest, new BatchCallback{@literal <}SomeResponseType, Void{@literal >}() {
+   *
+   * public void onSuccess(SomeResponseType content, HttpHeaders responseHeaders) {
+   * log("Success");
+   * }
    *
+   * public void onFailure(Void unused, HttpHeaders responseHeaders) {
+   * log(e.getMessage());
+   * }
+   * });
+   * </pre>
    *
    * @param batchRequest batch request container
    * @param callback batch callback
diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java
index d8a18ccb9..633cecc5c 100644
--- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java
+++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -17,69 +17,58 @@
 import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
 import com.google.api.client.googleapis.services.CommonGoogleClientRequestInitializer;
 import com.google.api.client.util.Beta;
-
 import java.io.IOException;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Google protocol buffer client request initializer implementation for setting properties like key
  * and userIp.
  *
- * <p>
- * The simplest usage is to use it to set the key parameter:
- * </p>
+ * <p>The simplest usage is to use it to set the key parameter:
  *
  * <pre>
-  public static final GoogleClientRequestInitializer KEY_INITIALIZER =
-      new CommonGoogleProtoClientRequestInitializer(KEY);
+ * public static final GoogleClientRequestInitializer KEY_INITIALIZER =
+ * new CommonGoogleProtoClientRequestInitializer(KEY);
  * </pre>
  *
- * <p>
- * There is also a constructor to set both the key and userIp parameters:
- * </p>
+ * <p>There is also a constructor to set both the key and userIp parameters:
  *
  * <pre>
-  public static final GoogleClientRequestInitializer INITIALIZER =
-      new CommonGoogleProtoClientRequestInitializer(KEY, USER_IP);
+ * public static final GoogleClientRequestInitializer INITIALIZER =
+ * new CommonGoogleProtoClientRequestInitializer(KEY, USER_IP);
  * </pre>
  *
- * <p>
- * If you want to implement custom logic, extend it like this:
- * </p>
+ * <p>If you want to implement custom logic, extend it like this:
  *
  * <pre>
-  public static class MyRequestInitializer extends CommonGoogleProtoClientRequestInitializer {
-
-    {@literal @}Override
-    public void initialize(AbstractGoogleProtoClientRequest{@literal <}?{@literal >} request)
-        throws IOException {
-      // custom logic
-    }
-  }
+ * public static class MyRequestInitializer extends CommonGoogleProtoClientRequestInitializer {
+ *
+ * {@literal @}Override
+ * public void initialize(AbstractGoogleProtoClientRequest{@literal <}?{@literal >} request)
+ * throws IOException {
+ * // custom logic
+ * }
+ * }
  * </pre>
  *
- * <p>
- * Finally, to set the key and userIp parameters and insert custom logic, extend it like this:
- * </p>
+ * <p>Finally, to set the key and userIp parameters and insert custom logic, extend it like this:
  *
  * <pre>
-  public static class MyKeyRequestInitializer extends CommonGoogleProtoClientRequestInitializer {
-
-    public MyKeyRequestInitializer() {
-      super(KEY, USER_IP);
-    }
-
-    {@literal @}Override
-    public void initializeProtoRequest(
-        AbstractGoogleProtoClientRequest{@literal <}?{@literal >} request) throws IOException {
-      // custom logic
-    }
-  }
+ * public static class MyKeyRequestInitializer extends CommonGoogleProtoClientRequestInitializer {
+ *
+ * public MyKeyRequestInitializer() {
+ * super(KEY, USER_IP);
+ * }
+ *
+ * {@literal @}Override
+ * public void initializeProtoRequest(
+ * AbstractGoogleProtoClientRequest{@literal <}?{@literal >} request) throws IOException {
+ * // custom logic
+ * }
+ * }
  * </pre>
  *
- * <p>
- * Subclasses should be thread-safe.
- * </p>
+ * <p>Subclasses should be thread-safe.
  *
  * @since 1.16
  * @author Yaniv Inbar
@@ -92,9 +81,7 @@ public CommonGoogleProtoClientRequestInitializer() {
     super();
   }
 
-  /**
-   * @param key API key or {@code null} to leave it unchanged
-   */
+  /** @param key API key or {@code null} to leave it unchanged */
   public CommonGoogleProtoClientRequestInitializer(String key) {
     super(key);
   }
@@ -116,14 +103,11 @@ public final void initialize(AbstractGoogleClientRequest<?> request) throws IOEx
   /**
    * Initializes a Google protocol buffer client request.
    *
-   * <p>
-   * Default implementation does nothing. Called from
-   * {@link #initialize(AbstractGoogleClientRequest)}.
-   * </p>
+   * <p>Default implementation does nothing. Called from {@link
+   * #initialize(AbstractGoogleClientRequest)}.
    *
    * @throws IOException I/O exception
    */
   protected void initializeProtoRequest(AbstractGoogleProtoClientRequest<?> request)
-      throws IOException {
-  }
+      throws IOException {}
 }
diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/package-info.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/package-info.java
index 2ee462c90..ab1dafe12 100644
--- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/package-info.java
+++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/services/protobuf/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,7 +13,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Contains the basis for the generated service-specific libraries based on the Protobuf format.
  *
  * @since 1.16
@@ -21,4 +21,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.services.protobuf;
-
diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java
index a1c636285..1921e2b49 100644
--- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java
+++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -21,7 +21,7 @@
 import com.google.api.client.util.Beta;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Thread-safe mock Google protocol buffer client.
  *
  * @since 1.16
@@ -30,9 +30,7 @@
 @Beta
 public class MockGoogleProtoClient extends AbstractGoogleProtoClient {
 
-  /**
-   * @param builder builder
-   */
+  /** @param builder builder */
   protected MockGoogleProtoClient(Builder builder) {
     super(builder);
   }
@@ -43,18 +41,19 @@ protected MockGoogleProtoClient(Builder builder) {
    * @param servicePath service path
    * @param httpRequestInitializer HTTP request initializer or {@code null} for none
    */
-  public MockGoogleProtoClient(HttpTransport transport, String rootUrl, String servicePath,
+  public MockGoogleProtoClient(
+      HttpTransport transport,
+      String rootUrl,
+      String servicePath,
       HttpRequestInitializer httpRequestInitializer) {
     this(new Builder(transport, rootUrl, servicePath, httpRequestInitializer));
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Builder for {@link MockGoogleProtoClient}.
    *
-   * <p>
-   * Implementation is not thread-safe.
-   * </p>
+   * <p>Implementation is not thread-safe.
    */
   @Beta
   public static class Builder extends AbstractGoogleProtoClient.Builder {
@@ -65,7 +64,10 @@ public static class Builder extends AbstractGoogleProtoClient.Builder {
      * @param servicePath service path
      * @param httpRequestInitializer HTTP request initializer or {@code null} for none
      */
-    public Builder(HttpTransport transport, String rootUrl, String servicePath,
+    public Builder(
+        HttpTransport transport,
+        String rootUrl,
+        String servicePath,
         HttpRequestInitializer httpRequestInitializer) {
       super(transport, rootUrl, servicePath, httpRequestInitializer);
     }
diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClientRequest.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClientRequest.java
index fe89918a2..7e2545efd 100644
--- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClientRequest.java
+++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/MockGoogleProtoClientRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -22,7 +22,7 @@
 import com.google.protobuf.MessageLite;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Thread-safe mock Google protocol buffer request.
  *
  * @param <T> type of the response
@@ -36,14 +36,18 @@ public class MockGoogleProtoClientRequest<T> extends AbstractGoogleProtoClientRe
    * @param client Google client
    * @param method HTTP Method
    * @param uriTemplate URI template for the path relative to the base URL. If it starts with a "/"
-   *        the base path from the base URL will be stripped out. The URI template can also be a
-   *        full URL. URI template expansion is done using
-   *        {@link UriTemplate#expand(String, String, Object, boolean)}
+   *     the base path from the base URL will be stripped out. The URI template can also be a full
+   *     URL. URI template expansion is done using {@link UriTemplate#expand(String, String, Object,
+   *     boolean)}
    * @param message message to serialize or {@code null} for none
    * @param responseClass response class to parse into
    */
-  public MockGoogleProtoClientRequest(AbstractGoogleProtoClient client, String method,
-      String uriTemplate, MessageLite message, Class<T> responseClass) {
+  public MockGoogleProtoClientRequest(
+      AbstractGoogleProtoClient client,
+      String method,
+      String uriTemplate,
+      MessageLite message,
+      Class<T> responseClass) {
     super(client, method, uriTemplate, message, responseClass);
   }
 
diff --git a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/package-info.java b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/package-info.java
index 619fe2139..af26bee9f 100644
--- a/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/package-info.java
+++ b/google-api-client-protobuf/src/main/java/com/google/api/client/googleapis/testing/services/protobuf/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,7 +13,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Test utilities for the {@code com.google.api.client.googleapis.protobuf} package.
  *
  * @since 1.16
@@ -21,4 +21,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.testing.services.protobuf;
-
diff --git a/google-api-client-protobuf/src/test/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializerTest.java b/google-api-client-protobuf/src/test/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializerTest.java
index 48364377e..41fc890bd 100644
--- a/google-api-client-protobuf/src/test/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializerTest.java
+++ b/google-api-client-protobuf/src/test/java/com/google/api/client/googleapis/services/protobuf/CommonGoogleProtoClientRequestInitializerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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,7 +19,6 @@
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.util.Key;
 import com.google.protobuf.MessageLite;
-
 import junit.framework.TestCase;
 
 /**
@@ -30,11 +29,14 @@
 public class CommonGoogleProtoClientRequestInitializerTest extends TestCase {
 
   public static class MyRequest extends AbstractGoogleProtoClientRequest<String> {
-    @Key
-    String key;
+    @Key String key;
 
-    protected MyRequest(MockGoogleProtoClient client, String method, String uriTemplate,
-        MessageLite message, Class<String> responseClass) {
+    protected MyRequest(
+        MockGoogleProtoClient client,
+        String method,
+        String uriTemplate,
+        MessageLite message,
+        Class<String> responseClass) {
       super(client, method, uriTemplate, message, responseClass);
     }
   }
@@ -43,8 +45,10 @@ public void testInitialize() throws Exception {
     CommonGoogleProtoClientRequestInitializer key =
         new CommonGoogleProtoClientRequestInitializer("foo");
     MockGoogleProtoClient client =
-        new MockGoogleProtoClient.Builder(new MockHttpTransport(), HttpTesting.SIMPLE_URL, "test/",
-            null).setApplicationName("Test Application").build();
+        new MockGoogleProtoClient.Builder(
+                new MockHttpTransport(), HttpTesting.SIMPLE_URL, "test/", null)
+            .setApplicationName("Test Application")
+            .build();
     MyRequest request = new MyRequest(client, "GET", "", null, String.class);
     assertNull(request.key);
     key.initialize(request);
diff --git a/google-api-client-protobuf/src/test/proto/simple_proto.proto b/google-api-client-protobuf/src/test/proto/simple_proto.proto
index aa4ca98ca..5983832d7 100644
--- a/google-api-client-protobuf/src/test/proto/simple_proto.proto
+++ b/google-api-client-protobuf/src/test/proto/simple_proto.proto
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,7 +13,6 @@
  */
  
 syntax = "proto2";
-option optimize_for = LITE_RUNTIME;
 option java_package = "com.google.api.client.googleapis.services.protobuf";
 
 message TestMessage {
diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml
index a6a644053..af897e8b6 100644
--- a/google-api-client-servlet/pom.xml
+++ b/google-api-client-servlet/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.25.0-SNAPSHOT</version>
+    <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-servlet</artifactId>
@@ -15,9 +15,9 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
-            <link>http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version}</link>
-            <link>http://javadoc.google-oauth-java-client.googlecode.com/hg/${project.oauth.version}</link>
+            <link>http://download.oracle.com/javase/7/docs/api/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+            <link>https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
@@ -27,20 +27,36 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>google.api.client.servlet</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.4</version>
         <executions>
           <execution>
-            <id>jar</id>
-            <phase>compile</phase>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
             <goals>
-              <goal>jar</goal>
+              <goal>manifest</goal>
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <instructions>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
+            <Bundle-Description>Servlet extensions to the Google APIs Client Library for Java</Bundle-Description>
+            <Bundle-SymbolicName>com.google.api.client.servlet</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
@@ -54,45 +70,20 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.datanucleus</groupId>
-        <artifactId>maven-datanucleus-plugin</artifactId>
-        <version>2.2.1</version>
-        <configuration>
-          <verbose>true</verbose>
-        </configuration>
-        <executions>
-          <execution>
-            <phase>process-classes</phase>
-            <goals>
-              <goal>enhance</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
-    <dependency>
-      <groupId>com.google.oauth-client</groupId>
-      <artifactId>google-oauth-client-servlet</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>test</scope>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
     </dependency>
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>javax.jdo</groupId>
-      <artifactId>jdo2-api</artifactId>
-    </dependency>
   </dependencies>
 </project>
diff --git a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java
index 85645d772..67f3ce2eb 100644
--- a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java
+++ b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/NotificationServlet.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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,72 +19,62 @@
 import com.google.api.client.util.store.DataStore;
 import com.google.api.client.util.store.DataStoreFactory;
 import com.google.api.client.util.store.MemoryDataStoreFactory;
-
 import java.io.IOException;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Thread-safe Webhook Servlet to receive notifications.
  *
- * <p>
- * In order to use this servlet you should create a class inheriting from
- * {@link NotificationServlet} and register the servlet in your web.xml.
- * </p>
+ * <p>In order to use this servlet you should create a class inheriting from {@link
+ * NotificationServlet} and register the servlet in your web.xml.
  *
- * <p>
- * It is a simple wrapper around {@link WebhookUtils#processWebhookNotification}, so if you you may
- * alternatively call that method instead from your {@link HttpServlet#doPost} with no loss of
- * functionality.
- * </p>
- *
- * <b>Example usage:</b>
+ * <p>It is a simple wrapper around {@link WebhookUtils#processWebhookNotification}, so if you you
+ * may alternatively call that method instead from your {@link HttpServlet#doPost} with no loss of
+ * functionality. <b>Example usage:</b>
  *
  * <pre>
-  public class MyNotificationServlet extends NotificationServlet {
-
-    private static final long serialVersionUID = 1L;
-
-    public MyNotificationServlet() throws IOException {
-      super(new SomeDataStoreFactory());
-    }
-  }
+ * public class MyNotificationServlet extends NotificationServlet {
+ *
+ * private static final long serialVersionUID = 1L;
+ *
+ * public MyNotificationServlet() throws IOException {
+ * super(new SomeDataStoreFactory());
+ * }
+ * }
  * </pre>
  *
  * <b>Sample web.xml setup:</b>
  *
  * <pre>
-  {@literal <}servlet{@literal >}
-      {@literal <}servlet-name{@literal >}MyNotificationServlet{@literal <}/servlet-name{@literal >}
-      {@literal <}servlet-class{@literal >}com.mypackage.MyNotificationServlet{@literal <}/servlet-class{@literal >}
-  {@literal <}/servlet{@literal >}
-  {@literal <}servlet-mapping{@literal >}
-      {@literal <}servlet-name{@literal >}MyNotificationServlet{@literal <}/servlet-name{@literal >}
-      {@literal <}url-pattern{@literal >}/notifications{@literal <}/url-pattern{@literal >}
-  {@literal <}/servlet-mapping{@literal >}
+ * {@literal <}servlet{@literal >}
+ * {@literal <}servlet-name{@literal >}MyNotificationServlet{@literal <}/servlet-name{@literal >}
+ * {@literal <}servlet-class{@literal >}com.mypackage.MyNotificationServlet{@literal <}/servlet-class{@literal >}
+ * {@literal <}/servlet{@literal >}
+ * {@literal <}servlet-mapping{@literal >}
+ * {@literal <}servlet-name{@literal >}MyNotificationServlet{@literal <}/servlet-name{@literal >}
+ * {@literal <}url-pattern{@literal >}/notifications{@literal <}/url-pattern{@literal >}
+ * {@literal <}/servlet-mapping{@literal >}
  * </pre>
  *
- * <p>
- * WARNING: by default it uses {@link MemoryDataStoreFactory#getDefaultInstance()} which means it
+ * <p>WARNING: by default it uses {@link MemoryDataStoreFactory#getDefaultInstance()} which means it
  * will NOT persist the notification channels when the servlet process dies, so it is a BAD CHOICE
  * for a production application. But it is a convenient choice when testing locally, in which case
  * you don't need to override it, and can simply reference it directly in your web.xml file. For
  * example:
- * </p>
  *
  * <pre>
-  {@literal <}servlet{@literal >}
-      {@literal <}servlet-name{@literal >}NotificationServlet{@literal <}/servlet-name{@literal >}
-      {@literal <}servlet-class{@literal >}com.google.api.client.googleapis.extensions.servlet.notificationsNotificationServlet{@literal <}/servlet-class{@literal >}
-  {@literal <}/servlet{@literal >}
-  {@literal <}servlet-mapping{@literal >}
-      {@literal <}servlet-name{@literal >}NotificationServlet{@literal <}/servlet-name{@literal >}
-      {@literal <}url-pattern{@literal >}/notifications{@literal <}/url-pattern{@literal >}
-  {@literal <}/servlet-mapping{@literal >}
+ * {@literal <}servlet{@literal >}
+ * {@literal <}servlet-name{@literal >}NotificationServlet{@literal <}/servlet-name{@literal >}
+ * {@literal <}servlet-class{@literal >}com.google.api.client.googleapis.extensions.servlet.notificationsNotificationServlet{@literal <}/servlet-class{@literal >}
+ * {@literal <}/servlet{@literal >}
+ * {@literal <}servlet-mapping{@literal >}
+ * {@literal <}servlet-name{@literal >}NotificationServlet{@literal <}/servlet-name{@literal >}
+ * {@literal <}url-pattern{@literal >}/notifications{@literal <}/url-pattern{@literal >}
+ * {@literal <}/servlet-mapping{@literal >}
  * </pre>
  *
  * @author Yaniv Inbar
@@ -99,10 +89,9 @@ public class NotificationServlet extends HttpServlet {
   private final transient DataStore<StoredChannel> channelDataStore;
 
   /**
-   * Constructor to be used for testing and demo purposes that uses
-   * {@link MemoryDataStoreFactory#getDefaultInstance()} which means it will NOT persist the
-   * notification channels when the servlet process dies, so it is a bad choice for a production
-   * application.
+   * Constructor to be used for testing and demo purposes that uses {@link
+   * MemoryDataStoreFactory#getDefaultInstance()} which means it will NOT persist the notification
+   * channels when the servlet process dies, so it is a bad choice for a production application.
    */
   public NotificationServlet() throws IOException {
     this(MemoryDataStoreFactory.getDefaultInstance());
diff --git a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookHeaders.java b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookHeaders.java
index 66310ac81..f581c3edc 100644
--- a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookHeaders.java
+++ b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookHeaders.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -18,7 +18,7 @@
 import com.google.api.client.util.Beta;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Headers for Webhook notifications.
  *
  * @author Yaniv Inbar
@@ -61,6 +61,5 @@ public final class WebhookHeaders {
   /** Name of header for the type of change performed on the resource. */
   public static final String CHANGED = "X-Goog-Changed";
 
-  private WebhookHeaders() {
-  }
+  private WebhookHeaders() {}
 }
diff --git a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookUtils.java b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookUtils.java
index 33f25987c..c4bc184fc 100644
--- a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookUtils.java
+++ b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/WebhookUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -23,20 +23,18 @@
 import com.google.api.client.util.StringUtils;
 import com.google.api.client.util.store.DataStore;
 import com.google.api.client.util.store.DataStoreFactory;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.Enumeration;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Utilities for Webhook notifications.
  *
  * @author Yaniv Inbar
@@ -54,19 +52,17 @@ public final class WebhookUtils {
    * Utility method to process the webhook notification from {@link HttpServlet#doPost} by finding
    * the notification channel in the given data store factory.
    *
-   * <p>
-   * It is a wrapper around
-   * {@link #processWebhookNotification(HttpServletRequest, HttpServletResponse, DataStore)} that
-   * uses the data store from {@link StoredChannel#getDefaultDataStore(DataStoreFactory)}.
-   * </p>
+   * <p>It is a wrapper around {@link #processWebhookNotification(HttpServletRequest,
+   * HttpServletResponse, DataStore)} that uses the data store from {@link
+   * StoredChannel#getDefaultDataStore(DataStoreFactory)}.
    *
    * @param req an {@link HttpServletRequest} object that contains the request the client has made
-   *        of the servlet
+   *     of the servlet
    * @param resp an {@link HttpServletResponse} object that contains the response the servlet sends
-   *        to the client
+   *     to the client
    * @param dataStoreFactory data store factory
    * @exception IOException if an input or output error is detected when the servlet handles the
-   *            request
+   *     request
    * @exception ServletException if the request for the POST could not be handled
    */
   public static void processWebhookNotification(
@@ -78,22 +74,19 @@ public static void processWebhookNotification(
   /**
    * Utility method to process the webhook notification from {@link HttpServlet#doPost}.
    *
-   * <p>
-   * The {@link HttpServletRequest#getInputStream()} is closed in a finally block inside this
-   * method. If it is not detected to be a webhook notification, an
-   * {@link HttpServletResponse#SC_BAD_REQUEST} error will be displayed. If the notification channel
-   * is found in the given notification channel data store, it will call
-   * {@link UnparsedNotificationCallback#onNotification} for the registered notification callback
-   * method.
-   * </p>
+   * <p>The {@link HttpServletRequest#getInputStream()} is closed in a finally block inside this
+   * method. If it is not detected to be a webhook notification, an {@link
+   * HttpServletResponse#SC_BAD_REQUEST} error will be displayed. If the notification channel is
+   * found in the given notification channel data store, it will call {@link
+   * UnparsedNotificationCallback#onNotification} for the registered notification callback method.
    *
    * @param req an {@link HttpServletRequest} object that contains the request the client has made
-   *        of the servlet
+   *     of the servlet
    * @param resp an {@link HttpServletResponse} object that contains the response the servlet sends
-   *        to the client
+   *     to the client
    * @param channelDataStore notification channel data store
    * @exception IOException if an input or output error is detected when the servlet handles the
-   *            request
+   *     request
    * @exception ServletException if the request for the POST could not be handled
    */
   public static void processWebhookNotification(
@@ -114,8 +107,11 @@ public static void processWebhookNotification(
               Enumeration<?> ev = req.getHeaders(name);
               if (ev != null) {
                 while (ev.hasMoreElements()) {
-                  builder.append(name)
-                      .append(": ").append(ev.nextElement()).append(StringUtils.LINE_SEPARATOR);
+                  builder
+                      .append(name)
+                      .append(": ")
+                      .append(ev.nextElement())
+                      .append(StringUtils.LINE_SEPARATOR);
                 }
               }
             }
@@ -139,18 +135,23 @@ public static void processWebhookNotification(
       String channelExpiration = req.getHeader(WebhookHeaders.CHANNEL_EXPIRATION);
       String channelToken = req.getHeader(WebhookHeaders.CHANNEL_TOKEN);
       String changed = req.getHeader(WebhookHeaders.CHANGED);
-      if (messageNumber == null || resourceState == null || resourceId == null
-          || resourceUri == null || channelId == null) {
-        resp.sendError(HttpServletResponse.SC_BAD_REQUEST,
+      if (messageNumber == null
+          || resourceState == null
+          || resourceId == null
+          || resourceUri == null
+          || channelId == null) {
+        resp.sendError(
+            HttpServletResponse.SC_BAD_REQUEST,
             "Notification did not contain all required information.");
         return;
       }
-      UnparsedNotification notification = new UnparsedNotification(messageNumber, resourceState,
-          resourceId, resourceUri, channelId).setChannelExpiration(channelExpiration)
-          .setChannelToken(channelToken)
-          .setChanged(changed)
-          .setContentType(req.getContentType())
-          .setContentStream(contentStream);
+      UnparsedNotification notification =
+          new UnparsedNotification(messageNumber, resourceState, resourceId, resourceUri, channelId)
+              .setChannelExpiration(channelExpiration)
+              .setChannelToken(channelToken)
+              .setChanged(changed)
+              .setContentType(req.getContentType())
+              .setContentStream(contentStream);
       // check if we know about the channel, hand over the notification to the notification callback
       StoredChannel storedChannel = channelDataStore.get(notification.getChannelId());
       if (storedChannel != null) {
@@ -161,6 +162,5 @@ public static void processWebhookNotification(
     }
   }
 
-  private WebhookUtils() {
-  }
+  private WebhookUtils() {}
 }
diff --git a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/package-info.java b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/package-info.java
index b67c30c94..e0e0fb007 100644
--- a/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/package-info.java
+++ b/google-api-client-servlet/src/main/java/com/google/api/client/googleapis/extensions/servlet/notifications/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,7 +13,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Support for subscribing to topics and receiving notifications on servlet-based platforms.
  *
  * @author Yaniv Inbar
@@ -21,4 +21,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.extensions.servlet.notifications;
-
diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml
index b6be87a04..df6603144 100644
--- a/google-api-client-xml/pom.xml
+++ b/google-api-client-xml/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.25.0-SNAPSHOT</version>
+    <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client-xml</artifactId>
@@ -15,8 +15,8 @@
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
-            <link>http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version}</link>
+            <link>http://download.oracle.com/javase/7/docs/api/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
@@ -26,20 +26,36 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>google.api.client.xml</Automatic-Module-Name>
+            </manifestEntries>
           </archive>
         </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.felix</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>2.5.4</version>
         <executions>
           <execution>
-            <id>jar</id>
-            <phase>compile</phase>
+            <id>bundle-manifest</id>
+            <phase>process-classes</phase>
             <goals>
-              <goal>jar</goal>
+              <goal>manifest</goal>
             </goals>
           </execution>
         </executions>
+        <configuration>
+          <instructions>
+            <Bundle-DocURL>https://googleapis.dev/java/google-api-client/${project.version}/index.html</Bundle-DocURL>
+            <Bundle-Description>XML extensions to the Google APIs Client Library for Java</Bundle-Description>
+            <Bundle-SymbolicName>com.google.api.client.xml</Bundle-SymbolicName>
+          </instructions>
+        </configuration>
       </plugin>
       <plugin>
         <artifactId>maven-source-plugin</artifactId>
@@ -57,8 +73,12 @@
   </build>
   <dependencies>
     <dependency>
-      <groupId>com.google.api-client</groupId>
-      <artifactId>google-api-client</artifactId>
+      <groupId>xpp3</groupId>
+      <artifactId>xpp3</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
diff --git a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchContent.java b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchContent.java
index 6755d3fb9..eb4bceff1 100644
--- a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchContent.java
+++ b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 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
@@ -21,30 +21,24 @@
 import com.google.api.client.xml.XmlNamespaceDictionary;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Serializes Atom XML PATCH HTTP content based on the data key/value mapping object for an Atom
  * entry.
  *
- * <p>
- * Default value for {@link #getType()} is {@link Xml#MEDIA_TYPE}.
- * </p>
+ * <p>Default value for {@link #getType()} is {@link Xml#MEDIA_TYPE}.
  *
- * <p>
- * Sample usage:
- * </p>
+ * <p>Sample usage:
  *
  * <pre>
- *<code>
-  static void setContent(
-      HttpRequest request, XmlNamespaceDictionary namespaceDictionary, Object patchEntry) {
-    request.setContent(new AtomPatchContent(namespaceDictionary, patchEntry));
-  }
+ * <code>
+ * static void setContent(
+ * HttpRequest request, XmlNamespaceDictionary namespaceDictionary, Object patchEntry) {
+ * request.setContent(new AtomPatchContent(namespaceDictionary, patchEntry));
+ * }
  * </code>
  * </pre>
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @since 1.0
  * @author Yaniv Inbar
diff --git a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java
index ce679e290..706d9e53f 100644
--- a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java
+++ b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/AtomPatchRelativeToOriginalContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 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
@@ -25,21 +25,19 @@
 import org.xmlpull.v1.XmlSerializer;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Serializes an optimal Atom XML PATCH HTTP content based on the data key/value mapping object for
  * an Atom entry, by comparing the original value to the patched value.
  *
- * <p>
- * Sample usage:
- * </p>
+ * <p>Sample usage:
  *
  * <pre>
  * <code>
-  static void setContent(HttpRequest request, XmlNamespaceDictionary namespaceDictionary,
-      Object originalEntry, Object patchedEntry) {
-    request.setContent(
-        new AtomPatchRelativeToOriginalContent(namespaceDictionary, originalEntry, patchedEntry));
-  }
+ * static void setContent(HttpRequest request, XmlNamespaceDictionary namespaceDictionary,
+ * Object originalEntry, Object patchedEntry) {
+ * request.setContent(
+ * new AtomPatchRelativeToOriginalContent(namespaceDictionary, originalEntry, patchedEntry));
+ * }
  * </code>
  * </pre>
  *
diff --git a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java
index e3d435ad3..ae5537666 100644
--- a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java
+++ b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/GoogleAtom.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 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
@@ -21,13 +21,12 @@
 import com.google.api.client.util.FieldInfo;
 import com.google.api.client.util.GenericData;
 import com.google.api.client.util.Types;
-
 import java.util.Collection;
 import java.util.Map;
 import java.util.TreeSet;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Utilities for working with the Atom XML of Google Data APIs.
  *
  * @since 1.0
@@ -68,8 +67,8 @@ public static String getFieldsFor(Class<?> dataClass) {
   /**
    * Returns the fields mask to use for the given data class of key/value pairs for the feed class
    * and for the entry class. This should only be used if the feed class does not contain the entry
-   * class as a field. The data classes cannot be a {@link Map}, {@link GenericData} or a
-   * {@link Collection}.
+   * class as a field. The data classes cannot be a {@link Map}, {@link GenericData} or a {@link
+   * Collection}.
    *
    * @param feedClass feed data class
    * @param entryClass entry data class
@@ -267,6 +266,5 @@ void append(String name, FieldsMask subFields) {
     }
   }
 
-  private GoogleAtom() {
-  }
+  private GoogleAtom() {}
 }
diff --git a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/MultiKindFeedParser.java b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/MultiKindFeedParser.java
index 95ad51da9..db346fd2c 100644
--- a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/MultiKindFeedParser.java
+++ b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/MultiKindFeedParser.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 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
@@ -31,11 +31,10 @@
 import org.xmlpull.v1.XmlPullParserException;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * GData Atom feed pull parser when the entry class can be computed from the kind.
  *
  * @param <T> feed type
- *
  * @since 1.0
  * @author Yaniv Inbar
  */
@@ -50,8 +49,11 @@ public final class MultiKindFeedParser<T> extends AbstractAtomFeedParser<T> {
    * @param inputStream input stream to read
    * @param feedClass feed class to parse
    */
-  MultiKindFeedParser(XmlNamespaceDictionary namespaceDictionary, XmlPullParser parser,
-      InputStream inputStream, Class<T> feedClass) {
+  MultiKindFeedParser(
+      XmlNamespaceDictionary namespaceDictionary,
+      XmlPullParser parser,
+      InputStream inputStream,
+      Class<T> feedClass) {
     super(namespaceDictionary, parser, inputStream, feedClass);
   }
 
@@ -102,8 +104,11 @@ protected Object parseEntryInternal() throws IOException, XmlPullParserException
    * @throws IOException I/O exception
    * @throws XmlPullParserException XML pull parser exception
    */
-  public static <T, E> MultiKindFeedParser<T> create(HttpResponse response,
-      XmlNamespaceDictionary namespaceDictionary, Class<T> feedClass, Class<E>... entryClasses)
+  public static <T, E> MultiKindFeedParser<T> create(
+      HttpResponse response,
+      XmlNamespaceDictionary namespaceDictionary,
+      Class<T> feedClass,
+      Class<E>... entryClasses)
       throws IOException, XmlPullParserException {
     InputStream content = response.getContent();
     try {
diff --git a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/package-info.java b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/package-info.java
index 2690aa398..ae69d6f60 100644
--- a/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/package-info.java
+++ b/google-api-client-xml/src/main/java/com/google/api/client/googleapis/xml/atom/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 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
@@ -13,307 +13,284 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Utilities for Google's Atom XML implementation (see detailed package specification).
  *
  * <h2>Package Specification</h2>
  *
- * <p>
- * User-defined Partial XML data models allow you to defined Plain Old Java Objects (POJO's) to
+ * <p>User-defined Partial XML data models allow you to defined Plain Old Java Objects (POJO's) to
  * define how the library should parse/serialize XML. Each field that should be included must have
  * an @{@link com.google.api.client.util.Key} annotation. The field can be of any visibility
  * (private, package private, protected, or public) and must not be static.
- * </p>
  *
- * <p>
- * The optional value parameter of this @{@link com.google.api.client.util.Key} annotation specifies
- * the XPath name to use to represent the field. For example, an XML attribute <code>a</code> has an
- * XPath name of <code>@a</code>, an XML element <code>&lt;a&gt;</code> has an XPath name of <code>
- *a
+ * <p>The optional value parameter of this @{@link com.google.api.client.util.Key} annotation
+ * specifies the XPath name to use to represent the field. For example, an XML attribute <code>a
+ * </code> has an XPath name of <code>@a</code>, an XML element <code>&lt;a&gt;</code> has an XPath
+ * name of <code>
+ * a
  * </code>, and an XML text content has an XPath name of <code>text()</code>. These are named based
  * on their usage with the <a
- * href="http://code.google.com/apis/gdata/docs/2.0/reference.html#PartialResponse">partial
+ * href="https://developers.google.com/gdata/docs/2.0/reference?csw=1#PartialUpdate">partial
  * response/update syntax</a> for Google API's. If the @{@link com.google.api.client.util.Key}
  * annotation is missing, the default is to use the Atom XML namespace and the Java field's name as
  * the local XML name. By default, the field name is used as the JSON key. Any unrecognized XML is
  * normally simply ignored and not stored. If the ability to store unknown keys is important, use
  * {@link com.google.api.client.xml.GenericXml}.
- * </p>
  *
- * <p>
- * Let's take a look at a typical partial Atom XML album feed from the Picasa Web Albums Data API:
- * </p>
+ * <p>Let's take a look at a typical partial Atom XML album feed from the Picasa Web Albums Data
+ * API:
  *
  * <pre><code>
-&lt;?xml version='1.0' encoding='utf-8'?&gt;
-&lt;feed xmlns='http://www.w3.org/2005/Atom'
-    xmlns:openSearch='http://a9.com/-/spec/opensearch/1.1/'
-    xmlns:gphoto='http://schemas.google.com/photos/2007'&gt;
-  &lt;link rel='http://schemas.google.com/g/2005#post'
-    type='application/atom+xml'
-    href='http://picasaweb.google.com/data/feed/api/user/liz' /&gt;
-  &lt;author&gt;
-    &lt;name&gt;Liz&lt;/name&gt;
-  &lt;/author&gt;
-  &lt;openSearch:totalResults&gt;1&lt;/openSearch:totalResults&gt;
-  &lt;entry gd:etag='"RXY8fjVSLyp7ImA9WxVVGE8KQAE."'&gt;
-    &lt;category scheme='http://schemas.google.com/g/2005#kind'
-      term='http://schemas.google.com/photos/2007#album' /&gt;
-    &lt;title&gt;lolcats&lt;/title&gt;
-    &lt;summary&gt;Hilarious Felines&lt;/summary&gt;
-    &lt;gphoto:access&gt;public&lt;/gphoto:access&gt;
-  &lt;/entry&gt;
-&lt;/feed&gt;
-</code></pre>
- *
- * <p>
- * Here's one possible way to design the Java data classes for this (each class in its own Java
+ * &lt;?xml version='1.0' encoding='utf-8'?&gt;
+ * &lt;feed xmlns='http://www.w3.org/2005/Atom'
+ * xmlns:openSearch='http://a9.com/-/spec/opensearch/1.1/'
+ * xmlns:gphoto='http://schemas.google.com/photos/2007'&gt;
+ * &lt;link rel='http://schemas.google.com/g/2005#post'
+ * type='application/atom+xml'
+ * href='http://picasaweb.google.com/data/feed/api/user/liz' /&gt;
+ * &lt;author&gt;
+ * &lt;name&gt;Liz&lt;/name&gt;
+ * &lt;/author&gt;
+ * &lt;openSearch:totalResults&gt;1&lt;/openSearch:totalResults&gt;
+ * &lt;entry gd:etag='"RXY8fjVSLyp7ImA9WxVVGE8KQAE."'&gt;
+ * &lt;category scheme='http://schemas.google.com/g/2005#kind'
+ * term='http://schemas.google.com/photos/2007#album' /&gt;
+ * &lt;title&gt;lolcats&lt;/title&gt;
+ * &lt;summary&gt;Hilarious Felines&lt;/summary&gt;
+ * &lt;gphoto:access&gt;public&lt;/gphoto:access&gt;
+ * &lt;/entry&gt;
+ * &lt;/feed&gt;
+ * </code></pre>
+ *
+ * <p>Here's one possible way to design the Java data classes for this (each class in its own Java
  * file):
- * </p>
  *
  * <pre><code>
-import com.google.api.client.util.*;
-import java.util.List;
-
-  public class Link {
-
-    &#64;Key("&#64;href")
-    public String href;
-
-    &#64;Key("&#64;rel")
-    public String rel;
-
-    public static String find(List&lt;Link&gt; links, String rel) {
-      if (links != null) {
-        for (Link link : links) {
-          if (rel.equals(link.rel)) {
-            return link.href;
-          }
-        }
-      }
-      return null;
-    }
-  }
-
-  public class Category {
-
-    &#64;Key("&#64;scheme")
-    public String scheme;
-
-    &#64;Key("&#64;term")
-    public String term;
-
-    public static Category newKind(String kind) {
-      Category category = new Category();
-      category.scheme = "http://schemas.google.com/g/2005#kind";
-      category.term = "http://schemas.google.com/photos/2007#" + kind;
-      return category;
-    }
-  }
-
-  public class AlbumEntry {
-
-    &#64;Key
-    public String summary;
-
-    &#64;Key
-    public String title;
-
-    &#64;Key("gphoto:access")
-    public String access;
-
-    public Category category = newKind("album");
-
-    private String getEditLink() {
-      return Link.find(links, "edit");
-    }
-  }
-
-  public class Author {
-
-    &#64;Key
-    public String name;
-  }
-
-  public class AlbumFeed {
-
-    &#64;Key
-    public Author author;
-
-    &#64;Key("openSearch:totalResults")
-    public int totalResults;
-
-    &#64;Key("entry")
-    public List&lt;AlbumEntry&gt; photos;
-
-    &#64;Key("link")
-    public List&lt;Link&gt; links;
-
-    private String getPostLink() {
-      return Link.find(links, "http://schemas.google.com/g/2005#post");
-    }
-  }
-</code></pre>
- *
- * <p>
- * You can also use the @{@link com.google.api.client.util.Key} annotation to defined query
+ * import com.google.api.client.util.*;
+ * import java.util.List;
+ *
+ * public class Link {
+ *
+ * &#64;Key("&#64;href")
+ * public String href;
+ *
+ * &#64;Key("&#64;rel")
+ * public String rel;
+ *
+ * public static String find(List&lt;Link&gt; links, String rel) {
+ * if (links != null) {
+ * for (Link link : links) {
+ * if (rel.equals(link.rel)) {
+ * return link.href;
+ * }
+ * }
+ * }
+ * return null;
+ * }
+ * }
+ *
+ * public class Category {
+ *
+ * &#64;Key("&#64;scheme")
+ * public String scheme;
+ *
+ * &#64;Key("&#64;term")
+ * public String term;
+ *
+ * public static Category newKind(String kind) {
+ * Category category = new Category();
+ * category.scheme = "http://schemas.google.com/g/2005#kind";
+ * category.term = "http://schemas.google.com/photos/2007#" + kind;
+ * return category;
+ * }
+ * }
+ *
+ * public class AlbumEntry {
+ *
+ * &#64;Key
+ * public String summary;
+ *
+ * &#64;Key
+ * public String title;
+ *
+ * &#64;Key("gphoto:access")
+ * public String access;
+ *
+ * public Category category = newKind("album");
+ *
+ * private String getEditLink() {
+ * return Link.find(links, "edit");
+ * }
+ * }
+ *
+ * public class Author {
+ *
+ * &#64;Key
+ * public String name;
+ * }
+ *
+ * public class AlbumFeed {
+ *
+ * &#64;Key
+ * public Author author;
+ *
+ * &#64;Key("openSearch:totalResults")
+ * public int totalResults;
+ *
+ * &#64;Key("entry")
+ * public List&lt;AlbumEntry&gt; photos;
+ *
+ * &#64;Key("link")
+ * public List&lt;Link&gt; links;
+ *
+ * private String getPostLink() {
+ * return Link.find(links, "http://schemas.google.com/g/2005#post");
+ * }
+ * }
+ * </code></pre>
+ *
+ * <p>You can also use the @{@link com.google.api.client.util.Key} annotation to defined query
  * parameters for a URL. For example:
- * </p>
  *
  * <pre><code>
-public class PicasaUrl extends GoogleUrl {
-
-  &#64;Key("max-results")
-  public Integer maxResults;
-
-  &#64;Key
-  public String kinds;
-
-  public PicasaUrl(String url) {
-    super(url);
-  }
-
-  public static PicasaUrl fromRelativePath(String relativePath) {
-    PicasaUrl result = new PicasaUrl(PicasaWebAlbums.ROOT_URL);
-    result.path += relativePath;
-    return result;
-  }
-}
-</code></pre>
- *
- * <p>
- * To work with a Google API, you first need to set up the
- * {@link com.google.api.client.http.HttpTransport}. For example:
- * </p>
+ * public class PicasaUrl extends GoogleUrl {
+ *
+ * &#64;Key("max-results")
+ * public Integer maxResults;
+ *
+ * &#64;Key
+ * public String kinds;
+ *
+ * public PicasaUrl(String url) {
+ * super(url);
+ * }
+ *
+ * public static PicasaUrl fromRelativePath(String relativePath) {
+ * PicasaUrl result = new PicasaUrl(PicasaWebAlbums.ROOT_URL);
+ * result.path += relativePath;
+ * return result;
+ * }
+ * }
+ * </code></pre>
+ *
+ * <p>To work with a Google API, you first need to set up the {@link
+ * com.google.api.client.http.HttpTransport}. For example:
  *
  * <pre><code>
-  private static HttpTransport setUpTransport() throws IOException {
-    HttpTransport result = new NetHttpTransport();
-    GoogleUtils.useMethodOverride(result);
-    HttpHeaders headers = new HttpHeaders();
-    headers.setApplicationName("Google-PicasaSample/1.0");
-    headers.gdataVersion = "2";
-    AtomParser parser = new AtomParser();
-    parser.namespaceDictionary = PicasaWebAlbumsAtom.NAMESPACE_DICTIONARY;
-    transport.addParser(parser);
-    // insert authentication code...
-    return transport;
-  }
-</code></pre>
- *
- * <p>
- * Now that we have a transport, we can execute a partial GET request to the Picasa Web Albums API
- * and parse the result:
- * </p>
+ * private static HttpTransport setUpTransport() throws IOException {
+ * HttpTransport result = new NetHttpTransport();
+ * GoogleUtils.useMethodOverride(result);
+ * HttpHeaders headers = new HttpHeaders();
+ * headers.setApplicationName("Google-PicasaSample/1.0");
+ * headers.gdataVersion = "2";
+ * AtomParser parser = new AtomParser();
+ * parser.namespaceDictionary = PicasaWebAlbumsAtom.NAMESPACE_DICTIONARY;
+ * transport.addParser(parser);
+ * // insert authentication code...
+ * return transport;
+ * }
+ * </code></pre>
+ *
+ * <p>Now that we have a transport, we can execute a partial GET request to the Picasa Web Albums
+ * API and parse the result:
  *
  * <pre><code>
-  public static AlbumFeed executeGet(HttpTransport transport, PicasaUrl url)
-      throws IOException {
-    url.fields = GoogleAtom.getFieldsFor(AlbumFeed.class);
-    url.kinds = "photo";
-    url.maxResults = 5;
-    HttpRequest request = transport.buildGetRequest();
-    request.url = url;
-    return request.execute().parseAs(AlbumFeed.class);
-  }
-</code></pre>
- *
- * <p>
- * If the server responds with an error the {@link com.google.api.client.http.HttpRequest#execute}
- * method will throw an {@link com.google.api.client.http.HttpResponseException}, which has an
- * {@link com.google.api.client.http.HttpResponse} field which can be parsed the same way as a
- * success response inside of a catch block. For example:
- * </p>
+ * public static AlbumFeed executeGet(HttpTransport transport, PicasaUrl url)
+ * throws IOException {
+ * url.fields = GoogleAtom.getFieldsFor(AlbumFeed.class);
+ * url.kinds = "photo";
+ * url.maxResults = 5;
+ * HttpRequest request = transport.buildGetRequest();
+ * request.url = url;
+ * return request.execute().parseAs(AlbumFeed.class);
+ * }
+ * </code></pre>
+ *
+ * <p>If the server responds with an error the {@link
+ * com.google.api.client.http.HttpRequest#execute} method will throw an {@link
+ * com.google.api.client.http.HttpResponseException}, which has an {@link
+ * com.google.api.client.http.HttpResponse} field which can be parsed the same way as a success
+ * response inside of a catch block. For example:
  *
  * <pre><code>
-    try {
-...
-    } catch (HttpResponseException e) {
-      if (e.response.getParser() != null) {
-        Error error = e.response.parseAs(Error.class);
-        // process error response
-      } else {
-        String errorContentString = e.response.parseAsString();
-        // process error response as string
-      }
-      throw e;
-    }
-</code></pre>
- *
- * <p>
- * To update an album, we use the transport to execute an efficient partial update request using the
- * PATCH method to the Picasa Web Albums API:
- * </p>
+ * try {
+ * ...
+ * } catch (HttpResponseException e) {
+ * if (e.response.getParser() != null) {
+ * Error error = e.response.parseAs(Error.class);
+ * // process error response
+ * } else {
+ * String errorContentString = e.response.parseAsString();
+ * // process error response as string
+ * }
+ * throw e;
+ * }
+ * </code></pre>
+ *
+ * <p>To update an album, we use the transport to execute an efficient partial update request using
+ * the PATCH method to the Picasa Web Albums API:
  *
  * <pre><code>
-  public AlbumEntry executePatchRelativeToOriginal(HttpTransport transport,
-      AlbumEntry original) throws IOException {
-    HttpRequest request = transport.buildPatchRequest();
-    request.setUrl(getEditLink());
-    request.headers.ifMatch = etag;
-    AtomPatchRelativeToOriginalContent content =
-        new AtomPatchRelativeToOriginalContent();
-    content.namespaceDictionary = PicasaWebAlbumsAtom.NAMESPACE_DICTIONARY;
-    content.originalEntry = original;
-    content.patchedEntry = this;
-    request.content = content;
-    return request.execute().parseAs(AlbumEntry.class);
-  }
-
-  private static AlbumEntry updateTitle(HttpTransport transport,
-      AlbumEntry album) throws IOException {
-    AlbumEntry patched = album.clone();
-    patched.title = "An alternate title";
-    return patched.executePatchRelativeToOriginal(transport, album);
-  }
-</code></pre>
- *
- * <p>
- * To insert an album, we use the transport to execute a POST request to the Picasa Web Albums API:
- * </p>
+ * public AlbumEntry executePatchRelativeToOriginal(HttpTransport transport,
+ * AlbumEntry original) throws IOException {
+ * HttpRequest request = transport.buildPatchRequest();
+ * request.setUrl(getEditLink());
+ * request.headers.ifMatch = etag;
+ * AtomPatchRelativeToOriginalContent content =
+ * new AtomPatchRelativeToOriginalContent();
+ * content.namespaceDictionary = PicasaWebAlbumsAtom.NAMESPACE_DICTIONARY;
+ * content.originalEntry = original;
+ * content.patchedEntry = this;
+ * request.content = content;
+ * return request.execute().parseAs(AlbumEntry.class);
+ * }
+ *
+ * private static AlbumEntry updateTitle(HttpTransport transport,
+ * AlbumEntry album) throws IOException {
+ * AlbumEntry patched = album.clone();
+ * patched.title = "An alternate title";
+ * return patched.executePatchRelativeToOriginal(transport, album);
+ * }
+ * </code></pre>
+ *
+ * <p>To insert an album, we use the transport to execute a POST request to the Picasa Web Albums
+ * API:
  *
  * <pre><code>
-  public AlbumEntry insertAlbum(HttpTransport transport, AlbumEntry entry)
-      throws IOException {
-    HttpRequest request = transport.buildPostRequest();
-    request.setUrl(getPostLink());
-    AtomContent content = new AtomContent();
-    content.namespaceDictionary = PicasaWebAlbumsAtom.NAMESPACE_DICTIONARY;
-    content.entry = entry;
-    request.content = content;
-    return request.execute().parseAs(AlbumEntry.class);
-  }
-</code></pre>
- *
- * <p>
- * To delete an album, we use the transport to execute a DELETE request to the Picasa Web Albums
+ * public AlbumEntry insertAlbum(HttpTransport transport, AlbumEntry entry)
+ * throws IOException {
+ * HttpRequest request = transport.buildPostRequest();
+ * request.setUrl(getPostLink());
+ * AtomContent content = new AtomContent();
+ * content.namespaceDictionary = PicasaWebAlbumsAtom.NAMESPACE_DICTIONARY;
+ * content.entry = entry;
+ * request.content = content;
+ * return request.execute().parseAs(AlbumEntry.class);
+ * }
+ * </code></pre>
+ *
+ * <p>To delete an album, we use the transport to execute a DELETE request to the Picasa Web Albums
  * API:
- * </p>
  *
  * <pre><code>
-  public void executeDelete(HttpTransport transport) throws IOException {
-    HttpRequest request = transport.buildDeleteRequest();
-    request.setUrl(getEditLink());
-    request.headers.ifMatch = etag;
-    request.execute().ignore();
-  }
-</code></pre>
- *
- * <p>
- * NOTE: As you might guess, the library uses reflection to populate the user-defined data model.
+ * public void executeDelete(HttpTransport transport) throws IOException {
+ * HttpRequest request = transport.buildDeleteRequest();
+ * request.setUrl(getEditLink());
+ * request.headers.ifMatch = etag;
+ * request.execute().ignore();
+ * }
+ * </code></pre>
+ *
+ * <p>NOTE: As you might guess, the library uses reflection to populate the user-defined data model.
  * It's not quite as fast as writing the wire format parsing code yourself can potentially be, but
  * it's a lot easier.
- * </p>
  *
- * <p>
- * NOTE: If you prefer to use your favorite XML parsing library instead (there are many of them),
+ * <p>NOTE: If you prefer to use your favorite XML parsing library instead (there are many of them),
  * that's supported as well. Just call {@link com.google.api.client.http.HttpRequest#execute()} and
  * parse the returned byte stream.
- * </p>
  *
  * @since 1.0
  * @author Yaniv Inbar
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.xml.atom;
-
diff --git a/google-api-client-xml/src/test/java/com/google/api/client/googleapis/xml/atom/GoogleAtomTest.java b/google-api-client-xml/src/test/java/com/google/api/client/googleapis/xml/atom/GoogleAtomTest.java
index a4aa90b3f..386bfe227 100644
--- a/google-api-client-xml/src/test/java/com/google/api/client/googleapis/xml/atom/GoogleAtomTest.java
+++ b/google-api-client-xml/src/test/java/com/google/api/client/googleapis/xml/atom/GoogleAtomTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 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
@@ -16,7 +16,6 @@
 
 import com.google.api.client.util.Key;
 import com.google.api.client.xml.GenericXml;
-
 import junit.framework.TestCase;
 
 /**
@@ -35,35 +34,26 @@ public GoogleAtomTest(String name) {
   }
 
   class A {
-    @Key
-    int x;
+    @Key int x;
 
-    @Key
-    B b;
+    @Key B b;
 
-    @Key
-    C c;
-    @Key
-    G g;
+    @Key C c;
+    @Key G g;
   }
 
   class B {
-    @Key
-    int y;
+    @Key int y;
   }
 
   class C {
-    @Key
-    int z;
-    @Key
-    GenericXml generic;
-    @Key
-    B b;
+    @Key int z;
+    @Key GenericXml generic;
+    @Key B b;
   }
 
   class G extends GenericXml {
-    @Key
-    int something;
+    @Key int something;
   }
 
   public void testGetFieldsFor() {
diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml
index e57a64f4d..db4ca4d69 100644
--- a/google-api-client/pom.xml
+++ b/google-api-client/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.google.api-client</groupId>
     <artifactId>google-api-client-parent</artifactId>
-    <version>1.25.0-SNAPSHOT</version>
+    <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
     <relativePath>../pom.xml</relativePath>
   </parent>
   <artifactId>google-api-client</artifactId>
@@ -14,18 +14,29 @@
       <extension>
         <groupId>kr.motd.maven</groupId>
         <artifactId>os-maven-plugin</artifactId>
-        <version>1.4.0.Final</version>
+        <version>1.6.2</version>
       </extension>
     </extensions>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>resources</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
           <links>
-            <link>http://download.oracle.com/javase/1.5.0/docs/api/</link>
-            <link>http://code.google.com/appengine/docs/java/javadoc</link>
-            <link>http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version}</link>
-            <link>http://javadoc.google-oauth-java-client.googlecode.com/hg/${project.oauth.version}</link>
+            <link>https://docs.oracle.com/javase/7/docs/api/</link>
+            <link>https://cloud.google.com/appengine/docs/standard/java/javadoc/</link>
+            <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+            <link>https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/</link>
           </links>
           <doctitle>${project.name} ${project.version}</doctitle>
           <windowtitle>${project.artifactId} ${project.version}</windowtitle>
@@ -35,14 +46,18 @@
         <artifactId>maven-jar-plugin</artifactId>
         <configuration>
           <archive>
+            <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
             <manifest>
               <addDefaultImplementationEntries>true</addDefaultImplementationEntries>
             </manifest>
+            <manifestEntries>
+              <Automatic-Module-Name>google.api.client</Automatic-Module-Name>
+            </manifestEntries>
             <manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
           </archive>
         </configuration>
       </plugin>
-      <plugin>   
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <version>2.5.4</version>
@@ -75,11 +90,11 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>com.google.protobuf.tools</groupId>
-        <artifactId>maven-protoc-plugin</artifactId>
-        <version>0.4.2</version>
+        <groupId>org.xolstice.maven.plugins</groupId>
+        <artifactId>protobuf-maven-plugin</artifactId>
+        <version>0.6.1</version>
         <configuration>
-          <protocArtifact>com.google.protobuf:protoc:${project.protobuf-java.version}-build2:exe:${os.detected.classifier}</protocArtifact>
+          <protocArtifact>com.google.protobuf:protoc:${project.protobuf-java.version}:exe:${os.detected.classifier}</protocArtifact>
         </configuration>
         <executions>
           <execution>
@@ -90,6 +105,16 @@
         </executions>
       </plugin>
     </plugins>
+
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>src/main/properties</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
   </build>
   <dependencies>
     <dependency>
@@ -98,11 +123,31 @@
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-jackson2</artifactId>
+      <artifactId>google-http-client-gson</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.guava</groupId>
+      <artifactId>guava</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.http-client</groupId>
+      <artifactId>google-http-client-apache-v2</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpcore</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.httpcomponents</groupId>
+      <artifactId>httpclient</artifactId>
     </dependency>
     <dependency>
       <groupId>com.google.http-client</groupId>
-      <artifactId>google-http-client-gson</artifactId>
+      <artifactId>google-http-client</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -115,15 +160,6 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>commons-codec</groupId>
-      <artifactId>commons-codec</artifactId>
-      <scope>provided</scope>
-      <version>1.6</version>
-   </dependency>
-    <dependency>
-      <groupId>com.google.guava</groupId>
-      <artifactId>guava</artifactId>
-    </dependency>
+
   </dependencies>
 </project>
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java
index b3cd5f904..19c7f30c9 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/GoogleUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -15,11 +15,14 @@
 package com.google.api.client.googleapis;
 
 import com.google.api.client.util.SecurityUtils;
-
+import com.google.common.annotations.VisibleForTesting;
 import java.io.IOException;
 import java.io.InputStream;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
+import java.util.Properties;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Utility class for the Google API Client Library.
@@ -29,32 +32,41 @@
  */
 public final class GoogleUtils {
 
+  /** Current release version. */
+  public static final String VERSION = getVersion();
+
   // NOTE: Integer instead of int so compiler thinks it isn't a constant, so it won't inline it
   /**
    * Major part of the current release version.
    *
    * @since 1.14
    */
-  public static final Integer MAJOR_VERSION = 1;
+  public static final Integer MAJOR_VERSION;
 
   /**
    * Minor part of the current release version.
    *
    * @since 1.14
    */
-  public static final Integer MINOR_VERSION = 25;
+  public static final Integer MINOR_VERSION;
 
   /**
    * Bug fix part of the current release version.
    *
    * @since 1.14
    */
-  public static final Integer BUGFIX_VERSION = 0;
+  public static final Integer BUGFIX_VERSION;
 
-  /** Current release version. */
-  // NOTE: toString() so compiler thinks it isn't a constant, so it won't inline it
-  public static final String VERSION = (MAJOR_VERSION + "." + MINOR_VERSION + "." + BUGFIX_VERSION
-      + "-SNAPSHOT").toString();
+  @VisibleForTesting
+  static final Pattern VERSION_PATTERN = Pattern.compile("(\\d+)\\.(\\d+)\\.(\\d+)(-SNAPSHOT)?");
+
+  static {
+    Matcher versionMatcher = VERSION_PATTERN.matcher(VERSION);
+    versionMatcher.find();
+    MAJOR_VERSION = Integer.parseInt(versionMatcher.group(1));
+    MINOR_VERSION = Integer.parseInt(versionMatcher.group(2));
+    BUGFIX_VERSION = Integer.parseInt(versionMatcher.group(3));
+  }
 
   /** Cached value for {@link #getCertificateTrustStore()}. */
   static KeyStore certTrustStore;
@@ -62,22 +74,36 @@ public final class GoogleUtils {
   /**
    * Returns the key store for trusted root certificates to use for Google APIs.
    *
-   * <p>
-   * Value is cached, so subsequent access is fast.
-   * </p>
+   * <p>Value is cached, so subsequent access is fast.
    *
    * @since 1.14
    */
   public static synchronized KeyStore getCertificateTrustStore()
       throws IOException, GeneralSecurityException {
     if (certTrustStore == null) {
-      certTrustStore = SecurityUtils.getJavaKeyStore();
-      InputStream keyStoreStream = GoogleUtils.class.getResourceAsStream("google.jks");
+      certTrustStore = SecurityUtils.getPkcs12KeyStore();
+      InputStream keyStoreStream = GoogleUtils.class.getResourceAsStream("google.p12");
       SecurityUtils.loadKeyStore(certTrustStore, keyStoreStream, "notasecret");
     }
     return certTrustStore;
   }
 
-  private GoogleUtils() {
+  private static String getVersion() {
+    // attempt to read the library's version from a properties file generated during the build
+    // this value should be read and cached for later use
+    String version = null;
+    try (InputStream inputStream =
+        GoogleUtils.class.getResourceAsStream("google-api-client.properties")) {
+      if (inputStream != null) {
+        Properties properties = new Properties();
+        properties.load(inputStream);
+        version = properties.getProperty("google-api-client.version");
+      }
+    } catch (IOException e) {
+      // ignore
+    }
+    return version == null ? "unknown-version" : version;
   }
+
+  private GoogleUtils() {}
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java b/google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java
index c13093930..6ffe157c7 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/MethodOverride.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 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
@@ -20,40 +20,31 @@
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.UrlEncodedContent;
-
 import java.io.IOException;
 
 /**
  * Thread-safe HTTP request execute interceptor for Google API's that wraps HTTP requests inside of
  * a POST request and uses {@link #HEADER} header to specify the actual HTTP method.
  *
- * <p>
- * Use this for example for an HTTP transport that doesn't support PATCH like
- * {@code NetHttpTransport} or {@code UrlFetchTransport}. By default, only the methods not supported
- * by the transport will be overridden. When running behind a firewall that does not support certain
- * verbs like PATCH, use the {@link MethodOverride.Builder#setOverrideAllMethods(boolean)}
- * constructor instead to specify to override all methods. POST is never overridden.
- * </p>
+ * <p>Use this for example for an HTTP transport that doesn't support PATCH like {@code
+ * NetHttpTransport} or {@code UrlFetchTransport}. By default, only the methods not supported by the
+ * transport will be overridden. When running behind a firewall that does not support certain verbs
+ * like PATCH, use the {@link MethodOverride.Builder#setOverrideAllMethods(boolean)} constructor
+ * instead to specify to override all methods. POST is never overridden.
  *
- * <p>
- * This class also allows GET requests with a long URL (> 2048 chars) to be instead sent using
+ * <p>This class also allows GET requests with a long URL (> 2048 chars) to be instead sent using
  * method override as a POST request.
- * </p>
  *
- * <p>
- * Sample usage, taking advantage that this class implements {@link HttpRequestInitializer}:
- * </p>
+ * <p>Sample usage, taking advantage that this class implements {@link HttpRequestInitializer}:
  *
  * <pre>
-  public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
-    return transport.createRequestFactory(new MethodOverride());
-  }
+ * public static HttpRequestFactory createRequestFactory(HttpTransport transport) {
+ * return transport.createRequestFactory(new MethodOverride());
+ * }
  * </pre>
  *
- * <p>
- * If you have a custom request initializer, take a look at the sample usage for
- * {@link HttpExecuteInterceptor}, which this class also implements.
- * </p>
+ * <p>If you have a custom request initializer, take a look at the sample usage for {@link
+ * HttpExecuteInterceptor}, which this class also implements.
  *
  * @since 1.4
  * @author Yaniv Inbar
@@ -112,7 +103,8 @@ private boolean overrideThisMethod(HttpRequest request) throws IOException {
       return false;
     }
     if (requestMethod.equals(HttpMethods.GET)
-        ? request.getUrl().build().length() > MAX_URL_LENGTH : overrideAllMethods) {
+        ? request.getUrl().build().length() > MAX_URL_LENGTH
+        : overrideAllMethods) {
       return true;
     }
     return !request.getTransport().supportsMethod(requestMethod);
@@ -149,9 +141,7 @@ public boolean getOverrideAllMethods() {
      * Sets whether to allow all methods (except GET and POST) to be overridden regardless of
      * whether the transport supports them.
      *
-     * <p>
-     * Default is {@code false}.
-     * </p>
+     * <p>Default is {@code false}.
      */
     public Builder setOverrideAllMethods(boolean overrideAllMethods) {
       this.overrideAllMethods = overrideAllMethods;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java
index fbb3e64a2..de2d95099 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/GoogleApacheHttpTransport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -16,30 +16,70 @@
 
 import com.google.api.client.googleapis.GoogleUtils;
 import com.google.api.client.http.apache.ApacheHttpTransport;
-
+import com.google.api.client.util.SslUtils;
 import java.io.IOException;
+import java.net.ProxySelector;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
+import java.util.concurrent.TimeUnit;
+import javax.net.ssl.SSLContext;
+import org.apache.http.client.HttpClient;
+import org.apache.http.config.SocketConfig;
+import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.impl.conn.SystemDefaultRoutePlanner;
 
 /**
  * Utilities for Google APIs based on {@link ApacheHttpTransport}.
  *
  * @since 1.14
  * @author Yaniv Inbar
+ * @deprecated Use com.google.api.client.googleapis.apache.v2.GoogleApacheHttpTransport
  */
+@Deprecated
 public final class GoogleApacheHttpTransport {
 
   /**
-   * Returns a new instance of {@link ApacheHttpTransport} that uses
-   * {@link GoogleUtils#getCertificateTrustStore()} for the trusted certificates using
-   * {@link com.google.api.client.http.apache.ApacheHttpTransport.Builder#trustCertificates(KeyStore)}.
+   * Returns a new instance of {@link ApacheHttpTransport} that uses {@link
+   * GoogleUtils#getCertificateTrustStore()} for the trusted certificates.
+   *
+   * @deprecated Use
+   *     com.google.api.client.googleapis.apache.v2.GoogleApacheHttpTransport.newTrustedTransport()
    */
-  public static ApacheHttpTransport newTrustedTransport() throws GeneralSecurityException,
-      IOException {
-    return new ApacheHttpTransport.Builder().trustCertificates(
-        GoogleUtils.getCertificateTrustStore()).build();
-  }
+  public static ApacheHttpTransport newTrustedTransport()
+      throws GeneralSecurityException, IOException {
+    // Set socket buffer sizes to 8192
+    SocketConfig socketConfig =
+        SocketConfig.custom().setRcvBufSize(8192).setSndBufSize(8192).build();
+
+    PoolingHttpClientConnectionManager connectionManager =
+        new PoolingHttpClientConnectionManager(-1, TimeUnit.MILLISECONDS);
 
-  private GoogleApacheHttpTransport() {
+    // Disable the stale connection check (previously configured in the HttpConnectionParams
+    connectionManager.setValidateAfterInactivity(-1);
+
+    // Use the included trust store
+    KeyStore trustStore = GoogleUtils.getCertificateTrustStore();
+    SSLContext sslContext = SslUtils.getTlsSslContext();
+    SslUtils.initSslContext(sslContext, trustStore, SslUtils.getPkixTrustManagerFactory());
+    LayeredConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(sslContext);
+
+    HttpClient client =
+        HttpClientBuilder.create()
+            .useSystemProperties()
+            .setSSLSocketFactory(socketFactory)
+            .setDefaultSocketConfig(socketConfig)
+            .setMaxConnTotal(200)
+            .setMaxConnPerRoute(20)
+            .setRoutePlanner(new SystemDefaultRoutePlanner(ProxySelector.getDefault()))
+            .setConnectionManager(connectionManager)
+            .disableRedirectHandling()
+            .disableAutomaticRetries()
+            .build();
+    return new ApacheHttpTransport(client);
   }
+
+  private GoogleApacheHttpTransport() {}
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/package-info.java
index 5bc406834..201e2c0f2 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,11 +13,9 @@
  */
 
 /**
- * Google API's support based on the Apache HTTP Client.
+ * Google APIs support based on the Apache HTTP Client.
  *
  * @since 1.14
  * @author Yaniv Inbar
  */
-
 package com.google.api.client.googleapis.apache;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/apache/v2/GoogleApacheHttpTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/v2/GoogleApacheHttpTransport.java
new file mode 100644
index 000000000..93347cd3e
--- /dev/null
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/v2/GoogleApacheHttpTransport.java
@@ -0,0 +1,144 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.api.client.googleapis.apache.v2;
+
+import com.google.api.client.googleapis.GoogleUtils;
+import com.google.api.client.googleapis.mtls.MtlsProvider;
+import com.google.api.client.googleapis.mtls.MtlsUtils;
+import com.google.api.client.googleapis.util.Utils;
+import com.google.api.client.http.apache.v2.ApacheHttpTransport;
+import com.google.api.client.util.Beta;
+import com.google.api.client.util.SslUtils;
+import com.google.common.annotations.VisibleForTesting;
+import java.io.IOException;
+import java.net.ProxySelector;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.util.concurrent.TimeUnit;
+import javax.net.ssl.SSLContext;
+import org.apache.http.client.HttpClient;
+import org.apache.http.config.Registry;
+import org.apache.http.config.RegistryBuilder;
+import org.apache.http.conn.socket.ConnectionSocketFactory;
+import org.apache.http.conn.socket.LayeredConnectionSocketFactory;
+import org.apache.http.conn.socket.PlainConnectionSocketFactory;
+import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
+import org.apache.http.impl.client.HttpClientBuilder;
+import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
+import org.apache.http.impl.conn.SystemDefaultRoutePlanner;
+
+/**
+ * Utilities for Google APIs based on {@link ApacheHttpTransport}.
+ *
+ * @since 1.31
+ */
+public final class GoogleApacheHttpTransport {
+
+  /**
+   * Returns a new instance of {@link ApacheHttpTransport} that uses {@link
+   * GoogleUtils#getCertificateTrustStore()} for the trusted certificates. If
+   * `GOOGLE_API_USE_CLIENT_CERTIFICATE` environment variable is set to "true", and the default
+   * client certificate key store from {@link Utils#loadDefaultMtlsKeyStore()} is not null, then the
+   * transport uses the default client certificate and is mutual TLS.
+   */
+  public static ApacheHttpTransport newTrustedTransport()
+      throws GeneralSecurityException, IOException {
+    return newTrustedTransport(MtlsUtils.getDefaultMtlsProvider());
+  }
+
+  /**
+   * {@link Beta} <br>
+   * Returns a new instance of {@link ApacheHttpTransport} that uses {@link
+   * GoogleUtils#getCertificateTrustStore()} for the trusted certificates. mtlsProvider can be used
+   * to configure mutual TLS for the transport.
+   *
+   * @param mtlsProvider MtlsProvider to configure mutual TLS for the transport
+   */
+  @Beta
+  public static ApacheHttpTransport newTrustedTransport(MtlsProvider mtlsProvider)
+      throws GeneralSecurityException, IOException {
+    SocketFactoryRegistryHandler handler = new SocketFactoryRegistryHandler(mtlsProvider);
+    PoolingHttpClientConnectionManager connectionManager =
+        new PoolingHttpClientConnectionManager(
+            handler.getSocketFactoryRegistry(), null, null, null, -1, TimeUnit.MILLISECONDS);
+
+    // Disable the stale connection check (previously configured in the
+    // HttpConnectionParams
+    connectionManager.setValidateAfterInactivity(-1);
+
+    HttpClient client =
+        HttpClientBuilder.create()
+            .useSystemProperties()
+            .setMaxConnTotal(200)
+            .setMaxConnPerRoute(20)
+            .setRoutePlanner(new SystemDefaultRoutePlanner(ProxySelector.getDefault()))
+            .setConnectionManager(connectionManager)
+            .disableRedirectHandling()
+            .disableAutomaticRetries()
+            .build();
+    return new ApacheHttpTransport(client, handler.isMtls());
+  }
+
+  @VisibleForTesting
+  static class SocketFactoryRegistryHandler {
+    private final Registry<ConnectionSocketFactory> socketFactoryRegistry;
+    private final boolean isMtls;
+
+    public SocketFactoryRegistryHandler(MtlsProvider mtlsProvider)
+        throws GeneralSecurityException, IOException {
+      KeyStore mtlsKeyStore = null;
+      String mtlsKeyStorePassword = null;
+      if (mtlsProvider.useMtlsClientCertificate()) {
+        mtlsKeyStore = mtlsProvider.getKeyStore();
+        mtlsKeyStorePassword = mtlsProvider.getKeyStorePassword();
+      }
+
+      // Use the included trust store
+      KeyStore trustStore = GoogleUtils.getCertificateTrustStore();
+      SSLContext sslContext = SslUtils.getTlsSslContext();
+
+      if (mtlsKeyStore != null && mtlsKeyStorePassword != null) {
+        this.isMtls = true;
+        SslUtils.initSslContext(
+            sslContext,
+            trustStore,
+            SslUtils.getPkixTrustManagerFactory(),
+            mtlsKeyStore,
+            mtlsKeyStorePassword,
+            SslUtils.getDefaultKeyManagerFactory());
+      } else {
+        this.isMtls = false;
+        SslUtils.initSslContext(sslContext, trustStore, SslUtils.getPkixTrustManagerFactory());
+      }
+      LayeredConnectionSocketFactory socketFactory = new SSLConnectionSocketFactory(sslContext);
+
+      this.socketFactoryRegistry =
+          RegistryBuilder.<ConnectionSocketFactory>create()
+              .register("http", PlainConnectionSocketFactory.getSocketFactory())
+              .register("https", socketFactory)
+              .build();
+    }
+
+    public Registry<ConnectionSocketFactory> getSocketFactoryRegistry() {
+      return this.socketFactoryRegistry;
+    }
+
+    public boolean isMtls() {
+      return this.isMtls;
+    }
+  }
+
+  private GoogleApacheHttpTransport() {}
+}
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/clientlogin/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/v2/package-info.java
similarity index 58%
rename from google-api-client/src/main/java/com/google/api/client/googleapis/auth/clientlogin/package-info.java
rename to google-api-client/src/main/java/com/google/api/client/googleapis/apache/v2/package-info.java
index 2ff371f35..efd903244 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/clientlogin/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/apache/v2/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 2020 Google LLC
  *
  * 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
@@ -13,14 +13,8 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
- * Google's legacy ClientLogin authentication method as described in <a
- * href="http://code.google.com/apis/accounts/docs/AuthForInstalledApps.html">ClientLogin for
- * Installed Applications</a>.
+ * Google APIs support based on the Apache HTTP Client.
  *
- * @since 1.0
- * @author Yaniv Inbar
+ * @since 1.31
  */
-@com.google.api.client.util.Beta
-package com.google.api.client.googleapis.auth.clientlogin;
-
+package com.google.api.client.googleapis.apache.v2;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/clientlogin/AuthKeyValueParser.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/clientlogin/AuthKeyValueParser.java
deleted file mode 100644
index 4dacf441e..000000000
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/clientlogin/AuthKeyValueParser.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.google.api.client.googleapis.auth.clientlogin;
-
-import com.google.api.client.http.HttpResponse;
-import com.google.api.client.util.Beta;
-import com.google.api.client.util.ClassInfo;
-import com.google.api.client.util.FieldInfo;
-import com.google.api.client.util.GenericData;
-import com.google.api.client.util.ObjectParser;
-import com.google.api.client.util.Types;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.lang.reflect.Field;
-import java.lang.reflect.Type;
-import java.nio.charset.Charset;
-import java.util.Map;
-
-/**
- * {@link Beta} <br/>
- * HTTP parser for Google response to an Authorization request.
- *
- * @since 1.10
- * @author Yaniv Inbar
- */
-@Beta
-final class AuthKeyValueParser implements ObjectParser {
-
-  /** Singleton instance. */
-  public static final AuthKeyValueParser INSTANCE = new AuthKeyValueParser();
-
-  public String getContentType() {
-    return "text/plain";
-  }
-
-  public <T> T parse(HttpResponse response, Class<T> dataClass) throws IOException {
-    response.setContentLoggingLimit(0);
-    InputStream content = response.getContent();
-    try {
-      return parse(content, dataClass);
-    } finally {
-      content.close();
-    }
-  }
-
-  public <T> T parse(InputStream content, Class<T> dataClass) throws IOException {
-    ClassInfo classInfo = ClassInfo.of(dataClass);
-    T newInstance = Types.newInstance(dataClass);
-    BufferedReader reader = new BufferedReader(new InputStreamReader(content));
-    while (true) {
-      String line = reader.readLine();
-      if (line == null) {
-        break;
-      }
-      int equals = line.indexOf('=');
-      String key = line.substring(0, equals);
-      String value = line.substring(equals + 1);
-      // get the field from the type information
-      Field field = classInfo.getField(key);
-      if (field != null) {
-        Class<?> fieldClass = field.getType();
-        Object fieldValue;
-        if (fieldClass == boolean.class || fieldClass == Boolean.class) {
-          fieldValue = Boolean.valueOf(value);
-        } else {
-          fieldValue = value;
-        }
-        FieldInfo.setFieldValue(field, newInstance, fieldValue);
-      } else if (GenericData.class.isAssignableFrom(dataClass)) {
-        GenericData data = (GenericData) newInstance;
-        data.set(key, value);
-      } else if (Map.class.isAssignableFrom(dataClass)) {
-        @SuppressWarnings("unchecked")
-        Map<Object, Object> map = (Map<Object, Object>) newInstance;
-        map.put(key, value);
-      }
-    }
-
-    return newInstance;
-  }
-
-  private AuthKeyValueParser() {
-  }
-
-  public <T> T parseAndClose(InputStream in, Charset charset, Class<T> dataClass)
-      throws IOException {
-    Reader reader = new InputStreamReader(in, charset);
-    return parseAndClose(reader, dataClass);
-  }
-
-  public Object parseAndClose(InputStream in, Charset charset, Type dataType) {
-    throw new UnsupportedOperationException(
-        "Type-based parsing is not yet supported -- use Class<T> instead");
-  }
-
-  public <T> T parseAndClose(Reader reader, Class<T> dataClass) throws IOException {
-    try {
-      ClassInfo classInfo = ClassInfo.of(dataClass);
-      T newInstance = Types.newInstance(dataClass);
-      BufferedReader breader = new BufferedReader(reader);
-      while (true) {
-        String line = breader.readLine();
-        if (line == null) {
-          break;
-        }
-        int equals = line.indexOf('=');
-        String key = line.substring(0, equals);
-        String value = line.substring(equals + 1);
-        // get the field from the type information
-        Field field = classInfo.getField(key);
-        if (field != null) {
-          Class<?> fieldClass = field.getType();
-          Object fieldValue;
-          if (fieldClass == boolean.class || fieldClass == Boolean.class) {
-            fieldValue = Boolean.valueOf(value);
-          } else {
-            fieldValue = value;
-          }
-          FieldInfo.setFieldValue(field, newInstance, fieldValue);
-        } else if (GenericData.class.isAssignableFrom(dataClass)) {
-          GenericData data = (GenericData) newInstance;
-          data.set(key, value);
-        } else if (Map.class.isAssignableFrom(dataClass)) {
-          @SuppressWarnings("unchecked")
-          Map<Object, Object> map = (Map<Object, Object>) newInstance;
-          map.put(key, value);
-        }
-      }
-
-      return newInstance;
-    } finally {
-      reader.close();
-    }
-  }
-
-  public Object parseAndClose(Reader reader, Type dataType) {
-    throw new UnsupportedOperationException(
-        "Type-based parsing is not yet supported -- use Class<T> instead");
-  }
-}
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/clientlogin/ClientLogin.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/clientlogin/ClientLogin.java
deleted file mode 100644
index 8e335ed45..000000000
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/clientlogin/ClientLogin.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.google.api.client.googleapis.auth.clientlogin;
-
-import com.google.api.client.http.GenericUrl;
-import com.google.api.client.http.HttpExecuteInterceptor;
-import com.google.api.client.http.HttpRequest;
-import com.google.api.client.http.HttpRequestInitializer;
-import com.google.api.client.http.HttpResponse;
-import com.google.api.client.http.HttpResponseException;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.UrlEncodedContent;
-import com.google.api.client.util.Beta;
-import com.google.api.client.util.Key;
-import com.google.api.client.util.StringUtils;
-import com.google.api.client.util.Strings;
-
-import java.io.IOException;
-
-/**
- * {@link Beta} <br/>
- * Client Login authentication method as described in <a
- * href="http://code.google.com/apis/accounts/docs/AuthForInstalledApps.html" >ClientLogin for
- * Installed Applications</a>.
- *
- * @since 1.0
- * @author Yaniv Inbar
- */
-@Beta
-public final class ClientLogin {
-
-  /**
-   * HTTP transport required for executing request in {@link #authenticate()}.
-   *
-   * @since 1.3
-   */
-  public HttpTransport transport;
-
-  /**
-   * URL for the Client Login authorization server.
-   *
-   * <p>
-   * By default this is {@code "https://www.google.com"}, but it may be overridden for testing
-   * purposes.
-   * </p>
-   *
-   * @since 1.3
-   */
-  public GenericUrl serverUrl = new GenericUrl("https://www.google.com");
-
-  /**
-   * Short string identifying your application for logging purposes of the form:
-   * "companyName-applicationName-versionID".
-   */
-  @Key("source")
-  public String applicationName;
-
-  /**
-   * Name of the Google service you're requesting authorization for, for example {@code "cl"} for
-   * Google Calendar.
-   */
-  @Key("service")
-  public String authTokenType;
-
-  /** User's full email address. */
-  @Key("Email")
-  public String username;
-
-  /** User's password. */
-  @Key("Passwd")
-  public String password;
-
-  /**
-   * Type of account to request authorization for. Possible values are:
-   *
-   * <ul>
-   * <li>GOOGLE (get authorization for a Google account only)</li>
-   * <li>HOSTED (get authorization for a hosted account only)</li>
-   * <li>HOSTED_OR_GOOGLE (get authorization first for a hosted account; if attempt fails, get
-   * authorization for a Google account)</li>
-   * </ul>
-   *
-   * Use HOSTED_OR_GOOGLE if you're not sure which type of account you want authorization for. If
-   * the user information matches both a hosted and a Google account, only the hosted account is
-   * authorized.
-   *
-   * @since 1.1
-   */
-  @Key
-  public String accountType;
-
-  /** (optional) Token representing the specific CAPTCHA challenge. */
-  @Key("logintoken")
-  public String captchaToken;
-
-  /** (optional) String entered by the user as an answer to a CAPTCHA challenge. */
-  @Key("logincaptcha")
-  public String captchaAnswer;
-
-  /**
-   * Key/value data to parse a success response.
-   *
-   * <p>
-   * Sample usage, taking advantage that this class implements {@link HttpRequestInitializer}:
-   * </p>
-   *
-   * <pre>
-    public static HttpRequestFactory createRequestFactory(
-        HttpTransport transport, Response response) {
-      return transport.createRequestFactory(response);
-    }
-   * </pre>
-   *
-   * <p>
-   * If you have a custom request initializer, take a look at the sample usage for
-   * {@link HttpExecuteInterceptor}, which this class also implements.
-   * </p>
-   */
-  public static final class Response implements HttpExecuteInterceptor, HttpRequestInitializer {
-
-    /** Authentication token. */
-    @Key("Auth")
-    public String auth;
-
-    /** Returns the authorization header value to use based on the authentication token. */
-    public String getAuthorizationHeaderValue() {
-      return ClientLogin.getAuthorizationHeaderValue(auth);
-    }
-
-    public void initialize(HttpRequest request) {
-      request.setInterceptor(this);
-    }
-
-    public void intercept(HttpRequest request) {
-      request.getHeaders().setAuthorization(getAuthorizationHeaderValue());
-    }
-  }
-
-  /** Key/value data to parse an error response. */
-  public static final class ErrorInfo {
-
-    @Key("Error")
-    public String error;
-
-    @Key("Url")
-    public String url;
-
-    @Key("CaptchaToken")
-    public String captchaToken;
-
-    @Key("CaptchaUrl")
-    public String captchaUrl;
-  }
-
-  /**
-   * Authenticates based on the provided field values.
-   *
-   * @throws ClientLoginResponseException if the authentication response has an error code, such as
-   *         for a CAPTCHA challenge.
-   */
-  public Response authenticate() throws IOException {
-    GenericUrl url = serverUrl.clone();
-    url.appendRawPath("/accounts/ClientLogin");
-    HttpRequest request =
-        transport.createRequestFactory().buildPostRequest(url, new UrlEncodedContent(this));
-    request.setParser(AuthKeyValueParser.INSTANCE);
-    request.setContentLoggingLimit(0);
-    request.setThrowExceptionOnExecuteError(false);
-    HttpResponse response = request.execute();
-    // check for an HTTP success response (2xx)
-    if (response.isSuccessStatusCode()) {
-      return response.parseAs(Response.class);
-    }
-    HttpResponseException.Builder builder = new HttpResponseException.Builder(
-        response.getStatusCode(), response.getStatusMessage(), response.getHeaders());
-    // On error, throw a ClientLoginResponseException with the parsed error details
-    ErrorInfo details = response.parseAs(ErrorInfo.class);
-    String detailString = details.toString();
-    StringBuilder message = HttpResponseException.computeMessageBuffer(response);
-    if (!Strings.isNullOrEmpty(detailString)) {
-      message.append(StringUtils.LINE_SEPARATOR).append(detailString);
-      builder.setContent(detailString);
-    }
-    builder.setMessage(message.toString());
-    throw new ClientLoginResponseException(builder, details);
-  }
-
-  /**
-   * Returns Google Login {@code "Authorization"} header value based on the given authentication
-   * token.
-   *
-   * @since 1.13
-   */
-  public static String getAuthorizationHeaderValue(String authToken) {
-    return "GoogleLogin auth=" + authToken;
-  }
-}
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/clientlogin/ClientLoginResponseException.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/clientlogin/ClientLoginResponseException.java
deleted file mode 100644
index b6d74f549..000000000
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/clientlogin/ClientLoginResponseException.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright (c) 2011 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
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.google.api.client.googleapis.auth.clientlogin;
-
-import com.google.api.client.googleapis.auth.clientlogin.ClientLogin.ErrorInfo;
-import com.google.api.client.http.HttpResponseException;
-import com.google.api.client.util.Beta;
-
-/**
- * {@link Beta} <br/>
- * Exception thrown when an error status code is detected in an HTTP response to a Google
- * ClientLogin request in {@link ClientLogin} .
- *
- * <p>
- * To get the structured details, use {@link #getDetails()}.
- * </p>
- *
- * @since 1.7
- * @author Yaniv Inbar
- */
-@Beta
-public class ClientLoginResponseException extends HttpResponseException {
-
-  private static final long serialVersionUID = 4974317674023010928L;
-
-  /** Error details or {@code null} for none. */
-  private final transient ErrorInfo details;
-
-  /**
-   * @param builder builder
-   * @param details error details or {@code null} for none
-   */
-  ClientLoginResponseException(Builder builder, ErrorInfo details) {
-    super(builder);
-    this.details = details;
-  }
-
-  /** Return the error details or {@code null} for none. */
-  public final ErrorInfo getDetails() {
-    return details;
-  }
-}
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/CloudShellCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/CloudShellCredential.java
index 9c6b3c665..83910284b 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/CloudShellCredential.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/CloudShellCredential.java
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright 2015, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -46,18 +46,19 @@
  * OAuth2 credentials representing the built-in service account for Google Cloud Shell.
  *
  * @since 1.21.0
+ * @deprecated Please use <a href="https://github.com/googleapis/google-auth-library-java">
+ *     google-auth-library</a> for handling authentication and authorization from Cloud Shell.
  */
+@Deprecated
 public class CloudShellCredential extends GoogleCredential {
 
   private static final int ACCESS_TOKEN_INDEX = 2;
   private static final int READ_TIMEOUT_MS = 5000;
 
   /**
-   * The Cloud Shell back authorization channel uses serialized
-   * Javascript Protobufers, preceeded by the message lengeth and a
-   * new line character. However, the request message has no content,
-   * so a token request consists of an empty JsPb, and its 2 character
-   * lenth prefix.
+   * The Cloud Shell back authorization channel uses serialized Javascript Protobufers, preceeded by
+   * the message lengeth and a new line character. However, the request message has no content, so a
+   * token request consists of an empty JsPb, and its 2 character lenth prefix.
    */
   protected static final String GET_AUTH_TOKEN_REQUEST = "2\n[]";
 
@@ -74,23 +75,20 @@ protected int getAuthPort() {
   }
 
   @Override
-  protected TokenResponse executeRefreshToken()
-      throws IOException {
+  protected TokenResponse executeRefreshToken() throws IOException {
     Socket socket = new Socket("localhost", this.getAuthPort());
     socket.setSoTimeout(READ_TIMEOUT_MS);
     TokenResponse token = new TokenResponse();
     try {
-      PrintWriter out =
-        new PrintWriter(socket.getOutputStream(), true);
+      PrintWriter out = new PrintWriter(socket.getOutputStream(), true);
       out.println(GET_AUTH_TOKEN_REQUEST);
 
-      BufferedReader input =
-          new BufferedReader(new InputStreamReader(socket.getInputStream()));
+      BufferedReader input = new BufferedReader(new InputStreamReader(socket.getInputStream()));
       // Ignore the size line
       input.readLine();
 
-      Collection<Object> messageArray = jsonFactory.createJsonParser(input)
-        .parseArray(LinkedList.class, Object.class);
+      Collection<Object> messageArray =
+          jsonFactory.createJsonParser(input).parseArray(LinkedList.class, Object.class);
       String accessToken = ((List<Object>) messageArray).get(ACCESS_TOKEN_INDEX).toString();
       token.setAccessToken(accessToken);
     } finally {
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java
index 47caa74ec..4198e82b5 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Google Inc.
+ * Copyright 2014 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
@@ -23,7 +23,6 @@
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.util.Beta;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
@@ -36,11 +35,11 @@
 import java.util.Locale;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Provides a default credential available from the host or from an environment variable.
  *
- * <p>An instance represents the per-process state used to get and cache the credential and
- * allows overriding the state and environment for testing purposes.
+ * <p>An instance represents the per-process state used to get and cache the credential and allows
+ * overriding the state and environment for testing purposes.
  */
 @Beta
 class DefaultCredentialProvider extends SystemEnvironmentProvider {
@@ -56,12 +55,17 @@ class DefaultCredentialProvider extends SystemEnvironmentProvider {
 
   static final String APP_ENGINE_CREDENTIAL_CLASS =
       "com.google.api.client.googleapis.extensions.appengine.auth.oauth2"
-      + ".AppIdentityCredential$AppEngineCredentialWrapper";
+          + ".AppIdentityCredential$AppEngineCredentialWrapper";
 
   static final String CLOUD_SHELL_ENV_VAR = "DEVSHELL_CLIENT_PORT";
 
   private static enum Environment {
-    UNKNOWN, ENVIRONMENT_VARIABLE, WELL_KNOWN_FILE, CLOUD_SHELL, APP_ENGINE, COMPUTE_ENGINE,
+    UNKNOWN,
+    ENVIRONMENT_VARIABLE,
+    WELL_KNOWN_FILE,
+    CLOUD_SHELL,
+    APP_ENGINE,
+    COMPUTE_ENGINE,
   }
 
   // These variables should only be accessed inside a synchronized block
@@ -71,13 +75,13 @@ private static enum Environment {
   DefaultCredentialProvider() {}
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Returns the Application Default Credentials.
    *
    * <p>Returns the Application Default Credentials which are credentials that identify and
    * authorize the whole application. This is the built-in service account if running on Google
    * Compute Engine or the credentials file from the path in the environment variable
-   * GOOGLE_APPLICATION_CREDENTIALS.</p>
+   * GOOGLE_APPLICATION_CREDENTIALS.
    *
    * @param transport the transport for Http calls.
    * @param jsonFactory the factory for Json parsing and formatting.
@@ -95,13 +99,13 @@ final GoogleCredential getDefaultCredential(HttpTransport transport, JsonFactory
       }
     }
 
-    throw new IOException(String.format(
-        "The Application Default Credentials are not available. They are available if running "
-            + "on Google App Engine, Google Compute Engine, or Google Cloud Shell. Otherwise, "
-            + "the environment variable %s must be defined pointing to a file defining "
-            + "the credentials. See %s for more information.",
-        CREDENTIAL_ENV_VAR,
-        HELP_PERMALINK));
+    throw new IOException(
+        String.format(
+            "The Application Default Credentials are not available. They are available if running "
+                + "on Google App Engine, Google Compute Engine, or Google Cloud Shell. Otherwise, "
+                + "the environment variable %s must be defined pointing to a file defining "
+                + "the credentials. See %s for more information.",
+            CREDENTIAL_ENV_VAR, HELP_PERMALINK));
   }
 
   private final GoogleCredential getDefaultCredentialUnsynchronized(
@@ -140,23 +144,17 @@ private final File getWellKnownCredentialsFile() {
     return credentialFilePath;
   }
 
-  /**
-   * Override in test code to isolate from environment.
-   */
+  /** Override in test code to isolate from environment. */
   boolean fileExists(File file) {
     return file.exists() && !file.isDirectory();
   }
 
-  /**
-   * Override in test code to isolate from environment.
-   */
+  /** Override in test code to isolate from environment. */
   String getProperty(String property, String def) {
     return System.getProperty(property, def);
   }
 
-  /**
-   * Override in test code to isolate from environment.
-   */
+  /** Override in test code to isolate from environment. */
   Class<?> forName(String className) throws ClassNotFoundException {
     return Class.forName(className);
   }
@@ -166,20 +164,20 @@ private final Environment detectEnvironment(HttpTransport transport) throws IOEx
     if (runningUsingEnvironmentVariable()) {
       return Environment.ENVIRONMENT_VARIABLE;
 
-    // Then try the well-known file
+      // Then try the well-known file
     } else if (runningUsingWellKnownFile()) {
       return Environment.WELL_KNOWN_FILE;
 
-    // Try App Engine
+      // Try App Engine
     } else if (useGAEStandardAPI()) {
       return Environment.APP_ENGINE;
 
-    // Then try Cloud Shell.  This must be done BEFORE checking
-    // Compute Engine, as Cloud Shell runs on GCE VMs.
+      // Then try Cloud Shell.  This must be done BEFORE checking
+      // Compute Engine, as Cloud Shell runs on GCE VMs.
     } else if (runningOnCloudShell()) {
       return Environment.CLOUD_SHELL;
 
-    // Then try Compute Engine
+      // Then try Compute Engine
     } else if (OAuth2Utils.runningOnComputeEngine(transport, this)) {
       return Environment.COMPUTE_ENGINE;
     }
@@ -199,7 +197,8 @@ private boolean runningUsingEnvironmentVariable() throws IOException {
         throw new IOException(
             String.format(
                 "Error reading credential file from environment variable %s, value '%s': "
-                + "File does not exist.", CREDENTIAL_ENV_VAR, credentialsPath));
+                    + "File does not exist.",
+                CREDENTIAL_ENV_VAR, credentialsPath));
       }
       return true;
     } catch (AccessControlException expected) {
@@ -220,9 +219,12 @@ private GoogleCredential getCredentialUsingEnvironmentVariable(
       // Although it is also the cause, the message of the caught exception can have very
       // important information for diagnosing errors, so include its message in the
       // outer exception message also
-      throw OAuth2Utils.exceptionWithCause(new IOException(String.format(
-          "Error reading credential file from environment variable %s, value '%s': %s",
-          CREDENTIAL_ENV_VAR, credentialsPath, e.getMessage())), e);
+      throw OAuth2Utils.exceptionWithCause(
+          new IOException(
+              String.format(
+                  "Error reading credential file from environment variable %s, value '%s': %s",
+                  CREDENTIAL_ENV_VAR, credentialsPath, e.getMessage())),
+          e);
     } finally {
       if (credentialsStream != null) {
         credentialsStream.close();
@@ -248,9 +250,10 @@ private GoogleCredential getCredentialUsingWellKnownFile(
       credentialsStream = new FileInputStream(wellKnownFileLocation);
       return GoogleCredential.fromStream(credentialsStream, transport, jsonFactory);
     } catch (IOException e) {
-      throw new IOException(String.format(
-          "Error reading credential file from location %s: %s",
-          wellKnownFileLocation, e.getMessage()));
+      throw new IOException(
+          String.format(
+              "Error reading credential file from location %s: %s",
+              wellKnownFileLocation, e.getMessage()));
     } finally {
       if (credentialsStream != null) {
         credentialsStream.close();
@@ -288,9 +291,12 @@ private boolean useGAEStandardAPI() {
     } catch (InvocationTargetException exception) {
       cause = exception;
     }
-    throw OAuth2Utils.exceptionWithCause(new RuntimeException(String.format(
-        "Unexpcted error trying to determine if runnning on Google App Engine: %s",
-        cause.getMessage())), cause);
+    throw OAuth2Utils.exceptionWithCause(
+        new RuntimeException(
+            String.format(
+                "Unexpcted error trying to determine if runnning on Google App Engine: %s",
+                cause.getMessage())),
+        cause);
   }
 
   private final GoogleCredential getAppEngineCredential(
@@ -298,8 +304,8 @@ private final GoogleCredential getAppEngineCredential(
     Exception innerException = null;
     try {
       Class<?> credentialClass = forName(APP_ENGINE_CREDENTIAL_CLASS);
-      Constructor<?> constructor = credentialClass
-          .getConstructor(HttpTransport.class, JsonFactory.class);
+      Constructor<?> constructor =
+          credentialClass.getConstructor(HttpTransport.class, JsonFactory.class);
       return (GoogleCredential) constructor.newInstance(transport, jsonFactory);
     } catch (ClassNotFoundException e) {
       innerException = e;
@@ -312,11 +318,14 @@ private final GoogleCredential getAppEngineCredential(
     } catch (InvocationTargetException e) {
       innerException = e;
     }
-    throw OAuth2Utils.exceptionWithCause(new IOException(String.format(
-        "Application Default Credentials failed to create the Google App Engine service account"
-            + " credentials class %s. Check that the component 'google-api-client-appengine' is"
-            + " deployed.",
-        APP_ENGINE_CREDENTIAL_CLASS)), innerException);
+    throw OAuth2Utils.exceptionWithCause(
+        new IOException(
+            String.format(
+                "Application Default Credentials failed to create the Google App Engine service"
+                    + " account credentials class %s. Check that the component"
+                    + " 'google-api-client-appengine' is deployed.",
+                APP_ENGINE_CREDENTIAL_CLASS)),
+        innerException);
   }
 
   private boolean runningOnCloudShell() {
@@ -337,14 +346,16 @@ private final GoogleCredential getComputeCredential(
   private static class ComputeGoogleCredential extends GoogleCredential {
 
     /** Metadata Service Account token server encoded URL. */
-    private static final String TOKEN_SERVER_ENCODED_URL = OAuth2Utils.getMetadataServerUrl()
-        + "/computeMetadata/v1/instance/service-accounts/default/token";
+    private static final String TOKEN_SERVER_ENCODED_URL =
+        OAuth2Utils.getMetadataServerUrl()
+            + "/computeMetadata/v1/instance/service-accounts/default/token";
 
     ComputeGoogleCredential(HttpTransport transport, JsonFactory jsonFactory) {
-      super(new GoogleCredential.Builder()
-          .setTransport(transport)
-          .setJsonFactory(jsonFactory)
-          .setTokenServerEncodedUrl(TOKEN_SERVER_ENCODED_URL));
+      super(
+          new GoogleCredential.Builder()
+              .setTransport(transport)
+              .setJsonFactory(jsonFactory)
+              .setTokenServerEncodedUrl(TOKEN_SERVER_ENCODED_URL));
     }
 
     @Override
@@ -367,14 +378,19 @@ protected TokenResponse executeRefreshToken() throws IOException {
         return parser.parseAndClose(content, response.getContentCharset(), TokenResponse.class);
       }
       if (statusCode == HttpStatusCodes.STATUS_CODE_NOT_FOUND) {
-        throw new IOException(String.format("Error code %s trying to get security access token from"
-            + " Compute Engine metadata for the default service account. This may be because"
-            + " the virtual machine instance does not have permission scopes specified.",
-            statusCode));
+        throw new IOException(
+            String.format(
+                "Error code %s trying to get security access token from"
+                    + " Compute Engine metadata for the default service account. This may be"
+                    + " because the virtual machine instance does not have permission scopes"
+                    + " specified.",
+                statusCode));
       }
-      throw new IOException(String.format("Unexpected Error code %s trying to get security access"
-          + " token from Compute Engine metadata for the default service account: %s", statusCode,
-          response.parseAsString()));
+      throw new IOException(
+          String.format(
+              "Unexpected Error code %s trying to get security access"
+                  + " token from Compute Engine metadata for the default service account: %s",
+              statusCode, response.parseAsString()));
     }
   }
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java
index 3ce4cb702..65cc8cf5a 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlow.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -32,7 +32,6 @@
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.store.DataStore;
 import com.google.api.client.util.store.DataStoreFactory;
-
 import java.io.IOException;
 import java.util.Collection;
 
@@ -40,29 +39,23 @@
  * Thread-safe Google OAuth 2.0 authorization code flow that manages and persists end-user
  * credentials.
  *
- * <p>
- * This is designed to simplify the flow in which an end-user authorizes the application to access
- * their protected data, and then the application has access to their data based on an access token
- * and a refresh token to refresh that access token when it expires.
- * </p>
+ * <p>This is designed to simplify the flow in which an end-user authorizes the application to
+ * access their protected data, and then the application has access to their data based on an access
+ * token and a refresh token to refresh that access token when it expires.
  *
- * <p>
- * The first step is to call {@link #loadCredential(String)} based on the known user ID to check if
- * the end-user's credentials are already known. If not, call {@link #newAuthorizationUrl()} and
+ * <p>The first step is to call {@link #loadCredential(String)} based on the known user ID to check
+ * if the end-user's credentials are already known. If not, call {@link #newAuthorizationUrl()} and
  * direct the end-user's browser to an authorization page. The web browser will then redirect to the
  * redirect URL with a {@code "code"} query parameter which can then be used to request an access
- * token using {@link #newTokenRequest(String)}. Finally, use
- * {@link #createAndStoreCredential(TokenResponse, String)} to store and obtain a credential for
- * accessing protected resources.
- * </p>
+ * token using {@link #newTokenRequest(String)}. Finally, use {@link
+ * #createAndStoreCredential(TokenResponse, String)} to store and obtain a credential for accessing
+ * protected resources.
  *
- * <p>
- * The default for the {@code approval_prompt} and {@code access_type} parameters is {@code null}.
- * For web applications that means {@code "approval_prompt=auto&access_type=online"} and for
+ * <p>The default for the {@code approval_prompt} and {@code access_type} parameters is {@code
+ * null}. For web applications that means {@code "approval_prompt=auto&access_type=online"} and for
  * installed applications that means {@code "approval_prompt=force&access_type=offline"}. To
  * override the default, you need to explicitly call {@link Builder#setApprovalPrompt(String)} and
  * {@link Builder#setAccessType(String)}.
- * </p>
  *
  * @author Yaniv Inbar
  * @since 1.7
@@ -88,17 +81,19 @@ public class GoogleAuthorizationCodeFlow extends AuthorizationCodeFlow {
    * @param clientId client identifier
    * @param clientSecret client secret
    * @param scopes collection of scopes to be joined by a space separator
-   *
    * @since 1.15
    */
-  public GoogleAuthorizationCodeFlow(HttpTransport transport, JsonFactory jsonFactory,
-      String clientId, String clientSecret, Collection<String> scopes) {
+  public GoogleAuthorizationCodeFlow(
+      HttpTransport transport,
+      JsonFactory jsonFactory,
+      String clientId,
+      String clientSecret,
+      Collection<String> scopes) {
     this(new Builder(transport, jsonFactory, clientId, clientSecret, scopes));
   }
 
   /**
    * @param builder Google authorization code flow builder
-   *
    * @since 1.14
    */
   protected GoogleAuthorizationCodeFlow(Builder builder) {
@@ -111,24 +106,32 @@ protected GoogleAuthorizationCodeFlow(Builder builder) {
   public GoogleAuthorizationCodeTokenRequest newTokenRequest(String authorizationCode) {
     // don't need to specify clientId & clientSecret because specifying clientAuthentication
     // don't want to specify redirectUri to give control of it to user of this class
-    return new GoogleAuthorizationCodeTokenRequest(getTransport(), getJsonFactory(),
-        getTokenServerEncodedUrl(), "", "", authorizationCode, "").setClientAuthentication(
-        getClientAuthentication())
-        .setRequestInitializer(getRequestInitializer()).setScopes(getScopes());
+    return new GoogleAuthorizationCodeTokenRequest(
+            getTransport(),
+            getJsonFactory(),
+            getTokenServerEncodedUrl(),
+            "",
+            "",
+            authorizationCode,
+            "")
+        .setClientAuthentication(getClientAuthentication())
+        .setRequestInitializer(getRequestInitializer())
+        .setScopes(getScopes());
   }
 
   @Override
   public GoogleAuthorizationCodeRequestUrl newAuthorizationUrl() {
     // don't want to specify redirectUri to give control of it to user of this class
     return new GoogleAuthorizationCodeRequestUrl(
-        getAuthorizationServerEncodedUrl(), getClientId(), "", getScopes()).setAccessType(
-        accessType).setApprovalPrompt(approvalPrompt);
+            getAuthorizationServerEncodedUrl(), getClientId(), "", getScopes())
+        .setAccessType(accessType)
+        .setApprovalPrompt(approvalPrompt);
   }
 
   /**
-   * Returns the approval prompt behavior ({@code "auto"} to request auto-approval or
-   * {@code "force"} to force the approval UI to show) or {@code null} for the default behavior of
-   * {@code "auto"}.
+   * Returns the approval prompt behavior ({@code "auto"} to request auto-approval or {@code
+   * "force"} to force the approval UI to show) or {@code null} for the default behavior of {@code
+   * "auto"}.
    */
   public final String getApprovalPrompt() {
     return approvalPrompt;
@@ -145,9 +148,7 @@ public final String getAccessType() {
   /**
    * Google authorization code flow builder.
    *
-   * <p>
-   * Implementation is not thread-safe.
-   * </p>
+   * <p>Implementation is not thread-safe.
    */
   public static class Builder extends AuthorizationCodeFlow.Builder {
 
@@ -164,21 +165,28 @@ public static class Builder extends AuthorizationCodeFlow.Builder {
     String accessType;
 
     /**
-     *
      * @param transport HTTP transport
      * @param jsonFactory JSON factory
      * @param clientId client identifier
      * @param clientSecret client secret
      * @param scopes collection of scopes to be joined by a space separator (or a single value
-     *        containing multiple space-separated scopes)
-     *
+     *     containing multiple space-separated scopes)
      * @since 1.15
      */
-    public Builder(HttpTransport transport, JsonFactory jsonFactory, String clientId,
-        String clientSecret, Collection<String> scopes) {
-      super(BearerToken.authorizationHeaderAccessMethod(), transport, jsonFactory, new GenericUrl(
-          GoogleOAuthConstants.TOKEN_SERVER_URL), new ClientParametersAuthentication(
-          clientId, clientSecret), clientId, GoogleOAuthConstants.AUTHORIZATION_SERVER_URL);
+    public Builder(
+        HttpTransport transport,
+        JsonFactory jsonFactory,
+        String clientId,
+        String clientSecret,
+        Collection<String> scopes) {
+      super(
+          BearerToken.authorizationHeaderAccessMethod(),
+          transport,
+          jsonFactory,
+          new GenericUrl(GoogleOAuthConstants.TOKEN_SERVER_URL),
+          new ClientParametersAuthentication(clientId, clientSecret),
+          clientId,
+          GoogleOAuthConstants.AUTHORIZATION_SERVER_URL);
       setScopes(scopes);
     }
 
@@ -187,15 +195,23 @@ public Builder(HttpTransport transport, JsonFactory jsonFactory, String clientId
      * @param jsonFactory JSON factory
      * @param clientSecrets Google client secrets
      * @param scopes collection of scopes to be joined by a space separator
-     *
      * @since 1.15
      */
-    public Builder(HttpTransport transport, JsonFactory jsonFactory,
-        GoogleClientSecrets clientSecrets, Collection<String> scopes) {
-      super(BearerToken.authorizationHeaderAccessMethod(), transport, jsonFactory, new GenericUrl(
-          GoogleOAuthConstants.TOKEN_SERVER_URL), new ClientParametersAuthentication(
-          clientSecrets.getDetails().getClientId(), clientSecrets.getDetails().getClientSecret()),
-          clientSecrets.getDetails().getClientId(), GoogleOAuthConstants.AUTHORIZATION_SERVER_URL);
+    public Builder(
+        HttpTransport transport,
+        JsonFactory jsonFactory,
+        GoogleClientSecrets clientSecrets,
+        Collection<String> scopes) {
+      super(
+          BearerToken.authorizationHeaderAccessMethod(),
+          transport,
+          jsonFactory,
+          new GenericUrl(GoogleOAuthConstants.TOKEN_SERVER_URL),
+          new ClientParametersAuthentication(
+              clientSecrets.getDetails().getClientId(),
+              clientSecrets.getDetails().getClientSecret()),
+          clientSecrets.getDetails().getClientId(),
+          GoogleOAuthConstants.AUTHORIZATION_SERVER_URL);
       setScopes(scopes);
     }
 
@@ -238,65 +254,49 @@ public Builder setScopes(Collection<String> scopes) {
       return (Builder) super.setScopes(scopes);
     }
 
-    /**
-     * @since 1.11
-     */
+    /** @since 1.11 */
     @Override
     public Builder setMethod(AccessMethod method) {
       return (Builder) super.setMethod(method);
     }
 
-    /**
-     * @since 1.11
-     */
+    /** @since 1.11 */
     @Override
     public Builder setTransport(HttpTransport transport) {
       return (Builder) super.setTransport(transport);
     }
 
-    /**
-     * @since 1.11
-     */
+    /** @since 1.11 */
     @Override
     public Builder setJsonFactory(JsonFactory jsonFactory) {
       return (Builder) super.setJsonFactory(jsonFactory);
     }
 
-    /**
-     * @since 1.11
-     */
+    /** @since 1.11 */
     @Override
     public Builder setTokenServerUrl(GenericUrl tokenServerUrl) {
       return (Builder) super.setTokenServerUrl(tokenServerUrl);
     }
 
-    /**
-     * @since 1.11
-     */
+    /** @since 1.11 */
     @Override
     public Builder setClientAuthentication(HttpExecuteInterceptor clientAuthentication) {
       return (Builder) super.setClientAuthentication(clientAuthentication);
     }
 
-    /**
-     * @since 1.11
-     */
+    /** @since 1.11 */
     @Override
     public Builder setClientId(String clientId) {
       return (Builder) super.setClientId(clientId);
     }
 
-    /**
-     * @since 1.11
-     */
+    /** @since 1.11 */
     @Override
     public Builder setAuthorizationServerEncodedUrl(String authorizationServerEncodedUrl) {
       return (Builder) super.setAuthorizationServerEncodedUrl(authorizationServerEncodedUrl);
     }
 
-    /**
-     * @since 1.11
-     */
+    /** @since 1.11 */
     @Override
     public Builder setClock(Clock clock) {
       return (Builder) super.setClock(clock);
@@ -317,14 +317,10 @@ public Builder setRefreshListeners(Collection<CredentialRefreshListener> refresh
      * to force the approval UI to show) or {@code null} for the default behavior ({@code "auto"}
      * for web applications and {@code "force"} for installed applications).
      *
-     * <p>
-     * By default this has the value {@code null}.
-     * </p>
+     * <p>By default this has the value {@code null}.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setApprovalPrompt(String approvalPrompt) {
       this.approvalPrompt = approvalPrompt;
@@ -332,9 +328,9 @@ public Builder setApprovalPrompt(String approvalPrompt) {
     }
 
     /**
-     * Returns the approval prompt behavior ({@code "auto"} to request auto-approval or
-     * {@code "force"} to force the approval UI to show) or {@code null} for the default behavior of
-     * {@code "auto"}.
+     * Returns the approval prompt behavior ({@code "auto"} to request auto-approval or {@code
+     * "force"} to force the approval UI to show) or {@code null} for the default behavior of {@code
+     * "auto"}.
      */
     public final String getApprovalPrompt() {
       return approvalPrompt;
@@ -345,14 +341,10 @@ public final String getApprovalPrompt() {
      * request offline access) or {@code null} for the default behavior ({@code "online"} for web
      * applications and {@code "offline"} for installed applications).
      *
-     * <p>
-     * By default this has the value {@code null}.
-     * </p>
+     * <p>By default this has the value {@code null}.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setAccessType(String accessType) {
       this.accessType = accessType;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrl.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrl.java
index 386c3d7da..7e59e0af1 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrl.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -18,7 +18,6 @@
 import com.google.api.client.auth.oauth2.AuthorizationCodeResponseUrl;
 import com.google.api.client.util.Key;
 import com.google.api.client.util.Preconditions;
-
 import java.util.Collection;
 
 /**
@@ -28,31 +27,25 @@
  * href="https://developers.google.com/accounts/docs/OAuth2WebServer">Using OAuth 2.0 for Web Server
  * Applications</a>.
  *
- * <p>
- * The default for {@link #getResponseTypes()} is {@code "code"}. Use
- * {@link AuthorizationCodeResponseUrl} to parse the redirect response after the end user
- * grants/denies the request. Using the authorization code in this response, use
- * {@link GoogleAuthorizationCodeTokenRequest} to request the access token.
- * </p>
+ * <p>The default for {@link #getResponseTypes()} is {@code "code"}. Use {@link
+ * AuthorizationCodeResponseUrl} to parse the redirect response after the end user grants/denies the
+ * request. Using the authorization code in this response, use {@link
+ * GoogleAuthorizationCodeTokenRequest} to request the access token.
  *
- * <p>
- * Sample usage for a web application:
- * </p>
+ * <p>Sample usage for a web application:
  *
  * <pre>
-  public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    String url =
-        new GoogleAuthorizationCodeRequestUrl("812741506391.apps.googleusercontent.com",
-            "https://oauth2-login-demo.appspot.com/code", Arrays.asList(
-                "https://www.googleapis.com/auth/userinfo.email",
-                "https://www.googleapis.com/auth/userinfo.profile")).setState("/profile").build();
-    response.sendRedirect(url);
-  }
+ * public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ * String url =
+ * new GoogleAuthorizationCodeRequestUrl("812741506391.apps.googleusercontent.com",
+ * "https://oauth2-login-demo.appspot.com/code", Arrays.asList(
+ * "https://www.googleapis.com/auth/userinfo.email",
+ * "https://www.googleapis.com/auth/userinfo.profile")).setState("/profile").build();
+ * response.sendRedirect(url);
+ * }
  * </pre>
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @since 1.7
  * @author Yaniv Inbar
@@ -76,9 +69,8 @@ public class GoogleAuthorizationCodeRequestUrl extends AuthorizationCodeRequestU
   /**
    * @param clientId client identifier
    * @param redirectUri URI that the authorization server directs the resource owner's user-agent
-   *        back to the client after a successful authorization grant
+   *     back to the client after a successful authorization grant
    * @param scopes scopes (see {@link #setScopes(Collection)})
-   *
    * @since 1.15
    */
   public GoogleAuthorizationCodeRequestUrl(
@@ -90,13 +82,15 @@ public GoogleAuthorizationCodeRequestUrl(
    * @param authorizationServerEncodedUrl authorization server encoded URL
    * @param clientId client identifier
    * @param redirectUri URI that the authorization server directs the resource owner's user-agent
-   *        back to the client after a successful authorization grant
+   *     back to the client after a successful authorization grant
    * @param scopes scopes (see {@link #setScopes(Collection)})
-   *
    * @since 1.15
    */
-  public GoogleAuthorizationCodeRequestUrl(String authorizationServerEncodedUrl, String clientId,
-      String redirectUri, Collection<String> scopes) {
+  public GoogleAuthorizationCodeRequestUrl(
+      String authorizationServerEncodedUrl,
+      String clientId,
+      String redirectUri,
+      Collection<String> scopes) {
     super(authorizationServerEncodedUrl, clientId);
     setRedirectUri(redirectUri);
     setScopes(scopes);
@@ -104,12 +98,11 @@ public GoogleAuthorizationCodeRequestUrl(String authorizationServerEncodedUrl, S
 
   /**
    * @param clientSecrets OAuth 2.0 client secrets JSON model as specified in <a
-   *        href="http://code.google.com/p/google-api-python-client/wiki/ClientSecrets">
-   *        client_secrets.json file format</a>
+   *     href="https://developers.google.com/api-client-library/python/guide/aaa_client_secrets">
+   *     client_secrets.json file format</a>
    * @param redirectUri URI that the authorization server directs the resource owner's user-agent
-   *        back to the client after a successful authorization grant
+   *     back to the client after a successful authorization grant
    * @param scopes scopes (see {@link #setScopes(Collection)})
-   *
    * @since 1.15
    */
   public GoogleAuthorizationCodeRequestUrl(
@@ -118,9 +111,9 @@ public GoogleAuthorizationCodeRequestUrl(
   }
 
   /**
-   * Returns the approval prompt behavior ({@code "auto"} to request auto-approval or
-   * {@code "force"} to force the approval UI to show) or {@code null} for the default behavior of
-   * {@code "auto"}.
+   * Returns the approval prompt behavior ({@code "auto"} to request auto-approval or {@code
+   * "force"} to force the approval UI to show) or {@code null} for the default behavior of {@code
+   * "auto"}.
    */
   public final String getApprovalPrompt() {
     return approvalPrompt;
@@ -130,10 +123,8 @@ public final String getApprovalPrompt() {
    * Sets the approval prompt behavior ({@code "auto"} to request auto-approval or {@code "force"}
    * to force the approval UI to show) or {@code null} for the default behavior of {@code "auto"}.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public GoogleAuthorizationCodeRequestUrl setApprovalPrompt(String approvalPrompt) {
     this.approvalPrompt = approvalPrompt;
@@ -152,10 +143,8 @@ public final String getAccessType() {
    * Sets the access type ({@code "online"} to request online access or {@code "offline"} to request
    * offline access) or {@code null} for the default behavior of {@code "online"}.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public GoogleAuthorizationCodeRequestUrl setAccessType(String accessType) {
     this.accessType = accessType;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java
index b3d7d77ac..ff05084a9 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -24,54 +24,47 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.util.Collection;
 
 /**
  * Google-specific implementation of the OAuth 2.0 request for an access token based on an
  * authorization code (as specified in <a
- * href="http://code.google.com/apis/accounts/docs/OAuth2WebServer.html">Using OAuth 2.0 for Web
+ * href="https://developers.google.com/identity/protocols/OAuth2WebServer">Using OAuth 2.0 for Web
  * Server Applications</a>).
  *
- * <p>
- * Use {@link GoogleCredential} to access protected resources from the resource server using the
- * {@link TokenResponse} returned by {@link #execute()}. On error, it will instead throw
- * {@link TokenResponseException}.
- * </p>
+ * <p>Use {@link GoogleCredential} to access protected resources from the resource server using the
+ * {@link TokenResponse} returned by {@link #execute()}. On error, it will instead throw {@link
+ * TokenResponseException}.
  *
- * <p>
- * Sample usage:
- * </p>
+ * <p>Sample usage:
  *
  * <pre>
-  static void requestAccessToken() throws IOException {
-    try {
-      GoogleTokenResponse response =
-          new GoogleAuthorizationCodeTokenRequest(new NetHttpTransport(), new JacksonFactory(),
-              "812741506391.apps.googleusercontent.com", "{client_secret}",
-              "4/P7q7W91a-oMsCeLvIaQm6bTrgtp7", "https://oauth2-login-demo.appspot.com/code")
-              .execute();
-      System.out.println("Access token: " + response.getAccessToken());
-    } catch (TokenResponseException e) {
-      if (e.getDetails() != null) {
-        System.err.println("Error: " + e.getDetails().getError());
-        if (e.getDetails().getErrorDescription() != null) {
-          System.err.println(e.getDetails().getErrorDescription());
-        }
-        if (e.getDetails().getErrorUri() != null) {
-          System.err.println(e.getDetails().getErrorUri());
-        }
-      } else {
-        System.err.println(e.getMessage());
-      }
-    }
-  }
+ * static void requestAccessToken() throws IOException {
+ * try {
+ * GoogleTokenResponse response =
+ * new GoogleAuthorizationCodeTokenRequest(new NetHttpTransport(), new GsonFactory(),
+ * "812741506391.apps.googleusercontent.com", "{client_secret}",
+ * "4/P7q7W91a-oMsCeLvIaQm6bTrgtp7", "https://oauth2-login-demo.appspot.com/code")
+ * .execute();
+ * System.out.println("Access token: " + response.getAccessToken());
+ * } catch (TokenResponseException e) {
+ * if (e.getDetails() != null) {
+ * System.err.println("Error: " + e.getDetails().getError());
+ * if (e.getDetails().getErrorDescription() != null) {
+ * System.err.println(e.getDetails().getErrorDescription());
+ * }
+ * if (e.getDetails().getErrorUri() != null) {
+ * System.err.println(e.getDetails().getErrorUri());
+ * }
+ * } else {
+ * System.err.println(e.getMessage());
+ * }
+ * }
+ * }
  * </pre>
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @since 1.7
  * @author Yaniv Inbar
@@ -85,12 +78,23 @@ public class GoogleAuthorizationCodeTokenRequest extends AuthorizationCodeTokenR
    * @param clientSecret client secret
    * @param code authorization code generated by the authorization server
    * @param redirectUri redirect URL parameter matching the redirect URL parameter in the
-   *        authorization request (see {@link #setRedirectUri(String)}
+   *     authorization request (see {@link #setRedirectUri(String)}
    */
-  public GoogleAuthorizationCodeTokenRequest(HttpTransport transport, JsonFactory jsonFactory,
-      String clientId, String clientSecret, String code, String redirectUri) {
-    this(transport, jsonFactory, GoogleOAuthConstants.TOKEN_SERVER_URL, clientId, clientSecret,
-        code, redirectUri);
+  public GoogleAuthorizationCodeTokenRequest(
+      HttpTransport transport,
+      JsonFactory jsonFactory,
+      String clientId,
+      String clientSecret,
+      String code,
+      String redirectUri) {
+    this(
+        transport,
+        jsonFactory,
+        GoogleOAuthConstants.TOKEN_SERVER_URL,
+        clientId,
+        clientSecret,
+        code,
+        redirectUri);
   }
 
   /**
@@ -101,12 +105,16 @@ public GoogleAuthorizationCodeTokenRequest(HttpTransport transport, JsonFactory
    * @param clientSecret client secret
    * @param code authorization code generated by the authorization server
    * @param redirectUri redirect URL parameter matching the redirect URL parameter in the
-   *        authorization request (see {@link #setRedirectUri(String)}
-   *
+   *     authorization request (see {@link #setRedirectUri(String)}
    * @since 1.12
    */
-  public GoogleAuthorizationCodeTokenRequest(HttpTransport transport, JsonFactory jsonFactory,
-      String tokenServerEncodedUrl, String clientId, String clientSecret, String code,
+  public GoogleAuthorizationCodeTokenRequest(
+      HttpTransport transport,
+      JsonFactory jsonFactory,
+      String tokenServerEncodedUrl,
+      String clientId,
+      String clientSecret,
+      String code,
       String redirectUri) {
     super(transport, jsonFactory, new GenericUrl(tokenServerEncodedUrl), code);
     setClientAuthentication(new ClientParametersAuthentication(clientId, clientSecret));
@@ -138,8 +146,8 @@ public GoogleAuthorizationCodeTokenRequest setGrantType(String grantType) {
   public GoogleAuthorizationCodeTokenRequest setClientAuthentication(
       HttpExecuteInterceptor clientAuthentication) {
     Preconditions.checkNotNull(clientAuthentication);
-    return (GoogleAuthorizationCodeTokenRequest) super.setClientAuthentication(
-        clientAuthentication);
+    return (GoogleAuthorizationCodeTokenRequest)
+        super.setClientAuthentication(clientAuthentication);
   }
 
   @Override
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.java
index a7da93a9c..8ba70afce 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -17,7 +17,6 @@
 import com.google.api.client.auth.oauth2.BrowserClientRequestUrl;
 import com.google.api.client.util.Key;
 import com.google.api.client.util.Preconditions;
-
 import java.util.Collection;
 
 /**
@@ -27,27 +26,21 @@
  * specified in <a href="https://developers.google.com/accounts/docs/OAuth2UserAgent">Using OAuth
  * 2.0 for Client-side Applications</a>.
  *
- * <p>
- * The default for {@link #getResponseTypes()} is {@code "token"}.
- * </p>
+ * <p>The default for {@link #getResponseTypes()} is {@code "token"}.
  *
- * <p>
- * Sample usage for a web application:
- * </p>
+ * <p>Sample usage for a web application:
  *
  * <pre>
-  public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
-    String url = new GoogleBrowserClientRequestUrl("812741506391.apps.googleusercontent.com",
-        "https://oauth2-login-demo.appspot.com/oauthcallback", Arrays.asList(
-            "https://www.googleapis.com/auth/userinfo.email",
-            "https://www.googleapis.com/auth/userinfo.profile")).setState("/profile").build();
-    response.sendRedirect(url);
-  }
+ * public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException {
+ * String url = new GoogleBrowserClientRequestUrl("812741506391.apps.googleusercontent.com",
+ * "https://oauth2-login-demo.appspot.com/oauthcallback", Arrays.asList(
+ * "https://www.googleapis.com/auth/userinfo.email",
+ * "https://www.googleapis.com/auth/userinfo.profile")).setState("/profile").build();
+ * response.sendRedirect(url);
+ * }
  * </pre>
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @since 1.7
  * @author Yaniv Inbar
@@ -64,9 +57,8 @@ public class GoogleBrowserClientRequestUrl extends BrowserClientRequestUrl {
   /**
    * @param clientId client identifier
    * @param redirectUri URI that the authorization server directs the resource owner's user-agent
-   *        back to the client after a successful authorization grant
+   *     back to the client after a successful authorization grant
    * @param scopes scopes (see {@link #setScopes(Collection)})
-   *
    * @since 1.15
    */
   public GoogleBrowserClientRequestUrl(
@@ -78,12 +70,11 @@ public GoogleBrowserClientRequestUrl(
 
   /**
    * @param clientSecrets OAuth 2.0 client secrets JSON model as specified in <a
-   *        href="http://code.google.com/p/google-api-python-client/wiki/ClientSecrets">
-   *        client_secrets.json file format</a>
+   *     href="https://developers.google.com/api-client-library/python/guide/aaa_client_secrets">
+   *     client_secrets.json file format</a>
    * @param redirectUri URI that the authorization server directs the resource owner's user-agent
-   *        back to the client after a successful authorization grant
+   *     back to the client after a successful authorization grant
    * @param scopes scopes (see {@link #setScopes(Collection)})
-   *
    * @since 1.15
    */
   public GoogleBrowserClientRequestUrl(
@@ -92,9 +83,9 @@ public GoogleBrowserClientRequestUrl(
   }
 
   /**
-   * Returns the approval prompt behavior ({@code "auto"} to request auto-approval or
-   * {@code "force"} to force the approval UI to show) or {@code null} for the default behavior of
-   * {@code "auto"}.
+   * Returns the approval prompt behavior ({@code "auto"} to request auto-approval or {@code
+   * "force"} to force the approval UI to show) or {@code null} for the default behavior of {@code
+   * "auto"}.
    */
   public final String getApprovalPrompt() {
     return approvalPrompt;
@@ -104,10 +95,8 @@ public final String getApprovalPrompt() {
    * Sets the approval prompt behavior ({@code "auto"} to request auto-approval or {@code "force"}
    * to force the approval UI to show) or {@code null} for the default behavior of {@code "auto"}.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public GoogleBrowserClientRequestUrl setApprovalPrompt(String approvalPrompt) {
     this.approvalPrompt = approvalPrompt;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecrets.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecrets.java
index 894cb9ca3..cc82cc35f 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecrets.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecrets.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -18,27 +18,27 @@
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.util.Key;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.io.Reader;
 import java.util.List;
 
 /**
  * OAuth 2.0 client secrets JSON model as specified in <a
- * href="http://code.google.com/p/google-api-python-client/wiki/ClientSecrets">client_secrets.json
+ * href="https://developers.google.com/api-client-library/python/guide/aaa_client_secrets">client_secrets.json
  * file format</a>.
  *
- * <p>
- * Sample usage:
- * </p>
+ * <p>Sample usage:
  *
  * <pre>
-  static GoogleClientSecrets loadClientSecretsResource(JsonFactory jsonFactory) throws IOException {
-    return GoogleClientSecrets.load(
-        jsonFactory,
-        new InputStreamReader(
-            SampleClass.class.getResourceAsStream("/client_secrets.json"), "UTF-8"));
-  }
+ * static GoogleClientSecrets loadClientSecretsResource(JsonFactory jsonFactory)
+ *   throws IOException {
+ *     return GoogleClientSecrets.load(
+ *       jsonFactory,
+ *       new InputStreamReader(
+ *         SampleClass.class.getResourceAsStream("/client_secrets.json"), "UTF-8"
+ *       )
+ *     );
+ * }
  * </pre>
  *
  * @since 1.7
@@ -47,12 +47,10 @@ static GoogleClientSecrets loadClientSecretsResource(JsonFactory jsonFactory) th
 public final class GoogleClientSecrets extends GenericJson {
 
   /** Details for installed applications. */
-  @Key
-  private Details installed;
+  @Key private Details installed;
 
   /** Details for web applications. */
-  @Key
-  private Details web;
+  @Key private Details web;
 
   /** Returns the details for installed applications. */
   public Details getInstalled() {
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java
index b95f43705..45f10da08 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -41,7 +41,6 @@
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.SecurityUtils;
 import com.google.api.client.util.store.DataStoreFactory;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileReader;
@@ -63,108 +62,97 @@
  * resources using an access token, as well as optionally refreshing the access token when it
  * expires using a refresh token.
  *
- * <p>
- * There are three modes supported: access token only, refresh token flow, and service account flow
- * (with or without impersonating a user).
- * </p>
+ * <p>There are three modes supported: access token only, refresh token flow, and service account
+ * flow (with or without impersonating a user).
  *
- * <p>
- * If all you have is an access token, you simply pass the {@link TokenResponse} to the credential
- * using {@link Builder#setFromTokenResponse(TokenResponse)}. Google credential uses
+ * <p>If all you have is an access token, you simply pass the {@link TokenResponse} to the
+ * credential using {@link Builder#setFromTokenResponse(TokenResponse)}. Google credential uses
  * {@link BearerToken#authorizationHeaderAccessMethod()} as the access method. Sample usage:
- * </p>
  *
  * <pre>
-  public static GoogleCredential createCredentialWithAccessTokenOnly(TokenResponse tokenResponse) {
-    return new GoogleCredential().setFromTokenResponse(tokenResponse);
-  }
+ * public static GoogleCredential createCredentialWithAccessTokenOnly(TokenResponse tokenResponse) {
+ * return new GoogleCredential().setFromTokenResponse(tokenResponse);
+ * }
  * </pre>
  *
- * <p>
- * If you have a refresh token, it is similar to the case of access token only, but you additionally
- * need to pass the credential the client secrets using
- * {@link Builder#setClientSecrets(GoogleClientSecrets)} or
- * {@link Builder#setClientSecrets(String, String)}. Google credential uses
- * {@link GoogleOAuthConstants#TOKEN_SERVER_URL} as the token server URL, and
- * {@link ClientParametersAuthentication} with the client ID and secret as the client
- * authentication. Sample usage:
- * </p>
+ * <p>If you have a refresh token, it is similar to the case of access token only, but you
+ * additionally need to pass the credential the client secrets using {@link
+ * Builder#setClientSecrets(GoogleClientSecrets)} or {@link Builder#setClientSecrets(String,
+ * String)}. Google credential uses {@link GoogleOAuthConstants#TOKEN_SERVER_URL} as the token
+ * server URL, and {@link ClientParametersAuthentication} with the client ID and secret as the
+ * client authentication. Sample usage:
  *
  * <pre>
-  public static GoogleCredential createCredentialWithRefreshToken(HttpTransport transport,
-      JsonFactory jsonFactory, GoogleClientSecrets clientSecrets, TokenResponse tokenResponse) {
-    return new GoogleCredential.Builder().setTransport(transport)
-        .setJsonFactory(jsonFactory)
-        .setClientSecrets(clientSecrets)
-        .build()
-        .setFromTokenResponse(tokenResponse);
-  }
+ * public static GoogleCredential createCredentialWithRefreshToken(HttpTransport transport,
+ * JsonFactory jsonFactory, GoogleClientSecrets clientSecrets, TokenResponse tokenResponse) {
+ * return new GoogleCredential.Builder().setTransport(transport)
+ * .setJsonFactory(jsonFactory)
+ * .setClientSecrets(clientSecrets)
+ * .build()
+ * .setFromTokenResponse(tokenResponse);
+ * }
  * </pre>
  *
- * <p>
- * The <a href="https://developers.google.com/accounts/docs/OAuth2ServiceAccount">service account
+ * <p>The <a href="https://developers.google.com/accounts/docs/OAuth2ServiceAccount">service account
  * flow</a> is used when you want to access data owned by your client application. You download the
- * private key in a {@code .p12} file from the Google APIs Console. Use
- * {@link Builder#setServiceAccountId(String)},
- * {@link Builder#setServiceAccountPrivateKeyFromP12File(File)}, and
- * {@link Builder#setServiceAccountScopes(Collection)}. Sample usage:
- * </p>
+ * private key in a {@code .p12} file from the Google APIs Console. Use {@link
+ * Builder#setServiceAccountId(String)}, {@link
+ * Builder#setServiceAccountPrivateKeyFromP12File(File)}, and {@link
+ * Builder#setServiceAccountScopes(Collection)}. Sample usage:
  *
  * <pre>
-  public static GoogleCredential createCredentialForServiceAccount(
-      HttpTransport transport,
-      JsonFactory jsonFactory,
-      String serviceAccountId,
-      Collection&lt;String&gt; serviceAccountScopes,
-      File p12File) throws GeneralSecurityException, IOException {
-    return new GoogleCredential.Builder().setTransport(transport)
-        .setJsonFactory(jsonFactory)
-        .setServiceAccountId(serviceAccountId)
-        .setServiceAccountScopes(serviceAccountScopes)
-        .setServiceAccountPrivateKeyFromP12File(p12File)
-        .build();
-  }
+ * public static GoogleCredential createCredentialForServiceAccount(
+ * HttpTransport transport,
+ * JsonFactory jsonFactory,
+ * String serviceAccountId,
+ * Collection&lt;String&gt; serviceAccountScopes,
+ * File p12File) throws GeneralSecurityException, IOException {
+ * return new GoogleCredential.Builder().setTransport(transport)
+ * .setJsonFactory(jsonFactory)
+ * .setServiceAccountId(serviceAccountId)
+ * .setServiceAccountScopes(serviceAccountScopes)
+ * .setServiceAccountPrivateKeyFromP12File(p12File)
+ * .build();
+ * }
  * </pre>
  *
- * <p>
- * You can also use the service account flow to impersonate a user in a domain that you own. This is
- * very similar to the service account flow above, but you additionally call
- * {@link Builder#setServiceAccountUser(String)}. Sample usage:
- * </p>
+ * <p>You can also use the service account flow to impersonate a user in a domain that you own. This
+ * is very similar to the service account flow above, but you additionally call {@link
+ * Builder#setServiceAccountUser(String)}. Sample usage:
  *
  * <pre>
-  public static GoogleCredential createCredentialForServiceAccountImpersonateUser(
-      HttpTransport transport,
-      JsonFactory jsonFactory,
-      String serviceAccountId,
-      Collection&lt;String&gt; serviceAccountScopes,
-      File p12File,
-      String serviceAccountUser) throws GeneralSecurityException, IOException {
-    return new GoogleCredential.Builder().setTransport(transport)
-        .setJsonFactory(jsonFactory)
-        .setServiceAccountId(serviceAccountId)
-        .setServiceAccountScopes(serviceAccountScopes)
-        .setServiceAccountPrivateKeyFromP12File(p12File)
-        .setServiceAccountUser(serviceAccountUser)
-        .build();
-  }
+ * public static GoogleCredential createCredentialForServiceAccountImpersonateUser(
+ * HttpTransport transport,
+ * JsonFactory jsonFactory,
+ * String serviceAccountId,
+ * Collection&lt;String&gt; serviceAccountScopes,
+ * File p12File,
+ * String serviceAccountUser) throws GeneralSecurityException, IOException {
+ * return new GoogleCredential.Builder().setTransport(transport)
+ * .setJsonFactory(jsonFactory)
+ * .setServiceAccountId(serviceAccountId)
+ * .setServiceAccountScopes(serviceAccountScopes)
+ * .setServiceAccountPrivateKeyFromP12File(p12File)
+ * .setServiceAccountUser(serviceAccountUser)
+ * .build();
+ * }
  * </pre>
  *
- * <p>
- * If you need to persist the access token in a data store, use {@link DataStoreFactory} and
- * {@link Builder#addRefreshListener(CredentialRefreshListener)} with
- * {@link DataStoreCredentialRefreshListener}.
- * </p>
+ * <p>If you need to persist the access token in a data store, use {@link DataStoreFactory} and
+ * {@link Builder#addRefreshListener(CredentialRefreshListener)} with {@link
+ * DataStoreCredentialRefreshListener}.
  *
- * <p>
- * If you have a custom request initializer, request execute interceptor, or unsuccessful response
- * handler, take a look at the sample usage for {@link HttpExecuteInterceptor} and
- * {@link HttpUnsuccessfulResponseHandler}, which are interfaces that this class also implements.
- * </p>
+ * <p>If you have a custom request initializer, request execute interceptor, or unsuccessful
+ * response handler, take a look at the sample usage for {@link HttpExecuteInterceptor} and {@link
+ * HttpUnsuccessfulResponseHandler}, which are interfaces that this class also implements.
  *
  * @since 1.7
  * @author Yaniv Inbar
+ * @deprecated Please use <a href="https://github.com/googleapis/google-auth-library-java">
+ *     google-auth-library</a> for handling Application Default Credentials and other non-OAuth2
+ *     based authentication.
  */
+@Deprecated
 public class GoogleCredential extends Credential {
 
   static final String USER_FILE_TYPE = "authorized_user";
@@ -175,13 +163,13 @@ public class GoogleCredential extends Credential {
       new DefaultCredentialProvider();
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Returns the Application Default Credentials.
    *
    * <p>Returns the Application Default Credentials which are credentials that identify and
    * authorize the whole application. This is the built-in service account if running on Google
    * Compute Engine or the credentials file from the path in the environment variable
-   * GOOGLE_APPLICATION_CREDENTIALS.</p>
+   * GOOGLE_APPLICATION_CREDENTIALS.
    *
    * @return the credential instance.
    * @throws IOException if the credential cannot be created in the current environment.
@@ -192,13 +180,13 @@ public static GoogleCredential getApplicationDefault() throws IOException {
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Returns the Application Default Credentials.
    *
    * <p>Returns the Application Default Credentials which are credentials that identify and
    * authorize the whole application. This is the built-in service account if running on Google
    * Compute Engine or the credentials file from the path in the environment variable
-   * GOOGLE_APPLICATION_CREDENTIALS.</p>
+   * GOOGLE_APPLICATION_CREDENTIALS.
    *
    * @param transport the transport for Http calls.
    * @param jsonFactory the factory for Json parsing and formatting.
@@ -214,7 +202,7 @@ public static GoogleCredential getApplicationDefault(
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Return a credential defined by a Json file.
    *
    * @param credentialStream the stream with the credential definition.
@@ -223,14 +211,11 @@ public static GoogleCredential getApplicationDefault(
    */
   @Beta
   public static GoogleCredential fromStream(InputStream credentialStream) throws IOException {
-     return fromStream(
-        credentialStream,
-        Utils.getDefaultTransport(),
-        Utils.getDefaultJsonFactory());
+    return fromStream(credentialStream, Utils.getDefaultTransport(), Utils.getDefaultJsonFactory());
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Return a credential defined by a Json file.
    *
    * @param credentialStream the stream with the credential definition.
@@ -240,15 +225,16 @@ public static GoogleCredential fromStream(InputStream credentialStream) throws I
    * @throws IOException if the credential cannot be created from the stream.
    */
   @Beta
-  public static GoogleCredential fromStream(InputStream credentialStream, HttpTransport transport,
-      JsonFactory jsonFactory) throws IOException {
+  public static GoogleCredential fromStream(
+      InputStream credentialStream, HttpTransport transport, JsonFactory jsonFactory)
+      throws IOException {
     Preconditions.checkNotNull(credentialStream);
     Preconditions.checkNotNull(transport);
     Preconditions.checkNotNull(jsonFactory);
 
     JsonObjectParser parser = new JsonObjectParser(jsonFactory);
-    GenericJson fileContents = parser.parseAndClose(
-        credentialStream, OAuth2Utils.UTF_8, GenericJson.class);
+    GenericJson fileContents =
+        parser.parseAndClose(credentialStream, OAuth2Utils.UTF_8, GenericJson.class);
     String fileType = (String) fileContents.get("type");
     if (fileType == null) {
       throw new IOException("Error reading credentials from stream, 'type' field not specified.");
@@ -259,10 +245,11 @@ public static GoogleCredential fromStream(InputStream credentialStream, HttpTran
     if (SERVICE_ACCOUNT_FILE_TYPE.equals(fileType)) {
       return fromStreamServiceAccount(fileContents, transport, jsonFactory);
     }
-    throw new IOException(String.format(
-        "Error reading credentials from stream, 'type' value '%s' not recognized."
-            + " Expecting '%s' or '%s'.",
-        fileType, USER_FILE_TYPE, SERVICE_ACCOUNT_FILE_TYPE));
+    throw new IOException(
+        String.format(
+            "Error reading credentials from stream, 'type' value '%s' not recognized."
+                + " Expecting '%s' or '%s'.",
+            fileType, USER_FILE_TYPE, SERVICE_ACCOUNT_FILE_TYPE));
   }
 
   /**
@@ -278,8 +265,8 @@ public static GoogleCredential fromStream(InputStream credentialStream, HttpTran
   private String serviceAccountProjectId;
 
   /**
-   * Collection of OAuth scopes to use with the service account flow or {@code null} if not
-   * using the service account flow.
+   * Collection of OAuth scopes to use with the service account flow or {@code null} if not using
+   * the service account flow.
    */
   private Collection<String> serviceAccountScopes;
 
@@ -290,8 +277,8 @@ public static GoogleCredential fromStream(InputStream credentialStream, HttpTran
   private PrivateKey serviceAccountPrivateKey;
 
   /**
-   * ID of private key to use with the service account flow or {@code null} if not using the
-   * service account flow.
+   * ID of private key to use with the service account flow or {@code null} if not using the service
+   * account flow.
    */
   private String serviceAccountPrivateKeyId;
 
@@ -304,9 +291,7 @@ public static GoogleCredential fromStream(InputStream credentialStream, HttpTran
   /**
    * Constructor with the ability to access protected resources, but not refresh tokens.
    *
-   * <p>
-   * To use with the ability to refresh tokens, use {@link Builder}.
-   * </p>
+   * <p>To use with the ability to refresh tokens, use {@link Builder}.
    */
   public GoogleCredential() {
     this(new Builder());
@@ -314,14 +299,15 @@ public GoogleCredential() {
 
   /**
    * @param builder Google credential builder
-   *
    * @since 1.14
    */
   protected GoogleCredential(Builder builder) {
     super(builder);
     if (builder.serviceAccountPrivateKey == null) {
-      Preconditions.checkArgument(builder.serviceAccountId == null
-          && builder.serviceAccountScopes == null && builder.serviceAccountUser == null);
+      Preconditions.checkArgument(
+          builder.serviceAccountId == null
+              && builder.serviceAccountScopes == null
+              && builder.serviceAccountUser == null);
     } else {
       serviceAccountId = Preconditions.checkNotNull(builder.serviceAccountId);
       serviceAccountProjectId = builder.serviceAccountProjectId;
@@ -385,11 +371,15 @@ protected TokenResponse executeRefreshToken() throws IOException {
     payload.setSubject(serviceAccountUser);
     payload.put("scope", Joiner.on(' ').join(serviceAccountScopes));
     try {
-      String assertion = JsonWebSignature.signUsingRsaSha256(
-          serviceAccountPrivateKey, getJsonFactory(), header, payload);
-      TokenRequest request = new TokenRequest(
-          getTransport(), getJsonFactory(), new GenericUrl(getTokenServerEncodedUrl()),
-          "urn:ietf:params:oauth:grant-type:jwt-bearer");
+      String assertion =
+          JsonWebSignature.signUsingRsaSha256(
+              serviceAccountPrivateKey, getJsonFactory(), header, payload);
+      TokenRequest request =
+          new TokenRequest(
+              getTransport(),
+              getJsonFactory(),
+              new GenericUrl(getTokenServerEncodedUrl()),
+              "urn:ietf:params:oauth:grant-type:jwt-bearer");
       request.put("assertion", assertion);
       return request.execute();
     } catch (GeneralSecurityException exception) {
@@ -417,16 +407,16 @@ public final String getServiceAccountProjectId() {
   }
 
   /**
-   * Returns a collection of OAuth scopes to use with the service account flow or {@code null}
-   * if not using the service account flow.
+   * Returns a collection of OAuth scopes to use with the service account flow or {@code null} if
+   * not using the service account flow.
    */
   public final Collection<String> getServiceAccountScopes() {
     return serviceAccountScopes;
   }
 
   /**
-   * Returns the space-separated OAuth scopes to use with the service account flow or
-   * {@code null} if not using the service account flow.
+   * Returns the space-separated OAuth scopes to use with the service account flow or {@code null}
+   * if not using the service account flow.
    *
    * @since 1.15
    */
@@ -435,17 +425,17 @@ public final String getServiceAccountScopesAsString() {
   }
 
   /**
-   * Returns the private key to use with the service account flow or {@code null} if not using
-   * the service account flow.
+   * Returns the private key to use with the service account flow or {@code null} if not using the
+   * service account flow.
    */
   public final PrivateKey getServiceAccountPrivateKey() {
     return serviceAccountPrivateKey;
   }
 
   /**
-   * {@link Beta} <br/>
-   * Returns the ID of the private key to use with the service account flow or {@code null} if
-   * not using the service account flow.
+   * {@link Beta} <br>
+   * Returns the ID of the private key to use with the service account flow or {@code null} if not
+   * using the service account flow.
    */
   @Beta
   public final String getServiceAccountPrivateKeyId() {
@@ -461,9 +451,9 @@ public final String getServiceAccountUser() {
   }
 
   /**
-   * {@link Beta} <br/>
-   * Indicates whether the credential requires scopes to be specified by calling createScoped
-   * before use.
+   * {@link Beta} <br>
+   * Indicates whether the credential requires scopes to be specified by calling createScoped before
+   * use.
    */
   @Beta
   public boolean createScopedRequired() {
@@ -474,7 +464,7 @@ public boolean createScopedRequired() {
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * For credentials that require scopes, creates a copy of the credential with the specified
    * scopes.
    */
@@ -483,35 +473,57 @@ public GoogleCredential createScoped(Collection<String> scopes) {
     if (serviceAccountPrivateKey == null) {
       return this;
     }
-    return new GoogleCredential.Builder()
-        .setServiceAccountPrivateKey(serviceAccountPrivateKey)
-        .setServiceAccountPrivateKeyId(serviceAccountPrivateKeyId)
-        .setServiceAccountId(serviceAccountId)
-        .setServiceAccountProjectId(serviceAccountProjectId)
-        .setServiceAccountUser(serviceAccountUser)
-        .setServiceAccountScopes(scopes)
-        .setTokenServerEncodedUrl(getTokenServerEncodedUrl())
-        .setTransport(getTransport())
-        .setJsonFactory(getJsonFactory())
-        .setClock(getClock())
-        .build();
+    return toBuilder().setServiceAccountScopes(scopes).build();
+  }
+
+  /**
+   * {@link Beta} <br>
+   * For service accounts that need to delegate to a specific user, create a copy of the credential
+   * with the specified user.
+   */
+  @Beta
+  public GoogleCredential createDelegated(String user) {
+    if (serviceAccountPrivateKey == null) {
+      return this;
+    }
+    return toBuilder().setServiceAccountUser(user).build();
+  }
+
+  /**
+   * {@link Beta} <br>
+   * Create a builder from this credential.
+   */
+  @Beta
+  public Builder toBuilder() {
+    Builder builder =
+        new GoogleCredential.Builder()
+            .setServiceAccountPrivateKey(serviceAccountPrivateKey)
+            .setServiceAccountPrivateKeyId(serviceAccountPrivateKeyId)
+            .setServiceAccountId(serviceAccountId)
+            .setServiceAccountProjectId(serviceAccountProjectId)
+            .setServiceAccountUser(serviceAccountUser)
+            .setServiceAccountScopes(serviceAccountScopes)
+            .setTokenServerEncodedUrl(getTokenServerEncodedUrl())
+            .setTransport(getTransport())
+            .setJsonFactory(getJsonFactory())
+            .setClock(getClock());
+
+    builder.setClientAuthentication(getClientAuthentication());
+
+    return builder;
   }
 
   /**
    * Google credential builder.
    *
-   * <p>
-   * Implementation is not thread-safe.
-   * </p>
+   * <p>Implementation is not thread-safe.
    */
   public static class Builder extends Credential.Builder {
 
     /** Service account ID (typically an e-mail address) or {@code null} for none. */
     String serviceAccountId;
 
-    /**
-     * Collection of OAuth scopes to use with the service account flow or {@code null} for none.
-     */
+    /** Collection of OAuth scopes to use with the service account flow or {@code null} for none. */
     Collection<String> serviceAccountScopes;
 
     /** Private key to use with the service account flow or {@code null} for none. */
@@ -520,7 +532,7 @@ public static class Builder extends Credential.Builder {
     /** Id of the private key to use with the service account flow or {@code null} for none. */
     String serviceAccountPrivateKeyId;
 
-    /** Project Id associated with the Service Account */
+    /** Project ID associated with the Service Account. */
     String serviceAccountProjectId;
 
     /**
@@ -549,9 +561,7 @@ public Builder setJsonFactory(JsonFactory jsonFactory) {
       return (Builder) super.setJsonFactory(jsonFactory);
     }
 
-    /**
-     * @since 1.9
-     */
+    /** @since 1.9 */
     @Override
     public Builder setClock(Clock clock) {
       return (Builder) super.setClock(clock);
@@ -560,10 +570,8 @@ public Builder setClock(Clock clock) {
     /**
      * Sets the client identifier and secret.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setClientSecrets(String clientId, String clientSecret) {
       setClientAuthentication(new ClientParametersAuthentication(clientId, clientSecret));
@@ -573,10 +581,8 @@ public Builder setClientSecrets(String clientId, String clientSecret) {
     /**
      * Sets the client secrets.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setClientSecrets(GoogleClientSecrets clientSecrets) {
       Details details = clientSecrets.getDetails();
@@ -585,9 +591,7 @@ public Builder setClientSecrets(GoogleClientSecrets clientSecrets) {
       return this;
     }
 
-    /**
-     * Returns the service account ID (typically an e-mail address) or {@code null} for none.
-     */
+    /** Returns the service account ID (typically an e-mail address) or {@code null} for none. */
     public final String getServiceAccountId() {
       return serviceAccountId;
     }
@@ -595,19 +599,15 @@ public final String getServiceAccountId() {
     /**
      * Sets the service account ID (typically an e-mail address) or {@code null} for none.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setServiceAccountId(String serviceAccountId) {
       this.serviceAccountId = serviceAccountId;
       return this;
     }
 
-    /**
-     * Returns the service account Project ID or {@code null} for none.
-     */
+    /** Returns the service account Project ID or {@code null} for none. */
     public final String getServiceAccountProjectId() {
       return serviceAccountProjectId;
     }
@@ -615,10 +615,8 @@ public final String getServiceAccountProjectId() {
     /**
      * Sets the service account Project ID or {@code null} for none.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setServiceAccountProjectId(String serviceAccountProjectId) {
       this.serviceAccountProjectId = serviceAccountProjectId;
@@ -626,24 +624,22 @@ public Builder setServiceAccountProjectId(String serviceAccountProjectId) {
     }
 
     /**
-     * Returns a collection of OAuth scopes to use with the service account flow or {@code null}
-     * for none.
+     * Returns a collection of OAuth scopes to use with the service account flow or {@code null} for
+     * none.
      */
     public final Collection<String> getServiceAccountScopes() {
       return serviceAccountScopes;
     }
 
     /**
-     * Sets the space-separated OAuth scopes to use with the service account flow or
-     * {@code null} for none.
+     * Sets the space-separated OAuth scopes to use with the service account flow or {@code null}
+     * for none.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      *
      * @param serviceAccountScopes collection of scopes to be joined by a space separator (or a
-     *        single value containing multiple space-separated scopes)
+     *     single value containing multiple space-separated scopes)
      * @since 1.15
      */
     public Builder setServiceAccountScopes(Collection<String> serviceAccountScopes) {
@@ -651,9 +647,7 @@ public Builder setServiceAccountScopes(Collection<String> serviceAccountScopes)
       return this;
     }
 
-    /**
-     * Returns the private key to use with the service account flow or {@code null} for none.
-     */
+    /** Returns the private key to use with the service account flow or {@code null} for none. */
     public final PrivateKey getServiceAccountPrivateKey() {
       return serviceAccountPrivateKey;
     }
@@ -661,10 +655,8 @@ public final PrivateKey getServiceAccountPrivateKey() {
     /**
      * Sets the private key to use with the service account flow or {@code null} for none.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setServiceAccountPrivateKey(PrivateKey serviceAccountPrivateKey) {
       this.serviceAccountPrivateKey = serviceAccountPrivateKey;
@@ -672,9 +664,9 @@ public Builder setServiceAccountPrivateKey(PrivateKey serviceAccountPrivateKey)
     }
 
     /**
-     * {@link Beta} <br/>
-     * Returns the id of the private key to use with the service account flow or {@code null}
-     * for none.
+     * {@link Beta} <br>
+     * Returns the id of the private key to use with the service account flow or {@code null} for
+     * none.
      */
     @Beta
     public final String getServiceAccountPrivateKeyId() {
@@ -682,14 +674,11 @@ public final String getServiceAccountPrivateKeyId() {
     }
 
     /**
-     * {@link Beta} <br/>
-     * Sets the id of the private key to use with the service account flow or {@code null} for
-     * none.
+     * {@link Beta} <br>
+     * Sets the id of the private key to use with the service account flow or {@code null} for none.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     @Beta
     public Builder setServiceAccountPrivateKeyId(String serviceAccountPrivateKeyId) {
@@ -697,44 +686,58 @@ public Builder setServiceAccountPrivateKeyId(String serviceAccountPrivateKeyId)
       return this;
     }
 
-
     /**
      * Sets the private key to use with the service account flow or {@code null} for none.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      *
-     * @param p12File input stream to the p12 file (closed at the end of this method in a finally
-     *        block)
+     * @param p12File p12 file object
      */
     public Builder setServiceAccountPrivateKeyFromP12File(File p12File)
         throws GeneralSecurityException, IOException {
-      serviceAccountPrivateKey = SecurityUtils.loadPrivateKeyFromKeyStore(
-          SecurityUtils.getPkcs12KeyStore(), new FileInputStream(p12File), "notasecret",
-          "privatekey", "notasecret");
+      setServiceAccountPrivateKeyFromP12File(new FileInputStream(p12File));
+      return this;
+    }
+
+    /**
+     * Sets the private key to use with the service account flow or {@code null} for none.
+     *
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
+     *
+     * @param p12FileInputStream input stream to the p12 file. This file is closed at the end of
+     *     this method in a finally block.
+     */
+    public Builder setServiceAccountPrivateKeyFromP12File(InputStream p12FileInputStream)
+        throws GeneralSecurityException, IOException {
+      serviceAccountPrivateKey =
+          SecurityUtils.loadPrivateKeyFromKeyStore(
+              SecurityUtils.getPkcs12KeyStore(),
+              p12FileInputStream,
+              "notasecret",
+              "privatekey",
+              "notasecret");
       return this;
     }
 
     /**
-     * {@link Beta} <br/>
+     * {@link Beta} <br>
      * Sets the private key to use with the service account flow or {@code null} for none.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      *
      * @param pemFile input stream to the PEM file (closed at the end of this method in a finally
-     *        block)
+     *     block)
      * @since 1.13
      */
     @Beta
     public Builder setServiceAccountPrivateKeyFromPemFile(File pemFile)
         throws GeneralSecurityException, IOException {
-      byte[] bytes = PemReader.readFirstSectionAndClose(new FileReader(pemFile), "PRIVATE KEY")
-          .getBase64DecodedBytes();
+      byte[] bytes =
+          PemReader.readFirstSectionAndClose(new FileReader(pemFile), "PRIVATE KEY")
+              .getBase64DecodedBytes();
       serviceAccountPrivateKey =
           SecurityUtils.getRsaKeyFactory().generatePrivate(new PKCS8EncodedKeySpec(bytes));
       return this;
@@ -752,10 +755,8 @@ public final String getServiceAccountUser() {
      * Sets the email address of the user the application is trying to impersonate in the service
      * account flow or {@code null} for none.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setServiceAccountUser(String serviceAccountUser) {
       this.serviceAccountUser = serviceAccountUser;
@@ -794,21 +795,24 @@ public Builder setClientAuthentication(HttpExecuteInterceptor clientAuthenticati
   }
 
   @Beta
-  private static GoogleCredential fromStreamUser(GenericJson fileContents, HttpTransport transport,
-      JsonFactory jsonFactory) throws IOException {
+  private static GoogleCredential fromStreamUser(
+      GenericJson fileContents, HttpTransport transport, JsonFactory jsonFactory)
+      throws IOException {
     String clientId = (String) fileContents.get("client_id");
     String clientSecret = (String) fileContents.get("client_secret");
     String refreshToken = (String) fileContents.get("refresh_token");
     if (clientId == null || clientSecret == null || refreshToken == null) {
-      throw new IOException("Error reading user credential from stream, "
-          + " expecting 'client_id', 'client_secret' and 'refresh_token'.");
+      throw new IOException(
+          "Error reading user credential from stream, "
+              + " expecting 'client_id', 'client_secret' and 'refresh_token'.");
     }
 
-    GoogleCredential credential = new GoogleCredential.Builder()
-        .setClientSecrets(clientId, clientSecret)
-        .setTransport(transport)
-        .setJsonFactory(jsonFactory)
-        .build();
+    GoogleCredential credential =
+        new GoogleCredential.Builder()
+            .setClientSecrets(clientId, clientSecret)
+            .setTransport(transport)
+            .setJsonFactory(jsonFactory)
+            .build();
     credential.setRefreshToken(refreshToken);
 
     // Do a refresh so we can fail early rather than return an unusable credential
@@ -817,29 +821,31 @@ private static GoogleCredential fromStreamUser(GenericJson fileContents, HttpTra
   }
 
   @Beta
-  private static GoogleCredential fromStreamServiceAccount(GenericJson fileContents,
-      HttpTransport transport, JsonFactory jsonFactory) throws IOException {
+  private static GoogleCredential fromStreamServiceAccount(
+      GenericJson fileContents, HttpTransport transport, JsonFactory jsonFactory)
+      throws IOException {
     String clientId = (String) fileContents.get("client_id");
     String clientEmail = (String) fileContents.get("client_email");
     String privateKeyPem = (String) fileContents.get("private_key");
     String privateKeyId = (String) fileContents.get("private_key_id");
-    if (clientId == null || clientEmail == null || privateKeyPem == null
-        || privateKeyId == null) {
-      throw new IOException("Error reading service account credential from stream, "
-          + "expecting  'client_id', 'client_email', 'private_key' and 'private_key_id'.");
+    if (clientId == null || clientEmail == null || privateKeyPem == null || privateKeyId == null) {
+      throw new IOException(
+          "Error reading service account credential from stream, "
+              + "expecting  'client_id', 'client_email', 'private_key' and 'private_key_id'.");
     }
 
     PrivateKey privateKey = privateKeyFromPkcs8(privateKeyPem);
 
     Collection<String> emptyScopes = Collections.emptyList();
 
-    Builder credentialBuilder = new GoogleCredential.Builder()
-        .setTransport(transport)
-        .setJsonFactory(jsonFactory)
-        .setServiceAccountId(clientEmail)
-        .setServiceAccountScopes(emptyScopes)
-        .setServiceAccountPrivateKey(privateKey)
-        .setServiceAccountPrivateKeyId(privateKeyId);
+    Builder credentialBuilder =
+        new GoogleCredential.Builder()
+            .setTransport(transport)
+            .setJsonFactory(jsonFactory)
+            .setServiceAccountId(clientEmail)
+            .setServiceAccountScopes(emptyScopes)
+            .setServiceAccountPrivateKey(privateKey)
+            .setServiceAccountPrivateKeyId(privateKeyId);
     String tokenUri = (String) fileContents.get("token_uri");
     if (tokenUri != null) {
       credentialBuilder.setTokenServerEncodedUrl(tokenUri);
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java
index 66ffe1155..c2d38d586 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdToken.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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,24 +19,19 @@
 import com.google.api.client.json.webtoken.JsonWebSignature;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Key;
-
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.util.List;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Google ID tokens as specified in <a
  * href="https://developers.google.com/identity/protocols/OpenIDConnect">OpenID Connect</a>.
  *
- * <p>
- * Google ID tokens contain useful information about the authorized end user. Google ID tokens are
- * signed and the signature must be verified using {@link #verify(GoogleIdTokenVerifier)}.
- * </p>
+ * <p>Google ID tokens contain useful information about the authorized end user. Google ID tokens
+ * are signed and the signature must be verified using {@link #verify(GoogleIdTokenVerifier)}.
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @since 1.7
  * @author Yaniv Inbar
@@ -56,7 +51,10 @@ public static GoogleIdToken parse(JsonFactory jsonFactory, String idTokenString)
       throws IOException {
     JsonWebSignature jws =
         JsonWebSignature.parser(jsonFactory).setPayloadClass(Payload.class).parse(idTokenString);
-    return new GoogleIdToken(jws.getHeader(), (Payload) jws.getPayload(), jws.getSignatureBytes(),
+    return new GoogleIdToken(
+        jws.getHeader(),
+        (Payload) jws.getPayload(),
+        jws.getSignatureBytes(),
         jws.getSignedContentBytes());
   }
 
@@ -85,7 +83,7 @@ public Payload getPayload() {
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Google ID token payload.
    */
   @Beta
@@ -99,16 +97,14 @@ public static class Payload extends IdToken.Payload {
     private String email;
 
     /**
-     * {@code true} if the email is verified.
-     * TODO(mwan): change the type of the field to Boolean and the handling in
-     * {@link #getEmailVerified()} accordingly after Google OpenID Connect endpoint fixes the
-     * type of the field in ID Token.
+     * {@code true} if the email is verified. TODO(mwan): change the type of the field to Boolean
+     * and the handling in {@link #getEmailVerified()} accordingly after Google OpenID Connect
+     * endpoint fixes the type of the field in ID Token.
      */
     @Key("email_verified")
     private Object emailVerified;
 
-    public Payload() {
-    }
+    public Payload() {}
 
     /**
      * Returns the obfuscated Google user id or {@code null} for none.
@@ -144,7 +140,7 @@ public String getIssuee() {
      * Sets the client ID of issuee or {@code null} for none.
      *
      * @deprecated (scheduled to be removed in 1.18) Use {@link #setAuthorizedParty(String)}
-     *             instead.
+     *     instead.
      */
     @Deprecated
     public Payload setIssuee(String issuee) {
@@ -171,9 +167,7 @@ public Payload setHostedDomain(String hostedDomain) {
     /**
      * Returns the e-mail address of the user or {@code null} if it was not requested.
      *
-     * <p>
-     * Requires the {@code "https://www.googleapis.com/auth/userinfo.email"} scope.
-     * </p>
+     * <p>Requires the {@code "https://www.googleapis.com/auth/userinfo.email"} scope.
      *
      * @since 1.10
      */
@@ -184,9 +178,8 @@ public String getEmail() {
     /**
      * Sets the e-mail address of the user or {@code null} if it was not requested.
      *
-     * <p>
-     * Used in conjunction with the {@code "https://www.googleapis.com/auth/userinfo.email"} scope.
-     * </p>
+     * <p>Used in conjunction with the {@code "https://www.googleapis.com/auth/userinfo.email"}
+     * scope.
      *
      * @since 1.10
      */
@@ -198,18 +191,13 @@ public Payload setEmail(String email) {
     /**
      * Returns {@code true} if the users e-mail address has been verified by Google.
      *
-     * <p>
-     * Requires the {@code "https://www.googleapis.com/auth/userinfo.email"} scope.
-     * </p>
+     * <p>Requires the {@code "https://www.googleapis.com/auth/userinfo.email"} scope.
      *
      * @since 1.10
-     *
-     * <p>
-     * Upgrade warning: in prior version 1.16 this method accessed {@code "verified_email"}
-     * and returns a boolean, but starting with verison 1.17, it now accesses
-     * {@code "email_verified"} and returns a Boolean. Previously, if this value was not
-     * specified, this method would return {@code false}, but now it returns {@code null}.
-     * </p>
+     *     <p>Upgrade warning: in prior version 1.16 this method accessed {@code "verified_email"}
+     *     and returns a boolean, but starting with verison 1.17, it now accesses {@code
+     *     "email_verified"} and returns a Boolean. Previously, if this value was not specified,
+     *     this method would return {@code false}, but now it returns {@code null}.
      */
     public Boolean getEmailVerified() {
       if (emailVerified == null) {
@@ -225,17 +213,13 @@ public Boolean getEmailVerified() {
     /**
      * Sets whether the users e-mail address has been verified by Google or not.
      *
-     * <p>
-     * Used in conjunction with the {@code "https://www.googleapis.com/auth/userinfo.email"} scope.
-     * </p>
+     * <p>Used in conjunction with the {@code "https://www.googleapis.com/auth/userinfo.email"}
+     * scope.
      *
      * @since 1.10
-     *
-     * <p>
-     * Upgrade warning: in prior version 1.16 this method accessed {@code "verified_email"} and
-     * required a boolean parameter, but starting with verison 1.17, it now accesses
-     * {@code "email_verified"} and requires a Boolean parameter.
-     * </p>
+     *     <p>Upgrade warning: in prior version 1.16 this method accessed {@code "verified_email"}
+     *     and required a boolean parameter, but starting with verison 1.17, it now accesses {@code
+     *     "email_verified"} and requires a Boolean parameter.
      */
     public Payload setEmailVerified(Boolean emailVerified) {
       this.emailVerified = emailVerified;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java
index bd0fb8cb1..f10bdac3f 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifier.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -21,7 +21,6 @@
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Clock;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.PublicKey;
@@ -30,24 +29,22 @@
 import java.util.List;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Thread-safe Google ID token verifier.
  *
- * <p>
- * Call {@link #verify(IdToken)} to verify a ID token. Use the constructor
- * {@link #GoogleIdTokenVerifier(HttpTransport, JsonFactory)} for the typical simpler case if your
+ * <p>Call {@link #verify(IdToken)} to verify a ID token. Use the constructor {@link
+ * #GoogleIdTokenVerifier(HttpTransport, JsonFactory)} for the typical simpler case if your
  * application has only a single instance of {@link GoogleIdTokenVerifier}. Otherwise, ideally you
  * should use {@link #GoogleIdTokenVerifier(GooglePublicKeysManager)} with a shared global instance
  * of the {@link GooglePublicKeysManager} since that way the Google public keys are cached. Sample
  * usage:
- * </p>
  *
  * <pre>
-    GoogleIdTokenVerifier verifier = new GoogleIdTokenVerifier.Builder(transport, jsonFactory)
-        .setAudience(Arrays.asList("myClientId"))
-        .build();
-    ...
-    if (!verifier.verify(googleIdToken)) {...}
+ * GoogleIdTokenVerifier verifier = new GoogleIdTokenVerifier.Builder(transport, jsonFactory)
+ * .setAudience(Arrays.asList("myClientId"))
+ * .build();
+ * ...
+ * if (!verifier.verify(googleIdToken)) {...}
  * </pre>
  *
  * @since 1.7
@@ -68,7 +65,6 @@ public GoogleIdTokenVerifier(HttpTransport transport, JsonFactory jsonFactory) {
 
   /**
    * @param publicKeys Google public keys manager
-   *
    * @since 1.17
    */
   public GoogleIdTokenVerifier(GooglePublicKeysManager publicKeys) {
@@ -77,7 +73,6 @@ public GoogleIdTokenVerifier(GooglePublicKeysManager publicKeys) {
 
   /**
    * @param builder builder
-   *
    * @since 1.14
    */
   protected GoogleIdTokenVerifier(Builder builder) {
@@ -112,8 +107,8 @@ public final JsonFactory getJsonFactory() {
    * Returns the public certificates encoded URL.
    *
    * @since 1.15
-   * @deprecated (scheduled to be removed in 1.18) Use {@link #getPublicKeysManager()} and
-   *             {@link GooglePublicKeysManager#getPublicCertsEncodedUrl()} instead.
+   * @deprecated (scheduled to be removed in 1.18) Use {@link #getPublicKeysManager()} and {@link
+   *     GooglePublicKeysManager#getPublicCertsEncodedUrl()} instead.
    */
   @Deprecated
   public final String getPublicCertsEncodedUrl() {
@@ -123,14 +118,12 @@ public final String getPublicCertsEncodedUrl() {
   /**
    * Returns the public keys.
    *
-   * <p>
-   * Upgrade warning: in prior version 1.16 it may return {@code null} and not throw any exceptions,
-   * but starting with version 1.17 it cannot return {@code null} and may throw
-   * {@link GeneralSecurityException} or {@link IOException}.
-   * </p>
+   * <p>Upgrade warning: in prior version 1.16 it may return {@code null} and not throw any
+   * exceptions, but starting with version 1.17 it cannot return {@code null} and may throw {@link
+   * GeneralSecurityException} or {@link IOException}.
    *
-   * @deprecated (scheduled to be removed in 1.18) Use {@link #getPublicKeysManager()} and
-   *             {@link GooglePublicKeysManager#getPublicKeys()} instead.
+   * @deprecated (scheduled to be removed in 1.18) Use {@link #getPublicKeysManager()} and {@link
+   *     GooglePublicKeysManager#getPublicKeys()} instead.
    */
   @Deprecated
   public final List<PublicKey> getPublicKeys() throws GeneralSecurityException, IOException {
@@ -141,8 +134,8 @@ public final List<PublicKey> getPublicKeys() throws GeneralSecurityException, IO
    * Returns the expiration time in milliseconds to be used with {@link Clock#currentTimeMillis()}
    * or {@code 0} for none.
    *
-   * @deprecated (scheduled to be removed in 1.18) Use {@link #getPublicKeysManager()} and
-   *             {@link GooglePublicKeysManager#getExpirationTimeMilliseconds()} instead.
+   * @deprecated (scheduled to be removed in 1.18) Use {@link #getPublicKeysManager()} and {@link
+   *     GooglePublicKeysManager#getExpirationTimeMilliseconds()} instead.
    */
   @Deprecated
   public final long getExpirationTimeMilliseconds() {
@@ -152,14 +145,14 @@ public final long getExpirationTimeMilliseconds() {
   /**
    * Verifies that the given ID token is valid using the cached public keys.
    *
-   * It verifies:
+   * <p>It verifies:
    *
    * <ul>
-   * <li>The RS256 signature, which uses RSA and SHA-256 based on the public keys downloaded from
-   * the public certificate endpoint.</li>
-   * <li>The current time against the issued at and expiration time (allowing for a 5 minute clock
-   * skew).</li>
-   * <li>The issuer is {@code "accounts.google.com"} or {@code "https://accounts.google.com"}.</li>
+   *   <li>The RS256 signature, which uses RSA and SHA-256 based on the public keys downloaded from
+   *       the public certificate endpoint.
+   *   <li>The current time against the issued at and expiration time (allowing for a 5 minute clock
+   *       skew).
+   *   <li>The issuer is {@code "accounts.google.com"} or {@code "https://accounts.google.com"}.
    * </ul>
    *
    * @param googleIdToken Google ID token
@@ -193,17 +186,15 @@ public GoogleIdToken verify(String idTokenString) throws GeneralSecurityExceptio
   }
 
   /**
-   * Downloads the public keys from the public certificates endpoint at
-   * {@link #getPublicCertsEncodedUrl}.
+   * Downloads the public keys from the public certificates endpoint at {@link
+   * #getPublicCertsEncodedUrl}.
    *
-   * <p>
-   * This method is automatically called if the public keys have not yet been initialized or if the
-   * expiration time is very close, so normally this doesn't need to be called. Only call this
+   * <p>This method is automatically called if the public keys have not yet been initialized or if
+   * the expiration time is very close, so normally this doesn't need to be called. Only call this
    * method explicitly to force the public keys to be updated.
-   * </p>
    *
-   * @deprecated (scheduled to be removed in 1.18) Use {@link #getPublicKeysManager()} and
-   *             {@link GooglePublicKeysManager#refresh()} instead.
+   * @deprecated (scheduled to be removed in 1.18) Use {@link #getPublicKeysManager()} and {@link
+   *     GooglePublicKeysManager#refresh()} instead.
    */
   @Deprecated
   public GoogleIdTokenVerifier loadPublicCerts() throws GeneralSecurityException, IOException {
@@ -212,12 +203,10 @@ public GoogleIdTokenVerifier loadPublicCerts() throws GeneralSecurityException,
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Builder for {@link GoogleIdTokenVerifier}.
    *
-   * <p>
-   * Implementation is not thread-safe.
-   * </p>
+   * <p>Implementation is not thread-safe.
    *
    * @since 1.9
    */
@@ -237,7 +226,6 @@ public Builder(HttpTransport transport, JsonFactory jsonFactory) {
 
     /**
      * @param publicKeys Google public keys manager
-     *
      * @since 1.17
      */
     public Builder(GooglePublicKeysManager publicKeys) {
@@ -274,8 +262,8 @@ public final JsonFactory getJsonFactory() {
      * Returns the public certificates encoded URL.
      *
      * @since 1.15
-     * @deprecated (scheduled to be removed in 1.18) Use {@link #getPublicCerts()} and
-     *             {@link GooglePublicKeysManager#getPublicCertsEncodedUrl()} instead.
+     * @deprecated (scheduled to be removed in 1.18) Use {@link #getPublicCerts()} and {@link
+     *     GooglePublicKeysManager#getPublicCertsEncodedUrl()} instead.
      */
     @Deprecated
     public final String getPublicCertsEncodedUrl() {
@@ -285,25 +273,23 @@ public final String getPublicCertsEncodedUrl() {
     /**
      * Sets the public certificates encoded URL.
      *
-     * <p>
-     * The default value is {@link GoogleOAuthConstants#DEFAULT_PUBLIC_CERTS_ENCODED_URL}.
-     * </p>
+     * <p>The default value is {@link GoogleOAuthConstants#DEFAULT_PUBLIC_CERTS_ENCODED_URL}.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      *
      * @since 1.15
-     * @deprecated (scheduled to be removed in 1.18) Use
-     *             {@link GooglePublicKeysManager.Builder#setPublicCertsEncodedUrl(String)} instead.
+     * @deprecated (scheduled to be removed in 1.18) Use {@link
+     *     GooglePublicKeysManager.Builder#setPublicCertsEncodedUrl(String)} instead.
      */
     @Deprecated
     public Builder setPublicCertsEncodedUrl(String publicKeysEncodedUrl) {
       // TODO(yanivi): make publicKeys field final when this method is removed
-      publicKeys = new GooglePublicKeysManager.Builder(
-          getTransport(), getJsonFactory()).setPublicCertsEncodedUrl(publicKeysEncodedUrl)
-          .setClock(publicKeys.getClock()).build();
+      publicKeys =
+          new GooglePublicKeysManager.Builder(getTransport(), getJsonFactory())
+              .setPublicCertsEncodedUrl(publicKeysEncodedUrl)
+              .setClock(publicKeys.getClock())
+              .build();
       return this;
     }
 
@@ -312,9 +298,7 @@ public Builder setIssuer(String issuer) {
       return (Builder) super.setIssuer(issuer);
     }
 
-    /**
-     * @since 1.21.0
-     */
+    /** @since 1.21.0 */
     @Override
     public Builder setIssuers(Collection<String> issuers) {
       return (Builder) super.setIssuers(issuers);
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java
index 7f4e1e1f2..4d780e8da 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleOAuthConstants.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -31,7 +31,7 @@ public class GoogleOAuthConstants {
   public static final String TOKEN_SERVER_URL = "https://oauth2.googleapis.com/token";
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Encoded URL of Google's public certificates.
    *
    * @since 1.15
@@ -42,11 +42,10 @@ public class GoogleOAuthConstants {
 
   /**
    * Redirect URI to use for an installed application as specified in <a
-   * href="http://code.google.com/apis/accounts/docs/OAuth2InstalledApp.html">Using OAuth 2.0 for
-   * Installed Applications</a>.
+   * href="https://developers.google.com/identity/protocols/OAuth2InstalledApp">Using OAuth 2.0 for
+   * Mobile & Desktop Apps</a>.
    */
   public static final String OOB_REDIRECT_URI = "urn:ietf:wg:oauth:2.0:oob";
 
-  private GoogleOAuthConstants() {
-  }
+  private GoogleOAuthConstants() {}
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java
index 144b4ba4c..ad047cc25 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -41,14 +41,12 @@
 import java.util.regex.Pattern;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Thread-safe Google public keys manager.
  *
- * <p>
- * The public keys are loaded from the public certificates endpoint at
- * {@link #getPublicCertsEncodedUrl} and cached in this instance. Therefore, for maximum efficiency,
+ * <p>The public keys are loaded from the public certificates endpoint at {@link
+ * #getPublicCertsEncodedUrl} and cached in this instance. Therefore, for maximum efficiency,
  * applications should use a single globally-shared instance of the {@link GooglePublicKeysManager}.
- * </p>
  *
  * @since 1.17
  */
@@ -93,9 +91,7 @@ public GooglePublicKeysManager(HttpTransport transport, JsonFactory jsonFactory)
     this(new Builder(transport, jsonFactory));
   }
 
-  /**
-   * @param builder builder
-   */
+  /** @param builder builder */
   protected GooglePublicKeysManager(Builder builder) {
     transport = builder.transport;
     jsonFactory = builder.jsonFactory;
@@ -126,11 +122,9 @@ public final Clock getClock() {
   /**
    * Returns an unmodifiable view of the public keys.
    *
-   * <p>
-   * For efficiency, an in-memory cache of the public keys is used here. If this method is called
+   * <p>For efficiency, an in-memory cache of the public keys is used here. If this method is called
    * for the first time, or the certificates have expired since last time it has been called (or are
    * within 5 minutes of expiring), {@link #refresh()} will be called before returning the value.
-   * </p>
    */
   public final List<PublicKey> getPublicKeys() throws GeneralSecurityException, IOException {
     lock.lock();
@@ -156,11 +150,9 @@ public final long getExpirationTimeMilliseconds() {
   /**
    * Forces a refresh of the public certificates downloaded from {@link #getPublicCertsEncodedUrl}.
    *
-   * <p>
-   * This method is automatically called from {@link #getPublicKeys()} if the public keys have not
-   * yet been initialized or if the expiration time is very close, so normally this doesn't need to
-   * be called. Only call this method to explicitly force the public keys to be updated.
-   * </p>
+   * <p>This method is automatically called from {@link #getPublicKeys()} if the public keys have
+   * not yet been initialized or if the expiration time is very close, so normally this doesn't need
+   * to be called. Only call this method to explicitly force the public keys to be updated.
    */
   public GooglePublicKeysManager refresh() throws GeneralSecurityException, IOException {
     lock.lock();
@@ -168,8 +160,11 @@ public GooglePublicKeysManager refresh() throws GeneralSecurityException, IOExce
       publicKeys = new ArrayList<PublicKey>();
       // HTTP request to public endpoint
       CertificateFactory factory = SecurityUtils.getX509CertificateFactory();
-      HttpResponse certsResponse = transport.createRequestFactory()
-          .buildGetRequest(new GenericUrl(publicCertsEncodedUrl)).execute();
+      HttpResponse certsResponse =
+          transport
+              .createRequestFactory()
+              .buildGetRequest(new GenericUrl(publicCertsEncodedUrl))
+              .execute();
       expirationTimeMilliseconds =
           clock.currentTimeMillis() + getCacheTimeInSec(certsResponse.getHeaders()) * 1000;
       // parse each public key in the JSON response
@@ -184,8 +179,10 @@ public GooglePublicKeysManager refresh() throws GeneralSecurityException, IOExce
         while (parser.nextToken() != JsonToken.END_OBJECT) {
           parser.nextToken();
           String certValue = parser.getText();
-          X509Certificate x509Cert = (X509Certificate) factory.generateCertificate(
-              new ByteArrayInputStream(StringUtils.getBytesUtf8(certValue)));
+          X509Certificate x509Cert =
+              (X509Certificate)
+                  factory.generateCertificate(
+                      new ByteArrayInputStream(StringUtils.getBytesUtf8(certValue)));
           publicKeys.add(x509Cert.getPublicKey());
         }
         publicKeys = Collections.unmodifiableList(publicKeys);
@@ -223,12 +220,10 @@ long getCacheTimeInSec(HttpHeaders httpHeaders) {
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Builder for {@link GooglePublicKeysManager}.
    *
-   * <p>
-   * Implementation is not thread-safe.
-   * </p>
+   * <p>Implementation is not thread-safe.
    *
    * @since 1.17
    */
@@ -281,14 +276,10 @@ public final String getPublicCertsEncodedUrl() {
     /**
      * Sets the public certificates encoded URL.
      *
-     * <p>
-     * The default value is {@link GoogleOAuthConstants#DEFAULT_PUBLIC_CERTS_ENCODED_URL}.
-     * </p>
+     * <p>The default value is {@link GoogleOAuthConstants#DEFAULT_PUBLIC_CERTS_ENCODED_URL}.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setPublicCertsEncodedUrl(String publicCertsEncodedUrl) {
       this.publicCertsEncodedUrl = Preconditions.checkNotNull(publicCertsEncodedUrl);
@@ -303,10 +294,8 @@ public final Clock getClock() {
     /**
      * Sets the clock.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setClock(Clock clock) {
       this.clock = Preconditions.checkNotNull(clock);
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java
index f71fd85c9..55ba20fc0 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleRefreshTokenRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -23,7 +23,6 @@
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
-
 import java.io.IOException;
 import java.util.Collection;
 
@@ -32,42 +31,36 @@
  * refresh token as specified in <a href="http://tools.ietf.org/html/rfc6749#section-6">Refreshing
  * an Access Token</a>.
  *
- * <p>
- * Use {@link GoogleCredential} to access protected resources from the resource server using the
- * {@link TokenResponse} returned by {@link #execute()}. On error, it will instead throw
- * {@link TokenResponseException}.
- * </p>
+ * <p>Use {@link GoogleCredential} to access protected resources from the resource server using the
+ * {@link TokenResponse} returned by {@link #execute()}. On error, it will instead throw {@link
+ * TokenResponseException}.
  *
- * <p>
- * Sample usage:
- * </p>
+ * <p>Sample usage:
  *
  * <pre>
-  static void refreshAccessToken() throws IOException {
-    try {
-      TokenResponse response =
-          new GoogleRefreshTokenRequest(new NetHttpTransport(), new JacksonFactory(),
-              "tGzv3JOkF0XG5Qx2TlKWIA", "s6BhdRkqt3", "7Fjfp0ZBr1KtDRbnfVdmIw").execute();
-      System.out.println("Access token: " + response.getAccessToken());
-    } catch (TokenResponseException e) {
-      if (e.getDetails() != null) {
-        System.err.println("Error: " + e.getDetails().getError());
-        if (e.getDetails().getErrorDescription() != null) {
-          System.err.println(e.getDetails().getErrorDescription());
-        }
-        if (e.getDetails().getErrorUri() != null) {
-          System.err.println(e.getDetails().getErrorUri());
-        }
-      } else {
-        System.err.println(e.getMessage());
-      }
-    }
-  }
+ * static void refreshAccessToken() throws IOException {
+ * try {
+ * TokenResponse response =
+ * new GoogleRefreshTokenRequest(new NetHttpTransport(), new GsonFactory(),
+ * "tGzv3JOkF0XG5Qx2TlKWIA", "s6BhdRkqt3", "7Fjfp0ZBr1KtDRbnfVdmIw").execute();
+ * System.out.println("Access token: " + response.getAccessToken());
+ * } catch (TokenResponseException e) {
+ * if (e.getDetails() != null) {
+ * System.err.println("Error: " + e.getDetails().getError());
+ * if (e.getDetails().getErrorDescription() != null) {
+ * System.err.println(e.getDetails().getErrorDescription());
+ * }
+ * if (e.getDetails().getErrorUri() != null) {
+ * System.err.println(e.getDetails().getErrorUri());
+ * }
+ * } else {
+ * System.err.println(e.getMessage());
+ * }
+ * }
+ * }
  * </pre>
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @since 1.7
  * @author Yaniv Inbar
@@ -81,9 +74,16 @@ public class GoogleRefreshTokenRequest extends RefreshTokenRequest {
    * @param clientId client identifier issued to the client during the registration process
    * @param clientSecret client secret
    */
-  public GoogleRefreshTokenRequest(HttpTransport transport, JsonFactory jsonFactory,
-      String refreshToken, String clientId, String clientSecret) {
-    super(transport, jsonFactory, new GenericUrl(GoogleOAuthConstants.TOKEN_SERVER_URL),
+  public GoogleRefreshTokenRequest(
+      HttpTransport transport,
+      JsonFactory jsonFactory,
+      String refreshToken,
+      String clientId,
+      String clientSecret) {
+    super(
+        transport,
+        jsonFactory,
+        new GenericUrl(GoogleOAuthConstants.TOKEN_SERVER_URL),
         refreshToken);
     setClientAuthentication(new ClientParametersAuthentication(clientId, clientSecret));
   }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleTokenResponse.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleTokenResponse.java
index acae998f6..cac8e5007 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleTokenResponse.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleTokenResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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,7 +19,6 @@
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Key;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 
 /**
@@ -28,15 +27,11 @@
  * token as specified in <a href="http://openid.net/specs/openid-connect-session-1_0.html">OpenID
  * Connect Session Management 1.0</a>.
  *
- * <p>
- * This response object is the result of {@link GoogleAuthorizationCodeTokenRequest#execute()} and
- * {@link GoogleRefreshTokenRequest#execute()}. Use {@link #parseIdToken()} to parse the
- * {@link GoogleIdToken} and then call {@link GoogleIdTokenVerifier#verify(GoogleIdToken)}.
- * </p>
+ * <p>This response object is the result of {@link GoogleAuthorizationCodeTokenRequest#execute()}
+ * and {@link GoogleRefreshTokenRequest#execute()}. Use {@link #parseIdToken()} to parse the {@link
+ * GoogleIdToken} and then call {@link GoogleIdTokenVerifier#verify(GoogleIdToken)}.
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @since 1.7
  * @author Yaniv Inbar
@@ -73,7 +68,7 @@ public GoogleTokenResponse setScope(String scope) {
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Returns the ID token.
    */
   @Beta
@@ -82,13 +77,11 @@ public final String getIdToken() {
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Sets the ID token.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   @Beta
   public GoogleTokenResponse setIdToken(String idToken) {
@@ -97,7 +90,7 @@ public GoogleTokenResponse setIdToken(String idToken) {
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Parses using {@link GoogleIdToken#parse(JsonFactory, String)} based on the {@link #getFactory()
    * JSON factory} and {@link #getIdToken() ID token}.
    */
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java
index 88be30470..f0b64a608 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/OAuth2Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Google Inc.
+ * Copyright 2014 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
@@ -20,7 +20,6 @@
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.util.Beta;
-
 import java.io.IOException;
 import java.net.SocketTimeoutException;
 import java.nio.charset.Charset;
@@ -28,9 +27,7 @@
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-/**
- * Utilities used by the com.google.api.client.googleapis.auth.oauth2 namespace.
- */
+/** Utilities used by the com.google.api.client.googleapis.auth.oauth2 namespace. */
 @Beta
 public class OAuth2Utils {
 
@@ -71,8 +68,8 @@ static boolean headersContainValue(HttpHeaders headers, String headerName, Strin
     return false;
   }
 
-  static boolean runningOnComputeEngine(HttpTransport transport,
-      SystemEnvironmentProvider environment) {
+  static boolean runningOnComputeEngine(
+      HttpTransport transport, SystemEnvironmentProvider environment) {
     // If the environment has requested that we do no GCE checks, return immediately.
     if (Boolean.parseBoolean(environment.getEnv("NO_GCE_CHECK"))) {
       return false;
@@ -83,6 +80,7 @@ static boolean runningOnComputeEngine(HttpTransport transport,
       try {
         HttpRequest request = transport.createRequestFactory().buildGetRequest(tokenUrl);
         request.setConnectTimeout(COMPUTE_PING_CONNECTION_TIMEOUT_MS);
+        request.getHeaders().set("Metadata-Flavor", "Google");
         HttpResponse response = request.execute();
         try {
           HttpHeaders headers = response.getHeaders();
@@ -94,9 +92,7 @@ static boolean runningOnComputeEngine(HttpTransport transport,
         // Ignore logging timeouts which is the expected failure mode in non GCE environments.
       } catch (IOException e) {
         LOGGER.log(
-            Level.WARNING,
-            "Failed to detect whether we are running on Google Compute Engine.",
-            e);
+            Level.WARNING, "Failed to detect whether we are running on Google Compute Engine.", e);
       }
     }
     return false;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/SystemEnvironmentProvider.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/SystemEnvironmentProvider.java
index 829f8e9b4..1e3ec46b8 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/SystemEnvironmentProvider.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/SystemEnvironmentProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Google Inc.
+ * Copyright 2015 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
@@ -13,22 +13,16 @@
  */
 package com.google.api.client.googleapis.auth.oauth2;
 
-/**
- * Abstraction which allows overriding of the system environment for tests.
- */
+/** Abstraction which allows overriding of the system environment for tests. */
 class SystemEnvironmentProvider {
   static final SystemEnvironmentProvider INSTANCE = new SystemEnvironmentProvider();
 
-  /**
-   * Override in test code to isolate from environment.
-   */
+  /** Override in test code to isolate from environment. */
   String getEnv(String name) {
     return System.getenv(name);
   }
 
-  /**
-   * Override in test code to isolate from environment.
-   */
+  /** Override in test code to isolate from environment. */
   boolean getEnvEquals(String name, String value) {
     return System.getenv().containsKey(name) && System.getenv(name).equals(value);
   }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/package-info.java
index f92e5ab92..9cf443d7b 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -14,53 +14,47 @@
 
 /**
  * Google's additions to OAuth 2.0 authorization as specified in <a
- * href="http://code.google.com/apis/accounts/docs/OAuth2.html">Using OAuth 2.0 to Access Google
+ * href="https://developers.google.com/identity/protocols/OAuth2">Using OAuth 2.0 to Access Google
  * APIs</a>.
  *
- * <p>
- * Before using this library, you must register your application at the <a
- * href="https://code.google.com/apis/console#access">APIs Console</a>. The result of this
+ * <p>Before using this library, you must register your application at the <a
+ * href="https://cloud.google.com/compute/docs/console">APIs Console</a>. The result of this
  * registration process is a set of values that are known to both Google and your application, such
  * as the "Client ID", "Client Secret", and "Redirect URIs".
- * </p>
  *
- * <p>
- * These are the typical steps of the web server flow based on an authorization code, as specified
- * in <a href="http://code.google.com/apis/accounts/docs/OAuth2WebServer.html">Using OAuth 2.0 for
- * Web Server Applications</a>:
+ * <p>These are the typical steps of the web server flow based on an authorization code, as
+ * specified in <a href="https://developers.google.com/identity/protocols/OAuth2WebServer">Using
+ * OAuth 2.0 for Web Server Applications</a>:
+ *
  * <ul>
- * <li>Redirect the end user in the browser to the authorization page using
- * {@link com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeRequestUrl} to grant
- * your application access to the end user's protected data.</li>
- * <li>Process the authorization response using
- * {@link com.google.api.client.auth.oauth2.AuthorizationCodeResponseUrl} to parse the authorization
- * code.</li>
- * <li>Request an access token and possibly a refresh token using
- * {@link com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeTokenRequest}.</li>
- * <li>Access protected resources using
- * {@link com.google.api.client.googleapis.auth.oauth2.GoogleCredential}. Expired access tokens will
- * automatically be refreshed using the refresh token (if applicable).</li>
+ *   <li>Redirect the end user in the browser to the authorization page using {@link
+ *       com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeRequestUrl} to grant
+ *       your application access to the end user's protected data.
+ *   <li>Process the authorization response using {@link
+ *       com.google.api.client.auth.oauth2.AuthorizationCodeResponseUrl} to parse the authorization
+ *       code.
+ *   <li>Request an access token and possibly a refresh token using {@link
+ *       com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeTokenRequest}.
+ *   <li>Access protected resources using {@link
+ *       com.google.api.client.googleapis.auth.oauth2.GoogleCredential}. Expired access tokens will
+ *       automatically be refreshed using the refresh token (if applicable).
  * </ul>
- * </p>
  *
- * <p>
- * These are the typical steps of the the browser-based client flow specified in <a
- * href="http://code.google.com/apis/accounts/docs/OAuth2UserAgent.html">Using OAuth 2.0 for
+ * <p>These are the typical steps of the the browser-based client flow specified in <a
+ * href="https://developers.google.com/identity/protocols/OAuth2UserAgent">Using OAuth 2.0 for
  * Client-side Applications</a>:
+ *
  * <ul>
- * <li>Redirect the end user in the browser to the authorization page using
- * {@link com.google.api.client.googleapis.auth.oauth2.GoogleBrowserClientRequestUrl} to grant your
- * browser application access to the end user's protected data.</li>
- * <li>Use the <a href="http://code.google.com/p/google-api-javascript-client/">Google API Client
- * library for JavaScript</a> to process the access token found in the URL fragment at the redirect
- * URI registered at the <a href="https://code.google.com/apis/console#access">APIs Console</a>.
- * </li>
+ *   <li>Redirect the end user in the browser to the authorization page using {@link
+ *       com.google.api.client.googleapis.auth.oauth2.GoogleBrowserClientRequestUrl} to grant your
+ *       browser application access to the end user's protected data.
+ *   <li>Use the <a href="https://github.com/google/google-api-javascript-client">Google API Client
+ *       library for JavaScript</a> to process the access token found in the URL fragment at the
+ *       redirect URI registered at the <a
+ *       href="https://cloud.google.com/compute/docs/consoles">APIs Console</a>.
  * </ul>
- * </p>
  *
  * @since 1.7
  * @author Yaniv Inbar
  */
-
 package com.google.api.client.googleapis.auth.oauth2;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchCallback.java
index f7f31f700..f0fc05448 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchCallback.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -15,29 +15,26 @@
 package com.google.api.client.googleapis.batch;
 
 import com.google.api.client.http.HttpHeaders;
-
 import java.io.IOException;
 
 /**
  * Callback for an individual batch response.
  *
- * <p>
- * Sample use:
- * </p>
+ * <p>Sample use:
  *
  * <pre>
-   batch.queue(volumesList.buildHttpRequest(), Volumes.class, GoogleJsonErrorContainer.class,
-       new BatchCallback&lt;Volumes, GoogleJsonErrorContainer&gt;() {
-
-     public void onSuccess(Volumes volumes, HttpHeaders responseHeaders) {
-       log("Success");
-       printVolumes(volumes.getItems());
-     }
-
-     public void onFailure(GoogleJsonErrorContainer e, HttpHeaders responseHeaders) {
-       log(e.getError().getMessage());
-     }
-   });
+ * batch.queue(volumesList.buildHttpRequest(), Volumes.class, GoogleJsonErrorContainer.class,
+ * new BatchCallback&lt;Volumes, GoogleJsonErrorContainer&gt;() {
+ *
+ * public void onSuccess(Volumes volumes, HttpHeaders responseHeaders) {
+ * log("Success");
+ * printVolumes(volumes.getItems());
+ * }
+ *
+ * public void onFailure(GoogleJsonErrorContainer e, HttpHeaders responseHeaders) {
+ * log(e.getError().getMessage());
+ * }
+ * });
  * </pre>
  *
  * @param <T> Type of the data model class
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchRequest.java
index 3958b64e2..a814a5eec 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchRequest.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -14,7 +14,6 @@
 
 package com.google.api.client.googleapis.batch;
 
-import com.google.api.client.http.BackOffPolicy;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpBackOffUnsuccessfulResponseHandler;
 import com.google.api.client.http.HttpExecuteInterceptor;
@@ -28,76 +27,82 @@
 import com.google.api.client.http.MultipartContent;
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.Sleeper;
-
+import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 
 /**
  * An instance of this class represents a single batch of requests.
  *
- * <p>
- * Sample use:
- * </p>
+ * <p>Sample use:
  *
  * <pre>
-   BatchRequest batch = new BatchRequest(transport, httpRequestInitializer);
-   batch.queue(volumesList, Volumes.class, GoogleJsonErrorContainer.class,
-       new BatchCallback&lt;Volumes, GoogleJsonErrorContainer&gt;() {
-
-     public void onSuccess(Volumes volumes, HttpHeaders responseHeaders) {
-       log("Success");
-       printVolumes(volumes.getItems());
-     }
-
-     public void onFailure(GoogleJsonErrorContainer e, HttpHeaders responseHeaders) {
-       log(e.getError().getMessage());
-     }
-   });
-   batch.queue(volumesList, Volumes.class, GoogleJsonErrorContainer.class,
-       new BatchCallback&lt;Volumes, GoogleJsonErrorContainer&gt;() {
-
-     public void onSuccess(Volumes volumes, HttpHeaders responseHeaders) {
-       log("Success");
-       printVolumes(volumes.getItems());
-     }
-
-     public void onFailure(GoogleJsonErrorContainer e, HttpHeaders responseHeaders) {
-       log(e.getError().getMessage());
-     }
-   });
-   batch.execute();
+ * // client is a AbstractGoogleClient (e.g. com.google.api.services.books.Books)
+ * BatchRequest batch = client.batch(httpRequestInitializer);
+ * batch.queue(volumesList, Volumes.class, GoogleJsonErrorContainer.class,
+ * new BatchCallback&lt;Volumes, GoogleJsonErrorContainer&gt;() {
+ *
+ * public void onSuccess(Volumes volumes, HttpHeaders responseHeaders) {
+ * log("Success");
+ * printVolumes(volumes.getItems());
+ * }
+ *
+ * public void onFailure(GoogleJsonErrorContainer e, HttpHeaders responseHeaders) {
+ * log(e.getError().getMessage());
+ * }
+ * });
+ * batch.queue(volumesList, Volumes.class, GoogleJsonErrorContainer.class,
+ * new BatchCallback&lt;Volumes, GoogleJsonErrorContainer&gt;() {
+ *
+ * public void onSuccess(Volumes volumes, HttpHeaders responseHeaders) {
+ * log("Success");
+ * printVolumes(volumes.getItems());
+ * }
+ *
+ * public void onFailure(GoogleJsonErrorContainer e, HttpHeaders responseHeaders) {
+ * log(e.getError().getMessage());
+ * }
+ * });
+ * batch.execute();
  * </pre>
  *
- * <p>
- * The content of each individual response is stored in memory. There is thus a potential of
+ * <p>The content of each individual response is stored in memory. There is thus a potential of
  * encountering an {@link OutOfMemoryError} for very large responses.
- * </p>
  *
- * <p>
- * Redirects are currently not followed in {@link BatchRequest}.
- * </p>
+ * <p>Redirects are currently not followed in {@link BatchRequest}.
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
- * <p>
- * Note: When setting an {@link HttpUnsuccessfulResponseHandler} by calling to
- * {@link HttpRequest#setUnsuccessfulResponseHandler}, the handler is called for each unsuccessful
- * part. As a result it's not recommended to use {@link HttpBackOffUnsuccessfulResponseHandler} on a
- * batch request, since the back-off policy is invoked for each unsuccessful part.
- * </p>
+ * <p>Note: When setting an {@link HttpUnsuccessfulResponseHandler} by calling to {@link
+ * HttpRequest#setUnsuccessfulResponseHandler}, the handler is called for each unsuccessful part. As
+ * a result it's not recommended to use {@link HttpBackOffUnsuccessfulResponseHandler} on a batch
+ * request, since the back-off policy is invoked for each unsuccessful part.
  *
  * @since 1.9
  * @author rmistry@google.com (Ravi Mistry)
  */
-@SuppressWarnings("deprecation")
 public final class BatchRequest {
 
+  /**
+   * The deprecated global batch endpoint. Users should actually use the per-service batch endpoint
+   * declared by the service configuration.
+   */
+  private static final String GLOBAL_BATCH_ENDPOINT = "https://www.googleapis.com/batch";
+
+  private static final String GLOBAL_BATCH_ENDPOINT_WARNING =
+      "You are using the global batch "
+          + "endpoint which will soon be shut down. Please instantiate your BatchRequest via your "
+          + "service client's `batch(HttpRequestInitializer)` method. For an example, please see "
+          + "https://github.com/googleapis/google-api-java-client#batching.";
+
+  private static final Logger LOGGER = Logger.getLogger(BatchRequest.class.getName());
+
   /** The URL where batch requests are sent. */
-  private GenericUrl batchUrl = new GenericUrl("https://www.googleapis.com/batch");
+  private GenericUrl batchUrl = new GenericUrl(GLOBAL_BATCH_ENDPOINT);
 
   /** The request factory for connections to the server. */
   private final HttpRequestFactory requestFactory;
@@ -115,7 +120,10 @@ static class RequestInfo<T, E> {
     final Class<E> errorClass;
     final HttpRequest request;
 
-    RequestInfo(BatchCallback<T, E> callback, Class<T> dataClass, Class<E> errorClass,
+    RequestInfo(
+        BatchCallback<T, E> callback,
+        Class<T> dataClass,
+        Class<E> errorClass,
         HttpRequest request) {
       this.callback = callback;
       this.dataClass = dataClass;
@@ -129,16 +137,21 @@ static class RequestInfo<T, E> {
    *
    * @param transport The transport to use for requests
    * @param httpRequestInitializer The initializer to use when creating an {@link HttpRequest} or
-   *        {@code null} for none
+   *     {@code null} for none
+   * @deprecated Please use AbstractGoogleClient#batch(HttpRequestInitializer) to instantiate your
+   *     batch request.
    */
+  @Deprecated
   public BatchRequest(HttpTransport transport, HttpRequestInitializer httpRequestInitializer) {
-    this.requestFactory = httpRequestInitializer == null
-        ? transport.createRequestFactory() : transport.createRequestFactory(httpRequestInitializer);
+    this.requestFactory =
+        httpRequestInitializer == null
+            ? transport.createRequestFactory()
+            : transport.createRequestFactory(httpRequestInitializer);
   }
 
   /**
-   * Sets the URL that will be hit when {@link #execute()} is called. The default value is
-   * {@code https://www.googleapis.com/batch}.
+   * Sets the URL that will be hit when {@link #execute()} is called. The default value is {@code
+   * https://www.googleapis.com/batch}.
    */
   public BatchRequest setBatchUrl(GenericUrl batchUrl) {
     this.batchUrl = batchUrl;
@@ -177,15 +190,19 @@ public BatchRequest setSleeper(Sleeper sleeper) {
    * @param <E> error class type
    * @param httpRequest HTTP Request
    * @param dataClass Data class the response will be parsed into or {@code Void.class} to ignore
-   *        the content
-   * @param errorClass Data class the unsuccessful response will be parsed into or
-   *        {@code Void.class} to ignore the content
+   *     the content
+   * @param errorClass Data class the unsuccessful response will be parsed into or {@code
+   *     Void.class} to ignore the content
    * @param callback Batch Callback
    * @return this Batch request
    * @throws IOException If building the HTTP Request fails
    */
-  public <T, E> BatchRequest queue(HttpRequest httpRequest, Class<T> dataClass, Class<E> errorClass,
-      BatchCallback<T, E> callback) throws IOException {
+  public <T, E> BatchRequest queue(
+      HttpRequest httpRequest,
+      Class<T> dataClass,
+      Class<E> errorClass,
+      BatchCallback<T, E> callback)
+      throws IOException {
     Preconditions.checkNotNull(httpRequest);
     // TODO(rmistry): Add BatchUnparsedCallback with onResponse(InputStream content, HttpHeaders).
     Preconditions.checkNotNull(callback);
@@ -196,9 +213,7 @@ public <T, E> BatchRequest queue(HttpRequest httpRequest, Class<T> dataClass, Cl
     return this;
   }
 
-  /**
-   * Returns the number of queued requests in this batch request.
-   */
+  /** Returns the number of queued requests in this batch request. */
   public int size() {
     return requestInfos.size();
   }
@@ -206,26 +221,25 @@ public int size() {
   /**
    * Executes all queued HTTP requests in a single call, parses the responses and invokes callbacks.
    *
-   * <p>
-   * Calling {@link #execute()} executes and clears the queued requests. This means that the
+   * <p>Calling {@link #execute()} executes and clears the queued requests. This means that the
    * {@link BatchRequest} object can be reused to {@link #queue} and {@link #execute()} requests
    * again.
-   * </p>
    */
   public void execute() throws IOException {
     boolean retryAllowed;
     Preconditions.checkState(!requestInfos.isEmpty());
+
+    // Log a warning if the user is using the global batch endpoint. In the future, we can turn this
+    // into a preconditions check.
+    if (GLOBAL_BATCH_ENDPOINT.equals(this.batchUrl.toString())) {
+      LOGGER.log(Level.WARNING, GLOBAL_BATCH_ENDPOINT_WARNING);
+    }
+
     HttpRequest batchRequest = requestFactory.buildPostRequest(this.batchUrl, null);
     // NOTE: batch does not support gzip encoding
     HttpExecuteInterceptor originalInterceptor = batchRequest.getInterceptor();
     batchRequest.setInterceptor(new BatchInterceptor(originalInterceptor));
     int retriesRemaining = batchRequest.getNumberOfRetries();
-    BackOffPolicy backOffPolicy = batchRequest.getBackOffPolicy();
-
-    if (backOffPolicy != null) {
-      // Reset the BackOffPolicy at the start of each execute.
-      backOffPolicy.reset();
-    }
 
     do {
       retryAllowed = retriesRemaining > 0;
@@ -233,9 +247,10 @@ public void execute() throws IOException {
       batchContent.getMediaType().setSubType("mixed");
       int contentId = 1;
       for (RequestInfo<?, ?> requestInfo : requestInfos) {
-        batchContent.addPart(new MultipartContent.Part(
-            new HttpHeaders().setAcceptEncoding(null).set("Content-ID", contentId++),
-            new HttpRequestContent(requestInfo.request)));
+        batchContent.addPart(
+            new MultipartContent.Part(
+                new HttpHeaders().setAcceptEncoding(null).set("Content-ID", contentId++),
+                new HttpRequestContent(requestInfo.request)));
       }
       batchRequest.setContent(batchContent);
       HttpResponse response = batchRequest.execute();
@@ -245,7 +260,7 @@ public void execute() throws IOException {
         String boundary = "--" + response.getMediaType().getParameter("boundary");
 
         // Parse the content stream.
-        InputStream contentStream = response.getContent();
+        InputStream contentStream = new BufferedInputStream(response.getContent());
         batchResponse =
             new BatchUnparsedResponse(contentStream, boundary, requestInfos, retryAllowed);
 
@@ -259,17 +274,6 @@ public void execute() throws IOException {
       List<RequestInfo<?, ?>> unsuccessfulRequestInfos = batchResponse.unsuccessfulRequestInfos;
       if (!unsuccessfulRequestInfos.isEmpty()) {
         requestInfos = unsuccessfulRequestInfos;
-        // backOff if required.
-        if (batchResponse.backOffRequired && backOffPolicy != null) {
-          long backOffTime = backOffPolicy.getNextBackOffMillis();
-          if (backOffTime != BackOffPolicy.STOP) {
-            try {
-              sleeper.sleep(backOffTime);
-            } catch (InterruptedException exception) {
-              // ignore
-            }
-          }
-        }
       } else {
         break;
       }
@@ -301,6 +305,5 @@ public void intercept(HttpRequest batchRequest) throws IOException {
         }
       }
     }
-
   }
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchUnparsedResponse.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchUnparsedResponse.java
index 246d7ff26..179d84b6f 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchUnparsedResponse.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/BatchUnparsedResponse.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -15,7 +15,6 @@
 package com.google.api.client.googleapis.batch;
 
 import com.google.api.client.googleapis.batch.BatchRequest.RequestInfo;
-import com.google.api.client.http.BackOffPolicy;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpContent;
 import com.google.api.client.http.HttpHeaders;
@@ -27,7 +26,6 @@
 import com.google.api.client.http.LowLevelHttpRequest;
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.util.ByteStreams;
-
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.FilterInputStream;
@@ -36,13 +34,11 @@
 import java.util.ArrayList;
 import java.util.List;
 
-
 /**
  * The unparsed batch response.
  *
  * @author rmistry@google.com (Ravi Mistry)
  */
-@SuppressWarnings("deprecation")
 final class BatchUnparsedResponse {
 
   /** The boundary used in the batch response to separate individual responses. */
@@ -60,9 +56,6 @@ final class BatchUnparsedResponse {
   /** List of unsuccessful HTTP requests that can be retried. */
   List<RequestInfo<?, ?>> unsuccessfulRequestInfos = new ArrayList<RequestInfo<?, ?>>();
 
-  /** Indicates if back off is required before the next retry. */
-  boolean backOffRequired;
-
   /** The content Id the response is currently at. */
   private int contentId = 0;
 
@@ -77,8 +70,11 @@ final class BatchUnparsedResponse {
    * @param requestInfos List of request infos
    * @param retryAllowed Whether unsuccessful HTTP requests can be retried
    */
-  BatchUnparsedResponse(InputStream inputStream, String boundary,
-      List<RequestInfo<?, ?>> requestInfos, boolean retryAllowed)
+  BatchUnparsedResponse(
+      InputStream inputStream,
+      String boundary,
+      List<RequestInfo<?, ?>> requestInfos,
+      boolean retryAllowed)
       throws IOException {
     this.boundary = boundary;
     this.requestInfos = requestInfos;
@@ -91,9 +87,7 @@ final class BatchUnparsedResponse {
   /**
    * Parses the next response in the queue if a data class and a {@link BatchCallback} is specified.
    *
-   * <p>
-   * This method closes the input stream if there are no more individual responses left.
-   * </p>
+   * <p>This method closes the input stream if there are no more individual responses left.
    */
   void parseNextResponse() throws IOException {
     contentId++;
@@ -122,7 +116,7 @@ void parseNextResponse() throws IOException {
       headerNames.add(headerName);
       headerValues.add(headerValue);
       if ("Content-Length".equalsIgnoreCase(headerName.trim())) {
-          contentLength = Long.parseLong(headerValue);
+        contentLength = Long.parseLong(headerValue);
       }
     }
 
@@ -141,22 +135,21 @@ void parseNextResponse() throws IOException {
       // Remove CRLF from the boundary token (to match readLine)
       line = trimCrlf(line);
     } else {
-      body = new FilterInputStream(ByteStreams.limit(inputStream, contentLength)) {
-        @Override
-        public void close() {
-          // Don't allow the parser to close the underlying stream
-        }
-      };
+      body =
+          new FilterInputStream(ByteStreams.limit(inputStream, contentLength)) {
+            @Override
+            public void close() {
+              // Don't allow the parser to close the underlying stream
+            }
+          };
     }
 
-    HttpResponse response =
-        getFakeResponse(statusCode, body, headerNames, headerValues);
+    HttpResponse response = getFakeResponse(statusCode, body, headerNames, headerValues);
 
     parseAndCallback(requestInfos.get(contentId - 1), statusCode, response);
 
     // Consume any bytes that were not consumed by the parser
-    while (body.skip(contentLength) > 0 || body.read() != -1) {
-    }
+    while (body.skip(contentLength) > 0 || body.read() != -1) {}
 
     if (contentLength != -1) {
       line = readLine();
@@ -172,21 +165,16 @@ public void close() {
   }
 
   /**
-   * Parse an object into a new instance of the data class using
-   * {@link HttpResponse#parseAs(java.lang.reflect.Type)}.
+   * Parse an object into a new instance of the data class using {@link
+   * HttpResponse#parseAs(java.lang.reflect.Type)}.
    */
   private <T, E> void parseAndCallback(
-      RequestInfo<T, E> requestInfo, int statusCode, HttpResponse response)
-      throws IOException {
+      RequestInfo<T, E> requestInfo, int statusCode, HttpResponse response) throws IOException {
     BatchCallback<T, E> callback = requestInfo.callback;
 
     HttpHeaders responseHeaders = response.getHeaders();
     HttpUnsuccessfulResponseHandler unsuccessfulResponseHandler =
         requestInfo.request.getUnsuccessfulResponseHandler();
-    BackOffPolicy backOffPolicy = requestInfo.request.getBackOffPolicy();
-
-    // Reset backOff flag.
-    backOffRequired = false;
 
     if (HttpStatusCodes.isSuccess(statusCode)) {
       if (callback == null) {
@@ -201,18 +189,16 @@ private <T, E> void parseAndCallback(
       boolean errorHandled = false;
       boolean redirectRequest = false;
       if (unsuccessfulResponseHandler != null) {
-        errorHandled = unsuccessfulResponseHandler.handleResponse(
-            requestInfo.request, response, retrySupported);
+        errorHandled =
+            unsuccessfulResponseHandler.handleResponse(
+                requestInfo.request, response, retrySupported);
       }
       if (!errorHandled) {
         if (requestInfo.request.handleRedirect(response.getStatusCode(), response.getHeaders())) {
           redirectRequest = true;
-        } else if (retrySupported && backOffPolicy != null
-            && backOffPolicy.isBackOffRequired(response.getStatusCode())) {
-          backOffRequired = true;
         }
       }
-      if (retrySupported && (errorHandled || backOffRequired || redirectRequest)) {
+      if (retrySupported && (errorHandled || redirectRequest)) {
         unsuccessfulRequestInfos.add(requestInfo);
       } else {
         if (callback == null) {
@@ -231,17 +217,23 @@ private <A, T, E> A getParsedDataClass(
     if (dataClass == Void.class) {
       return null;
     }
-    return requestInfo.request.getParser().parseAndClose(
-        response.getContent(), response.getContentCharset(), dataClass);
+    return requestInfo
+        .request
+        .getParser()
+        .parseAndClose(response.getContent(), response.getContentCharset(), dataClass);
   }
 
   /** Create a fake HTTP response object populated with the partContent and the statusCode. */
-  private HttpResponse getFakeResponse(final int statusCode, final InputStream partContent,
-      List<String> headerNames, List<String> headerValues)
+  private HttpResponse getFakeResponse(
+      final int statusCode,
+      final InputStream partContent,
+      List<String> headerNames,
+      List<String> headerValues)
       throws IOException {
-    HttpRequest request = new FakeResponseHttpTransport(
-        statusCode, partContent, headerNames, headerValues).createRequestFactory()
-        .buildPostRequest(new GenericUrl("http://google.com/"), null);
+    HttpRequest request =
+        new FakeResponseHttpTransport(statusCode, partContent, headerNames, headerValues)
+            .createRequestFactory()
+            .buildPostRequest(new GenericUrl("http://google.com/"), null);
     request.setLoggingEnabled(false);
     request.setThrowExceptionOnExecuteError(false);
     return request.execute();
@@ -270,9 +262,9 @@ private String readRawLine() throws IOException {
 
   /**
    * Reads an HTTP response line (ISO-8859-1 encoding)
-   * <p>
-   * This method is similar to {@link java.io.BufferedReader#readLine()}, but handles newlines in a
-   * way that is consistent with the HTTP RFC 2616.
+   *
+   * <p>This method is similar to {@link java.io.BufferedReader#readLine()}, but handles newlines in
+   * a way that is consistent with the HTTP RFC 2616.
    *
    * @return The line that was read, excluding CRLF.
    */
@@ -319,7 +311,10 @@ private static class FakeResponseHttpTransport extends HttpTransport {
     private List<String> headerNames;
     private List<String> headerValues;
 
-    FakeResponseHttpTransport(int statusCode, InputStream partContent, List<String> headerNames,
+    FakeResponseHttpTransport(
+        int statusCode,
+        InputStream partContent,
+        List<String> headerNames,
         List<String> headerValues) {
       super();
       this.statusCode = statusCode;
@@ -341,7 +336,10 @@ private static class FakeLowLevelHttpRequest extends LowLevelHttpRequest {
     private List<String> headerNames;
     private List<String> headerValues;
 
-    FakeLowLevelHttpRequest(InputStream partContent, int statusCode, List<String> headerNames,
+    FakeLowLevelHttpRequest(
+        InputStream partContent,
+        int statusCode,
+        List<String> headerNames,
         List<String> headerValues) {
       this.partContent = partContent;
       this.statusCode = statusCode;
@@ -350,13 +348,12 @@ private static class FakeLowLevelHttpRequest extends LowLevelHttpRequest {
     }
 
     @Override
-    public void addHeader(String name, String value) {
-    }
+    public void addHeader(String name, String value) {}
 
     @Override
     public LowLevelHttpResponse execute() {
-      FakeLowLevelHttpResponse response = new FakeLowLevelHttpResponse(
-          partContent, statusCode, headerNames, headerValues);
+      FakeLowLevelHttpResponse response =
+          new FakeLowLevelHttpResponse(partContent, statusCode, headerNames, headerValues);
       return response;
     }
   }
@@ -368,7 +365,10 @@ private static class FakeLowLevelHttpResponse extends LowLevelHttpResponse {
     private List<String> headerNames = new ArrayList<String>();
     private List<String> headerValues = new ArrayList<String>();
 
-    FakeLowLevelHttpResponse(InputStream partContent, int statusCode, List<String> headerNames,
+    FakeLowLevelHttpResponse(
+        InputStream partContent,
+        int statusCode,
+        List<String> headerNames,
         List<String> headerValues) {
       this.partContent = partContent;
       this.statusCode = statusCode;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/HttpRequestContent.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/HttpRequestContent.java
index 56e05092e..9c69fa9cd 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/HttpRequestContent.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/HttpRequestContent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -34,6 +34,7 @@ class HttpRequestContent extends AbstractHttpContent {
 
   /** HTTP request. */
   private final HttpRequest request;
+
   private static final String HTTP_VERSION = "HTTP/1.1";
 
   HttpRequestContent(HttpRequest request) {
@@ -55,8 +56,12 @@ public void writeTo(OutputStream out) throws IOException {
     // write headers
     HttpHeaders headers = new HttpHeaders();
     headers.fromHttpHeaders(request.getHeaders());
-    headers.setAcceptEncoding(null).setUserAgent(null)
-        .setContentEncoding(null).setContentType(null).setContentLength(null);
+    headers
+        .setAcceptEncoding(null)
+        .setUserAgent(null)
+        .setContentEncoding(null)
+        .setContentType(null)
+        .setContentLength(null);
     // analyze the content
     HttpContent content = request.getContent();
     if (content != null) {
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/JsonBatchCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/JsonBatchCallback.java
index 65bea34f6..563f20cb7 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/JsonBatchCallback.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/JsonBatchCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -18,29 +18,26 @@
 import com.google.api.client.googleapis.json.GoogleJsonError;
 import com.google.api.client.googleapis.json.GoogleJsonErrorContainer;
 import com.google.api.client.http.HttpHeaders;
-
 import java.io.IOException;
 
 /**
  * Callback for an individual batch JSON response.
  *
- * <p>
- * Sample use:
- * </p>
+ * <p>Sample use:
  *
  * <pre>
-   batch.queue(volumesList.buildHttpRequest(), Volumes.class, GoogleJsonErrorContainer.class,
-       new JsonBatchCallback&lt;Volumes&gt;() {
-
-     public void onSuccess(Volumes volumes, HttpHeaders responseHeaders) {
-       log("Success");
-       printVolumes(volumes.getItems());
-     }
-
-     public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
-       log(e.getMessage());
-     }
-   });
+ * batch.queue(volumesList.buildHttpRequest(), Volumes.class, GoogleJsonErrorContainer.class,
+ * new JsonBatchCallback&lt;Volumes&gt;() {
+ *
+ * public void onSuccess(Volumes volumes, HttpHeaders responseHeaders) {
+ * log("Success");
+ * printVolumes(volumes.getItems());
+ * }
+ *
+ * public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
+ * log(e.getMessage());
+ * }
+ * });
  * </pre>
  *
  * @param <T> Type of the data model class
@@ -60,6 +57,5 @@ public final void onFailure(GoogleJsonErrorContainer e, HttpHeaders responseHead
    * @param e Google JSON error response content
    * @param responseHeaders Headers of the batch response
    */
-  public abstract void onFailure(GoogleJsonError e, HttpHeaders responseHeaders)
-      throws IOException;
+  public abstract void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) throws IOException;
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/package-info.java
index 33566b165..4e104db1c 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/json/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -18,6 +18,4 @@
  * @since 1.9
  * @author Ravi Mistry
  */
-
 package com.google.api.client.googleapis.batch.json;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/package-info.java
index 51f4087da..cc7e4d8a6 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/batch/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/batch/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -18,6 +18,4 @@
  * @since 1.9
  * @author Ravi Mistry
  */
-
 package com.google.api.client.googleapis.batch;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java
index af888d8f6..afe3a25a8 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/compute/ComputeCredential.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -29,30 +29,25 @@
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Clock;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.util.Collection;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Google Compute Engine service accounts OAuth 2.0 credential based on <a
  * href="https://developers.google.com/compute/docs/authentication">Authenticating from Google
  * Compute Engine</a>.
  *
- * <p>
- * Sample usage:
- * </p>
+ * <p>Sample usage:
  *
  * <pre>
-  public static HttpRequestFactory createRequestFactory(
-      HttpTransport transport, JsonFactory jsonFactory) {
-    return transport.createRequestFactory(new GoogleComputeCredential(transport, jsonFactory));
-  }
+ * public static HttpRequestFactory createRequestFactory(
+ * HttpTransport transport, JsonFactory jsonFactory) {
+ * return transport.createRequestFactory(new GoogleComputeCredential(transport, jsonFactory));
+ * }
  * </pre>
  *
- * <p>
- * Implementation is immutable and thread-safe.
- * </p>
+ * <p>Implementation is immutable and thread-safe.
  *
  * @since 1.15
  * @author Yaniv Inbar
@@ -61,8 +56,9 @@ public static HttpRequestFactory createRequestFactory(
 public class ComputeCredential extends Credential {
 
   /** Metadata Service Account token server encoded URL. */
-  public static final String TOKEN_SERVER_ENCODED_URL = OAuth2Utils.getMetadataServerUrl()
-      + "/computeMetadata/v1/instance/service-accounts/default/token";
+  public static final String TOKEN_SERVER_ENCODED_URL =
+      OAuth2Utils.getMetadataServerUrl()
+          + "/computeMetadata/v1/instance/service-accounts/default/token";
 
   /**
    * @param transport HTTP transport
@@ -72,9 +68,7 @@ public ComputeCredential(HttpTransport transport, JsonFactory jsonFactory) {
     this(new Builder(transport, jsonFactory));
   }
 
-  /**
-   * @param builder builder
-   */
+  /** @param builder builder */
   protected ComputeCredential(Builder builder) {
     super(builder);
   }
@@ -89,12 +83,10 @@ protected TokenResponse executeRefreshToken() throws IOException {
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Google Compute Engine credential builder.
    *
-   * <p>
-   * Implementation is not thread-safe.
-   * </p>
+   * <p>Implementation is not thread-safe.
    */
   @Beta
   public static class Builder extends Credential.Builder {
@@ -137,8 +129,8 @@ public Builder setTokenServerUrl(GenericUrl tokenServerUrl) {
 
     @Override
     public Builder setTokenServerEncodedUrl(String tokenServerEncodedUrl) {
-      return (Builder) super.setTokenServerEncodedUrl(
-          Preconditions.checkNotNull(tokenServerEncodedUrl));
+      return (Builder)
+          super.setTokenServerEncodedUrl(Preconditions.checkNotNull(tokenServerEncodedUrl));
     }
 
     @Override
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/compute/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/compute/package-info.java
index 7ba6dc9ce..861462f37 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/compute/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/compute/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,7 +13,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Support for <a href="https://developers.google.com/compute/">Google Compute Engine</a>.
  *
  * @since 1.15
@@ -21,4 +21,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.compute;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java
index 9029ef11f..e6099014e 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -15,8 +15,11 @@
 package com.google.api.client.googleapis.javanet;
 
 import com.google.api.client.googleapis.GoogleUtils;
+import com.google.api.client.googleapis.mtls.MtlsProvider;
+import com.google.api.client.googleapis.mtls.MtlsUtils;
+import com.google.api.client.googleapis.util.Utils;
 import com.google.api.client.http.javanet.NetHttpTransport;
-
+import com.google.api.client.util.Beta;
 import java.io.IOException;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
@@ -30,32 +33,60 @@
 public class GoogleNetHttpTransport {
 
   /**
-   * Returns a new instance of {@link NetHttpTransport} that uses
-   * {@link GoogleUtils#getCertificateTrustStore()} for the trusted certificates using
-   * {@link com.google.api.client.http.javanet.NetHttpTransport.Builder#trustCertificates(KeyStore)}
-   * .
+   * Returns a new instance of {@link NetHttpTransport} that uses {@link
+   * GoogleUtils#getCertificateTrustStore()} for the trusted certificates using {@link
+   * com.google.api.client.http.javanet.NetHttpTransport.Builder#trustCertificates(KeyStore)}. If
+   * `GOOGLE_API_USE_CLIENT_CERTIFICATE` environment variable is set to "true", and the default
+   * client certificate key store from {@link Utils#loadDefaultMtlsKeyStore()} is not null, then the
+   * transport uses the default client certificate and is mutual TLS.
    *
-   * <p>
-   * This helper method doesn't provide for customization of the {@link NetHttpTransport}, such as
-   * the ability to specify a proxy. To do use, use
-   * {@link com.google.api.client.http.javanet.NetHttpTransport.Builder}, for example:
-   * </p>
+   * <p>This helper method doesn't provide for customization of the {@link NetHttpTransport}, such
+   * as the ability to specify a proxy. To do use, use {@link
+   * com.google.api.client.http.javanet.NetHttpTransport.Builder}, for example:
    *
    * <pre>
-  static HttpTransport newProxyTransport() throws GeneralSecurityException, IOException {
-    NetHttpTransport.Builder builder = new NetHttpTransport.Builder();
-    builder.trustCertificates(GoogleUtils.getCertificateTrustStore());
-    builder.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 3128)));
-    return builder.build();
-  }
+   * static HttpTransport newProxyTransport() throws GeneralSecurityException, IOException {
+   *   NetHttpTransport.Builder builder = new NetHttpTransport.Builder();
+   *   builder.trustCertificates(GoogleUtils.getCertificateTrustStore());
+   *   builder.setProxy(new Proxy(Proxy.Type.HTTP, new InetSocketAddress("127.0.0.1", 3128)));
+   *   return builder.build();
+   * }
    * </pre>
    */
   public static NetHttpTransport newTrustedTransport()
       throws GeneralSecurityException, IOException {
-    return new NetHttpTransport.Builder().trustCertificates(GoogleUtils.getCertificateTrustStore())
-        .build();
+    return newTrustedTransport(MtlsUtils.getDefaultMtlsProvider());
   }
 
-  private GoogleNetHttpTransport() {
+  /**
+   * {@link Beta} <br>
+   * Returns a new instance of {@link NetHttpTransport} that uses {@link
+   * GoogleUtils#getCertificateTrustStore()} for the trusted certificates using {@link
+   * com.google.api.client.http.javanet.NetHttpTransport.Builder#trustCertificates(KeyStore)}.
+   * mtlsProvider can be used to configure mutual TLS for the transport.
+   *
+   * @param mtlsProvider MtlsProvider to configure mutual TLS for the transport
+   */
+  @Beta
+  public static NetHttpTransport newTrustedTransport(MtlsProvider mtlsProvider)
+      throws GeneralSecurityException, IOException {
+    KeyStore mtlsKeyStore = null;
+    String mtlsKeyStorePassword = null;
+    if (mtlsProvider.useMtlsClientCertificate()) {
+      mtlsKeyStore = mtlsProvider.getKeyStore();
+      mtlsKeyStorePassword = mtlsProvider.getKeyStorePassword();
+    }
+
+    if (mtlsKeyStore != null && mtlsKeyStorePassword != null) {
+      return new NetHttpTransport.Builder()
+          .trustCertificates(
+              GoogleUtils.getCertificateTrustStore(), mtlsKeyStore, mtlsKeyStorePassword)
+          .build();
+    }
+    return new NetHttpTransport.Builder()
+        .trustCertificates(GoogleUtils.getCertificateTrustStore())
+        .build();
   }
+
+  private GoogleNetHttpTransport() {}
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/package-info.java
index 10669c037..6ad5ca864 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/javanet/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -18,6 +18,4 @@
  * @since 1.14
  * @author Yaniv Inbar
  */
-
 package com.google.api.client.googleapis.javanet;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonError.java b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonError.java
index 18864c3e2..246c3fd1e 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonError.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonError.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -21,15 +21,14 @@
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.util.Data;
 import com.google.api.client.util.Key;
-
+import com.google.common.collect.ImmutableList;
 import java.io.IOException;
 import java.util.Collections;
 import java.util.List;
 
 /**
  * Data class representing the Google JSON error response content, as documented for example in <a
- * href="https://code.google.com/apis/urlshortener/v1/getting_started.html#errors">Error
- * responses</a>.
+ * href="https://developers.google.com/url-shortener/v1/getting_started#errors">Error responses</a>.
  *
  * @since 1.4
  * @author Yaniv Inbar
@@ -43,19 +42,21 @@ public class GoogleJsonError extends GenericJson {
    * @param response HTTP response
    * @return new instance of the Google JSON error information
    * @throws IllegalArgumentException if content type is not {@link Json#MEDIA_TYPE} or if expected
-   *         {@code "data"} or {@code "error"} key is not found
+   *     {@code "data"} or {@code "error"} key is not found
    */
   public static GoogleJsonError parse(JsonFactory jsonFactory, HttpResponse response)
       throws IOException {
-    JsonObjectParser jsonObjectParser = new JsonObjectParser.Builder(jsonFactory).setWrapperKeys(
-        Collections.singleton("error")).build();
+    JsonObjectParser jsonObjectParser =
+        new JsonObjectParser.Builder(jsonFactory)
+            .setWrapperKeys(Collections.singleton("error"))
+            .build();
     return jsonObjectParser.parseAndClose(
         response.getContent(), response.getContentCharset(), GoogleJsonError.class);
   }
 
   static {
     // hack to force ProGuard to consider ErrorInfo used, since otherwise it would be stripped out
-    // see http://code.google.com/p/google-api-java-client/issues/detail?id=527
+    // see https://github.com/googleapis/google-api-java-client/issues/527
     Data.nullOf(ErrorInfo.class);
   }
 
@@ -63,27 +64,22 @@ public static GoogleJsonError parse(JsonFactory jsonFactory, HttpResponse respon
   public static class ErrorInfo extends GenericJson {
 
     /** Error classification or {@code null} for none. */
-    @Key
-    private String domain;
+    @Key private String domain;
 
     /** Error reason or {@code null} for none. */
-    @Key
-    private String reason;
+    @Key private String reason;
 
     /** Human readable explanation of the error or {@code null} for none. */
-    @Key
-    private String message;
+    @Key private String message;
 
     /**
      * Location in the request that caused the error or {@code null} for none or {@code null} for
      * none.
      */
-    @Key
-    private String location;
+    @Key private String location;
 
     /** Type of location in the request that caused the error or {@code null} for none. */
-    @Key
-    private String locationType;
+    @Key private String locationType;
 
     /**
      * Returns the error classification or {@code null} for none.
@@ -140,8 +136,8 @@ public final void setMessage(String message) {
     }
 
     /**
-     * Returns the location in the request that caused the error or {@code null} for none or
-     * {@code null} for none.
+     * Returns the location in the request that caused the error or {@code null} for none or {@code
+     * null} for none.
      *
      * @since 1.8
      */
@@ -150,8 +146,8 @@ public final String getLocation() {
     }
 
     /**
-     * Sets the location in the request that caused the error or {@code null} for none or
-     * {@code null} for none.
+     * Sets the location in the request that caused the error or {@code null} for none or {@code
+     * null} for none.
      *
      * @since 1.8
      */
@@ -188,17 +184,84 @@ public ErrorInfo clone() {
     }
   }
 
+  public static class Details {
+    @Key("@type")
+    private String type;
+
+    @Key private String detail;
+    @Key private String reason;
+    @Key private List<ParameterViolations> parameterViolations;
+
+    public String getType() {
+      return type;
+    }
+
+    public void setType(String type) {
+      this.type = type;
+    }
+
+    public String getDetail() {
+      return detail;
+    }
+
+    public void setDetail(String detail) {
+      this.detail = detail;
+    }
+
+    public String getReason() {
+      return reason;
+    }
+
+    public void setReason(String reason) {
+      this.reason = reason;
+    }
+
+    public List<ParameterViolations> getParameterViolations() {
+      return parameterViolations;
+    }
+
+    /**
+     * Sets parameterViolations list as immutable to prevent exposing mutable state.
+     *
+     * @param parameterViolations
+     */
+    public void setParameterViolations(List<ParameterViolations> parameterViolations) {
+      this.parameterViolations = ImmutableList.copyOf(parameterViolations);
+    }
+  }
+
+  public static class ParameterViolations {
+    @Key private String parameter;
+    @Key private String description;
+
+    public String getDescription() {
+      return description;
+    }
+
+    public void setDescription(String description) {
+      this.description = description;
+    }
+
+    public String getParameter() {
+      return parameter;
+    }
+
+    public void setParameter(String parameter) {
+      this.parameter = parameter;
+    }
+  }
+
   /** List of detailed errors or {@code null} for none. */
-  @Key
-  private List<ErrorInfo> errors;
+  @Key private List<ErrorInfo> errors;
 
   /** HTTP status code of this response or {@code null} for none. */
-  @Key
-  private int code;
+  @Key private int code;
 
   /** Human-readable explanation of the error or {@code null} for none. */
-  @Key
-  private String message;
+  @Key private String message;
+
+  /** Lists type and parameterViolation details of an Exception */
+  @Key private List<Details> details;
 
   /**
    * Returns the list of detailed errors or {@code null} for none.
@@ -210,12 +273,13 @@ public final List<ErrorInfo> getErrors() {
   }
 
   /**
-   * Sets the list of detailed errors or {@code null} for none.
+   * Sets the list of detailed errors or {@code null} for none. Sets the list of detailed errors as
+   * immutable to prevent exposing mutable state.
    *
    * @since 1.8
    */
   public final void setErrors(List<ErrorInfo> errors) {
-    this.errors = errors;
+    this.errors = ImmutableList.copyOf(errors);
   }
 
   /**
@@ -254,6 +318,20 @@ public final void setMessage(String message) {
     this.message = message;
   }
 
+  public List<Details> getDetails() {
+    return details;
+  }
+
+  /**
+   * Sets the list of invalid parameter error details as immutable to prevent exposing mutable
+   * state.
+   *
+   * @param details
+   */
+  public void setDetails(List<Details> details) {
+    this.details = ImmutableList.copyOf(details);
+  }
+
   @Override
   public GoogleJsonError set(String fieldName, Object value) {
     return (GoogleJsonError) super.set(fieldName, value);
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainer.java b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainer.java
index 547eb027f..294541428 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainer.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -25,8 +25,7 @@
  */
 public class GoogleJsonErrorContainer extends GenericJson {
 
-  @Key
-  private GoogleJsonError error;
+  @Key private GoogleJsonError error;
 
   /** Returns the {@link GoogleJsonError}. */
   public final GoogleJsonError getError() {
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonResponseException.java b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonResponseException.java
index c5bd0dab2..370db3e63 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonResponseException.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/json/GoogleJsonResponseException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -24,29 +24,26 @@
 import com.google.api.client.json.JsonToken;
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.StringUtils;
-
 import java.io.IOException;
 
 /**
  * Exception thrown when an error status code is detected in an HTTP response to a Google API that
  * uses the JSON format, using the format specified in <a
- * href="http://code.google.com/apis/urlshortener/v1/getting_started.html#errors">Error
+ * href="https://developers.google.com/url-shortener/v1/getting_started?csw=1#errors">Error
  * Responses</a>.
  *
- * <p>
- * To execute a request, call {@link #execute(JsonFactory, HttpRequest)}. This will throw a
+ * <p>To execute a request, call {@link #execute(JsonFactory, HttpRequest)}. This will throw a
  * {@link GoogleJsonResponseException} on an error response. To get the structured details, use
  * {@link #getDetails()}.
- * </p>
  *
  * <pre>
-  static void executeShowingError(JsonFactory factory, HttpRequest request) throws IOException {
-    try {
-      GoogleJsonResponseException.execute(factory, request);
-    } catch (GoogleJsonResponseException e) {
-      System.err.println(e.getDetails());
-    }
-  }
+ * static void executeShowingError(JsonFactory factory, HttpRequest request) throws IOException {
+ * try {
+ * GoogleJsonResponseException.execute(factory, request);
+ * } catch (GoogleJsonResponseException e) {
+ * System.err.println(e.getDetails());
+ * }
+ * }
  * </pre>
  *
  * @since 1.6
@@ -80,19 +77,18 @@ public final GoogleJsonError getDetails() {
   /**
    * Returns a new instance of {@link GoogleJsonResponseException}.
    *
-   * <p>
-   * If there is a JSON error response, it is parsed using {@link GoogleJsonError}, which can be
+   * <p>If there is a JSON error response, it is parsed using {@link GoogleJsonError}, which can be
    * inspected using {@link #getDetails()}. Otherwise, the full response content is read and
    * included in the exception message.
-   * </p>
    *
    * @param jsonFactory JSON factory
    * @param response HTTP response
    * @return new instance of {@link GoogleJsonResponseException}
    */
   public static GoogleJsonResponseException from(JsonFactory jsonFactory, HttpResponse response) {
-    HttpResponseException.Builder builder = new HttpResponseException.Builder(
-        response.getStatusCode(), response.getStatusMessage(), response.getHeaders());
+    HttpResponseException.Builder builder =
+        new HttpResponseException.Builder(
+            response.getStatusCode(), response.getStatusMessage(), response.getHeaders());
     // details
     Preconditions.checkNotNull(jsonFactory);
     GoogleJsonError details = null;
@@ -151,30 +147,28 @@ public static GoogleJsonResponseException from(JsonFactory jsonFactory, HttpResp
   }
 
   /**
-   * Executes an HTTP request using {@link HttpRequest#execute()}, but throws a
-   * {@link GoogleJsonResponseException} on error instead of {@link HttpResponseException}.
+   * Executes an HTTP request using {@link HttpRequest#execute()}, but throws a {@link
+   * GoogleJsonResponseException} on error instead of {@link HttpResponseException}.
    *
-   * <p>
-   * Callers should call {@link HttpResponse#disconnect} when the returned HTTP response object is
-   * no longer needed. However, {@link HttpResponse#disconnect} does not have to be called if the
+   * <p>Callers should call {@link HttpResponse#disconnect} when the returned HTTP response object
+   * is no longer needed. However, {@link HttpResponse#disconnect} does not have to be called if the
    * response stream is properly closed. Example usage:
-   * </p>
    *
    * <pre>
-     HttpResponse response = GoogleJsonResponseException.execute(jsonFactory, request);
-     try {
-       // process the HTTP response object
-     } finally {
-       response.disconnect();
-     }
+   * HttpResponse response = GoogleJsonResponseException.execute(jsonFactory, request);
+   * try {
+   * // process the HTTP response object
+   * } finally {
+   * response.disconnect();
+   * }
    * </pre>
    *
    * @param jsonFactory JSON factory
    * @param request HTTP request
-   * @return HTTP response for an HTTP success code (or error code if
-   *         {@link HttpRequest#getThrowExceptionOnExecuteError()})
-   * @throws GoogleJsonResponseException for an HTTP error code (only if not
-   *         {@link HttpRequest#getThrowExceptionOnExecuteError()})
+   * @return HTTP response for an HTTP success code (or error code if {@link
+   *     HttpRequest#getThrowExceptionOnExecuteError()})
+   * @throws GoogleJsonResponseException for an HTTP error code (only if not {@link
+   *     HttpRequest#getThrowExceptionOnExecuteError()})
    * @throws IOException some other kind of I/O exception
    * @since 1.7
    */
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/json/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/json/package-info.java
index 96469344e..d3c81065c 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/json/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/json/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 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
@@ -17,8 +17,7 @@
  *
  * <h2>Package Specification</h2>
  *
- * <p>
- * User-defined Partial JSON data models allow you to defined Plain Old Java Objects (POJO's) to
+ * <p>User-defined Partial JSON data models allow you to defined Plain Old Java Objects (POJO's) to
  * define how the library should parse/serialize JSON. Each field that should be included must have
  * an @{@link com.google.api.client.util.Key} annotation. The field can be of any visibility
  * (private, package private, protected, or public) and must not be static. By default, the field
@@ -26,160 +25,143 @@
  * optional value parameter of the annotation, for example {@code @Key("name")}. Any unrecognized
  * keys from the JSON are normally simply ignored and not stored. If the ability to store unknown
  * keys is important, use {@link com.google.api.client.json.GenericJson}.
- * </p>
  *
- * <p>
- * Let's take a look at a typical partial JSON-C video feed from the YouTube Data API (as specified
- * in <a href="http://code.google.com/apis/youtube/2.0/developers_guide_jsonc.html">YouTube
+ * <p>Let's take a look at a typical partial JSON-C video feed from the YouTube Data API (as
+ * specified in <a href="https://developers.google.com/youtube/v3/code_samples/?csw=1">YouTube
  * Developer's Guide: JSON-C / JavaScript</a>)
- * </p>
  *
  * <pre><code>
- "data":{
-    "updated":"2010-01-07T19:58:42.949Z",
-    "totalItems":800,
-    "startIndex":1,
-    "itemsPerPage":1,
-    "items":[
-        {"id":"hYB0mn5zh2c",
-         "updated":"2010-01-07T13:26:50.000Z",
-         "title":"Google Developers Day US - Maps API Introduction",
-         "description":"Google Maps API Introduction ...",
-         "tags":[
-            "GDD07","GDD07US","Maps"
-         ],
-         "player":{
-            "default":"http://www.youtube.com/watch?v\u003dhYB0mn5zh2c"
-         },
-...
-        }
-    ]
- }
-</code></pre>
- *
- * <p>
- * Here's one possible way to design the Java data classes for this (each class in its own Java
+ * "data":{
+ * "updated":"2010-01-07T19:58:42.949Z",
+ * "totalItems":800,
+ * "startIndex":1,
+ * "itemsPerPage":1,
+ * "items":[
+ * {"id":"hYB0mn5zh2c",
+ * "updated":"2010-01-07T13:26:50.000Z",
+ * "title":"Google Developers Day US - Maps API Introduction",
+ * "description":"Google Maps API Introduction ...",
+ * "tags":[
+ * "GDD07","GDD07US","Maps"
+ * ],
+ * "player":{
+ * "default":"http://www.youtube.com/watch?v\u003dhYB0mn5zh2c"
+ * },
+ * ...
+ * }
+ * ]
+ * }
+ * </code></pre>
+ *
+ * <p>Here's one possible way to design the Java data classes for this (each class in its own Java
  * file):
- * </p>
  *
  * <pre><code>
-import com.google.api.client.util.*;
-import java.util.List;
-
-  public class VideoFeed {
-    &#64;Key public int itemsPerPage;
-    &#64;Key public int startIndex;
-    &#64;Key public int totalItems;
-    &#64;Key public DateTime updated;
-    &#64;Key public List&lt;Video&gt; items;
-  }
-
-  public class Video {
-    &#64;Key public String id;
-    &#64;Key public String title;
-    &#64;Key public DateTime updated;
-    &#64;Key public String description;
-    &#64;Key public List&lt;String&gt; tags;
-    &#64;Key public Player player;
-  }
-
-  public class Player {
-    // "default" is a Java keyword, so need to specify the JSON key manually
-    &#64;Key("default")
-    public String defaultUrl;
-  }
-</code></pre>
- *
- * <p>
- * You can also use the @{@link com.google.api.client.util.Key} annotation to defined query
+ * import com.google.api.client.util.*;
+ * import java.util.List;
+ *
+ * public class VideoFeed {
+ * &#64;Key public int itemsPerPage;
+ * &#64;Key public int startIndex;
+ * &#64;Key public int totalItems;
+ * &#64;Key public DateTime updated;
+ * &#64;Key public List&lt;Video&gt; items;
+ * }
+ *
+ * public class Video {
+ * &#64;Key public String id;
+ * &#64;Key public String title;
+ * &#64;Key public DateTime updated;
+ * &#64;Key public String description;
+ * &#64;Key public List&lt;String&gt; tags;
+ * &#64;Key public Player player;
+ * }
+ *
+ * public class Player {
+ * // "default" is a Java keyword, so need to specify the JSON key manually
+ * &#64;Key("default")
+ * public String defaultUrl;
+ * }
+ * </code></pre>
+ *
+ * <p>You can also use the @{@link com.google.api.client.util.Key} annotation to defined query
  * parameters for a URL. For example:
- * </p>
  *
  * <pre><code>
-public class YouTubeUrl extends GoogleUrl {
-
-  &#64;Key
-  public String author;
-
-  &#64;Key("max-results")
-  public Integer maxResults;
-
-  public YouTubeUrl(String encodedUrl) {
-    super(encodedUrl);
-    this.alt = "jsonc";
-  }
-</code></pre>
+ * public class YouTubeUrl extends GoogleUrl {
  *
- * <p>
- * To work with the YouTube API, you first need to set up the
- * {@link com.google.api.client.http.HttpTransport}. For example:
- * </p>
+ * &#64;Key
+ * public String author;
+ *
+ * &#64;Key("max-results")
+ * public Integer maxResults;
+ *
+ * public YouTubeUrl(String encodedUrl) {
+ * super(encodedUrl);
+ * this.alt = "jsonc";
+ * }
+ * </code></pre>
+ *
+ * <p>To work with the YouTube API, you first need to set up the {@link
+ * com.google.api.client.http.HttpTransport}. For example:
  *
  * <pre><code>
-  private static HttpTransport setUpTransport() throws IOException {
-    HttpTransport result = new NetHttpTransport();
-    GoogleUtils.useMethodOverride(result);
-    HttpHeaders headers = new HttpHeaders();
-    headers.setApplicationName("Google-YouTubeSample/1.0");
-    headers.gdataVersion = "2";
-    JsonCParser parser = new JsonCParser();
-    parser.jsonFactory = new JacksonFactory();
-    transport.addParser(parser);
-    // insert authentication code...
-    return transport;
-  }
-</code></pre>
- *
- * <p>
- * Now that we have a transport, we can execute a request to the YouTube API and parse the result:
- * </p>
+ * private static HttpTransport setUpTransport() throws IOException {
+ * HttpTransport result = new NetHttpTransport();
+ * GoogleUtils.useMethodOverride(result);
+ * HttpHeaders headers = new HttpHeaders();
+ * headers.setApplicationName("Google-YouTubeSample/1.0");
+ * headers.gdataVersion = "2";
+ * JsonCParser parser = new JsonCParser();
+ * parser.jsonFactory = new GsonFactory();
+ * transport.addParser(parser);
+ * // insert authentication code...
+ * return transport;
+ * }
+ * </code></pre>
+ *
+ * <p>Now that we have a transport, we can execute a request to the YouTube API and parse the
+ * result:
  *
  * <pre><code>
-  public static VideoFeed list(HttpTransport transport, YouTubeUrl url)
-      throws IOException {
-    HttpRequest request = transport.buildGetRequest();
-    request.url = url;
-    return request.execute().parseAs(VideoFeed.class);
-  }
-</code></pre>
- *
- * <p>
- * If the server responds with an error the {@link com.google.api.client.http.HttpRequest#execute}
- * method will throw an {@link com.google.api.client.http.HttpResponseException}, which has an
- * {@link com.google.api.client.http.HttpResponse} field which can be parsed the same way as a
- * success response inside of a catch block. For example:
- * </p>
+ * public static VideoFeed list(HttpTransport transport, YouTubeUrl url)
+ * throws IOException {
+ * HttpRequest request = transport.buildGetRequest();
+ * request.url = url;
+ * return request.execute().parseAs(VideoFeed.class);
+ * }
+ * </code></pre>
+ *
+ * <p>If the server responds with an error the {@link
+ * com.google.api.client.http.HttpRequest#execute} method will throw an {@link
+ * com.google.api.client.http.HttpResponseException}, which has an {@link
+ * com.google.api.client.http.HttpResponse} field which can be parsed the same way as a success
+ * response inside of a catch block. For example:
  *
  * <pre><code>
-    try {
-...
-    } catch (HttpResponseException e) {
-      if (e.response.getParser() != null) {
-        Error error = e.response.parseAs(Error.class);
-        // process error response
-      } else {
-        String errorContentString = e.response.parseAsString();
-        // process error response as string
-      }
-      throw e;
-    }
-</code></pre>
- *
- * <p>
- * NOTE: As you might guess, the library uses reflection to populate the user-defined data model.
+ * try {
+ * ...
+ * } catch (HttpResponseException e) {
+ * if (e.response.getParser() != null) {
+ * Error error = e.response.parseAs(Error.class);
+ * // process error response
+ * } else {
+ * String errorContentString = e.response.parseAsString();
+ * // process error response as string
+ * }
+ * throw e;
+ * }
+ * </code></pre>
+ *
+ * <p>NOTE: As you might guess, the library uses reflection to populate the user-defined data model.
  * It's not quite as fast as writing the wire format parsing code yourself can potentially be, but
  * it's a lot easier.
- * </p>
  *
- * <p>
- * NOTE: If you prefer to use your favorite JSON parsing library instead (there are many of them
+ * <p>NOTE: If you prefer to use your favorite JSON parsing library instead (there are many of them
  * listed for example on <a href="http://json.org">json.org</a>), that's supported as well. Just
  * call {@link com.google.api.client.http.HttpRequest#execute()} and parse the returned byte stream.
- * </p>
  *
  * @since 1.0
  * @author Yaniv Inbar
  */
-
 package com.google.api.client.googleapis.json;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java
index 38b408747..a1ecdff39 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -14,6 +14,8 @@
 
 package com.google.api.client.googleapis.media;
 
+import static com.google.common.base.MoreObjects.firstNonNull;
+
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpBackOffIOExceptionHandler;
 import com.google.api.client.http.HttpBackOffUnsuccessfulResponseHandler;
@@ -23,42 +25,33 @@
 import com.google.api.client.http.HttpRequestInitializer;
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.HttpTransport;
-import com.google.api.client.util.IOUtils;
 import com.google.api.client.util.Preconditions;
+import com.google.common.io.ByteStreams;
 import java.io.IOException;
 import java.io.OutputStream;
 
 /**
  * Media HTTP Downloader, with support for both direct and resumable media downloads. Documentation
  * is available <a
- * href='http://code.google.com/p/google-api-java-client/wiki/MediaDownload'>here</a>.
+ * href='https://developers.google.com/api-client-library/java/google-api-java-client/media-download'>here</a>.
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
- * <p>
- * Back-off is disabled by default. To enable it for an abnormal HTTP response and an I/O exception
- * you should call {@link HttpRequest#setUnsuccessfulResponseHandler} with a new
- * {@link HttpBackOffUnsuccessfulResponseHandler} instance and
- * {@link HttpRequest#setIOExceptionHandler} with {@link HttpBackOffIOExceptionHandler}.
- * </p>
+ * <p>Back-off is disabled by default. To enable it for an abnormal HTTP response and an I/O
+ * exception you should call {@link HttpRequest#setUnsuccessfulResponseHandler} with a new {@link
+ * HttpBackOffUnsuccessfulResponseHandler} instance and {@link HttpRequest#setIOExceptionHandler}
+ * with {@link HttpBackOffIOExceptionHandler}.
  *
- * <p>
- * Upgrade warning: in prior version 1.14 exponential back-off was enabled by default for an
+ * <p>Upgrade warning: in prior version 1.14 exponential back-off was enabled by default for an
  * abnormal HTTP response. Starting with version 1.15 it's disabled by default.
- * </p>
  *
  * @since 1.9
- *
  * @author rmistry@google.com (Ravi Mistry)
  */
 @SuppressWarnings("deprecation")
 public final class MediaHttpDownloader {
 
-  /**
-   * Download state associated with the Media HTTP downloader.
-   */
+  /** Download state associated with the Media HTTP downloader. */
   public enum DownloadState {
     /** The download process has not started yet. */
     NOT_STARTED,
@@ -83,16 +76,14 @@ public enum DownloadState {
   private final HttpTransport transport;
 
   /**
-   * Determines whether direct media download is enabled or disabled. If value is set to
-   * {@code true} then a direct download will be done where the whole media content is downloaded in
-   * a single request. If value is set to {@code false} then the download uses the resumable media
+   * Determines whether direct media download is enabled or disabled. If value is set to {@code
+   * true} then a direct download will be done where the whole media content is downloaded in a
+   * single request. If value is set to {@code false} then the download uses the resumable media
    * download protocol to download in data chunks. Defaults to {@code false}.
    */
   private boolean directDownloadEnabled = false;
 
-  /**
-   * Progress listener to send progress notifications to or {@code null} for none.
-   */
+  /** Progress listener to send progress notifications to or {@code null} for none. */
   private MediaHttpDownloaderProgressListener progressListener;
 
   /**
@@ -102,8 +93,8 @@ public enum DownloadState {
   private int chunkSize = MAXIMUM_CHUNK_SIZE;
 
   /**
-   * The length of the HTTP media content or {@code 0} before it is initialized in
-   * {@link #setMediaContentLength}.
+   * The length of the HTTP media content or {@code 0} before it is initialized in {@link
+   * #setMediaContentLength}.
    */
   private long mediaContentLength;
 
@@ -116,9 +107,7 @@ public enum DownloadState {
   /**
    * The last byte position of the media file we want to download, default value is {@code -1}.
    *
-   * <p>
-   * If its value is {@code -1} it means there is no upper limit on the byte position.
-   * </p>
+   * <p>If its value is {@code -1} it means there is no upper limit on the byte position.
    */
   private long lastBytePos = -1;
 
@@ -127,26 +116,24 @@ public enum DownloadState {
    *
    * @param transport The transport to use for requests
    * @param httpRequestInitializer The initializer to use when creating an {@link HttpRequest} or
-   *        {@code null} for none
+   *     {@code null} for none
    */
   public MediaHttpDownloader(
       HttpTransport transport, HttpRequestInitializer httpRequestInitializer) {
     this.transport = Preconditions.checkNotNull(transport);
-    this.requestFactory = httpRequestInitializer == null
-        ? transport.createRequestFactory() : transport.createRequestFactory(httpRequestInitializer);
+    this.requestFactory =
+        httpRequestInitializer == null
+            ? transport.createRequestFactory()
+            : transport.createRequestFactory(httpRequestInitializer);
   }
 
   /**
    * Executes a direct media download or a resumable media download.
    *
-   * <p>
-   * This method does not close the given output stream.
-   * </p>
+   * <p>This method does not close the given output stream.
    *
-   * <p>
-   * This method is not reentrant. A new instance of {@link MediaHttpDownloader} must be
+   * <p>This method is not reentrant. A new instance of {@link MediaHttpDownloader} must be
    * instantiated before download called be called again.
-   * </p>
    *
    * @param requestUrl The request URL where the download requests will be sent
    * @param outputStream destination output stream
@@ -158,14 +145,10 @@ public void download(GenericUrl requestUrl, OutputStream outputStream) throws IO
   /**
    * Executes a direct media download or a resumable media download.
    *
-   * <p>
-   * This method does not close the given output stream.
-   * </p>
+   * <p>This method does not close the given output stream.
    *
-   * <p>
-   * This method is not reentrant. A new instance of {@link MediaHttpDownloader} must be
+   * <p>This method is not reentrant. A new instance of {@link MediaHttpDownloader} must be
    * instantiated before download called be called again.
-   * </p>
    *
    * @param requestUrl request URL where the download requests will be sent
    * @param requestHeaders request headers or {@code null} to ignore
@@ -182,7 +165,8 @@ public void download(GenericUrl requestUrl, HttpHeaders requestHeaders, OutputSt
       HttpResponse response =
           executeCurrentRequest(lastBytePos, requestUrl, requestHeaders, outputStream);
       // All required bytes have been downloaded from the server.
-      mediaContentLength = response.getHeaders().getContentLength();
+      mediaContentLength =
+          firstNonNull(response.getHeaders().getContentLength(), mediaContentLength);
       bytesDownloaded = mediaContentLength;
       updateStateAndNotifyListener(DownloadState.MEDIA_COMPLETE);
       return;
@@ -192,15 +176,24 @@ public void download(GenericUrl requestUrl, HttpHeaders requestHeaders, OutputSt
     while (true) {
       long currentRequestLastBytePos = bytesDownloaded + chunkSize - 1;
       if (lastBytePos != -1) {
-        // If last byte position has been specified use it iff it is smaller than the chunksize.
+        // If last byte position has been specified, use it iff it is smaller than the chunk size.
         currentRequestLastBytePos = Math.min(lastBytePos, currentRequestLastBytePos);
       }
-      HttpResponse response = executeCurrentRequest(
-          currentRequestLastBytePos, requestUrl, requestHeaders, outputStream);
+      HttpResponse response =
+          executeCurrentRequest(
+              currentRequestLastBytePos, requestUrl, requestHeaders, outputStream);
 
       String contentRange = response.getHeaders().getContentRange();
       long nextByteIndex = getNextByteIndex(contentRange);
       setMediaContentLength(contentRange);
+      // If the last byte position is specified, complete the download when it is less than
+      // nextByteIndex.
+      if (lastBytePos != -1 && lastBytePos <= nextByteIndex) {
+        // All required bytes from the range have been downloaded from the server.
+        bytesDownloaded = lastBytePos;
+        updateStateAndNotifyListener(DownloadState.MEDIA_COMPLETE);
+        return;
+      }
 
       if (mediaContentLength <= nextByteIndex) {
         // All required bytes have been downloaded from the server.
@@ -223,8 +216,12 @@ public void download(GenericUrl requestUrl, HttpHeaders requestHeaders, OutputSt
    * @param outputStream destination output stream
    * @return HTTP response
    */
-  private HttpResponse executeCurrentRequest(long currentRequestLastBytePos, GenericUrl requestUrl,
-      HttpHeaders requestHeaders, OutputStream outputStream) throws IOException {
+  private HttpResponse executeCurrentRequest(
+      long currentRequestLastBytePos,
+      GenericUrl requestUrl,
+      HttpHeaders requestHeaders,
+      OutputStream outputStream)
+      throws IOException {
     // prepare the GET request
     HttpRequest request = requestFactory.buildGetRequest(requestUrl);
     // add request headers
@@ -243,7 +240,7 @@ private HttpResponse executeCurrentRequest(long currentRequestLastBytePos, Gener
     // execute the request and copy into the output stream
     HttpResponse response = request.execute();
     try {
-      IOUtils.copy(response.getContent(), outputStream);
+      ByteStreams.copy(response.getContent(), outputStream);
     } finally {
       response.disconnect();
     }
@@ -263,21 +260,18 @@ private long getNextByteIndex(String rangeHeader) {
       return 0L;
     }
     return Long.parseLong(
-        rangeHeader.substring(rangeHeader.indexOf('-') + 1, rangeHeader.indexOf('/'))) + 1;
+            rangeHeader.substring(rangeHeader.indexOf('-') + 1, rangeHeader.indexOf('/')))
+        + 1;
   }
 
   /**
    * Sets the total number of bytes that have been downloaded of the media resource.
    *
-   * <p>
-   * If a download was aborted mid-way due to a connection failure then users can resume the
+   * <p>If a download was aborted mid-way due to a connection failure then users can resume the
    * download from the point where it left off.
-   * </p>
    *
-   * <p>
-   * Use {@link #setContentRange} if you need to specify both the bytes downloaded and the last byte
-   * position.
-   * </p>
+   * <p>Use {@link #setContentRange} if you need to specify both the bytes downloaded and the last
+   * byte position.
    *
    * @param bytesDownloaded The total number of bytes downloaded
    */
@@ -306,9 +300,7 @@ public MediaHttpDownloader setContentRange(long firstBytePos, long lastBytePos)
     return this;
   }
 
-  /**
-   * @deprecated Use {@link #setContentRange(long, long)} instead.
-   */
+  /** @deprecated Use {@link #setContentRange(long, long)} instead. */
   @Deprecated
   public MediaHttpDownloader setContentRange(long firstBytePos, int lastBytePos) {
     return setContentRange(firstBytePos, (long) lastBytePos);
@@ -351,18 +343,14 @@ public MediaHttpDownloader setDirectDownloadEnabled(boolean directDownloadEnable
     return this;
   }
 
-  /**
-   * Sets the progress listener to send progress notifications to or {@code null} for none.
-   */
+  /** Sets the progress listener to send progress notifications to or {@code null} for none. */
   public MediaHttpDownloader setProgressListener(
       MediaHttpDownloaderProgressListener progressListener) {
     this.progressListener = progressListener;
     return this;
   }
 
-  /**
-   * Returns the progress listener to send progress notifications to or {@code null} for none.
-   */
+  /** Returns the progress listener to send progress notifications to or {@code null} for none. */
   public MediaHttpDownloaderProgressListener getProgressListener() {
     return progressListener;
   }
@@ -376,9 +364,7 @@ public HttpTransport getTransport() {
    * Sets the maximum size of individual chunks that will get downloaded by single HTTP requests.
    * The default value is {@link #MAXIMUM_CHUNK_SIZE}.
    *
-   * <p>
-   * The maximum allowable value is {@link #MAXIMUM_CHUNK_SIZE}.
-   * </p>
+   * <p>The maximum allowable value is {@link #MAXIMUM_CHUNK_SIZE}.
    */
   public MediaHttpDownloader setChunkSize(int chunkSize) {
     Preconditions.checkArgument(chunkSize > 0 && chunkSize <= MAXIMUM_CHUNK_SIZE);
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloaderProgressListener.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloaderProgressListener.java
index 064b2def4..639556024 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloaderProgressListener.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpDownloaderProgressListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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,25 +19,23 @@
 /**
  * An interface for receiving progress notifications for downloads.
  *
- * <p>
- * Sample usage:
- * </p>
+ * <p>Sample usage:
  *
  * <pre>
-  public static class MyDownloadProgressListener implements MediaHttpDownloaderProgressListener {
-
-    public void progressChanged(MediaHttpDownloader downloader) throws IOException {
-      switch (downloader.getDownloadState()) {
-        case MEDIA_IN_PROGRESS:
-          System.out.println("Download in progress");
-          System.out.println("Download percentage: " + downloader.getProgress());
-          break;
-        case MEDIA_COMPLETE:
-          System.out.println("Download Completed!");
-          break;
-      }
-    }
-  }
+ * public static class MyDownloadProgressListener implements MediaHttpDownloaderProgressListener {
+ *
+ * public void progressChanged(MediaHttpDownloader downloader) throws IOException {
+ * switch (downloader.getDownloadState()) {
+ * case MEDIA_IN_PROGRESS:
+ * System.out.println("Download in progress");
+ * System.out.println("Download percentage: " + downloader.getProgress());
+ * break;
+ * case MEDIA_COMPLETE:
+ * System.out.println("Download Completed!");
+ * break;
+ * }
+ * }
+ * }
  * </pre>
  *
  * @since 1.9
@@ -48,15 +46,11 @@ public interface MediaHttpDownloaderProgressListener {
   /**
    * Called to notify that progress has been changed.
    *
-   * <p>
-   * This method is called multiple times depending on how many chunks are downloaded. Once the
+   * <p>This method is called multiple times depending on how many chunks are downloaded. Once the
    * download completes it is called one final time.
-   * </p>
    *
-   * <p>
-   * The download state can be queried by calling {@link MediaHttpDownloader#getDownloadState} and
-   * the progress by calling {@link MediaHttpDownloader#getProgress}.
-   * </p>
+   * <p>The download state can be queried by calling {@link MediaHttpDownloader#getDownloadState}
+   * and the progress by calling {@link MediaHttpDownloader#getProgress}.
    *
    * @param downloader Media HTTP downloader
    */
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java
index 5e54b6d74..0d85e8e9f 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploader.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -36,7 +36,6 @@
 import com.google.api.client.util.ByteStreams;
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.Sleeper;
-
 import java.io.BufferedInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -44,47 +43,35 @@
 
 /**
  * Media HTTP Uploader, with support for both direct and resumable media uploads. Documentation is
- * available <a href='http://code.google.com/p/google-api-java-client/wiki/MediaUpload'>here</a>.
+ * available <a
+ * href='https://googleapis.github.io/google-api-java-client/media-upload.html'>here</a>.
  *
- * <p>
- * For resumable uploads, when the media content length is known, if the provided
- * {@link InputStream} has {@link InputStream#markSupported} as {@code false} then it is wrapped in
- * an {@link BufferedInputStream} to support the {@link InputStream#mark} and
- * {@link InputStream#reset} methods required for handling server errors. If the media content
- * length is unknown then each chunk is stored temporarily in memory. This is required to determine
- * when the last chunk is reached.
- * </p>
+ * <p>For resumable uploads, when the media content length is known, if the provided {@link
+ * InputStream} has {@link InputStream#markSupported} as {@code false} then it is wrapped in an
+ * {@link BufferedInputStream} to support the {@link InputStream#mark} and {@link InputStream#reset}
+ * methods required for handling server errors. If the media content length is unknown then each
+ * chunk is stored temporarily in memory. This is required to determine when the last chunk is
+ * reached.
  *
- * <p>
- * See {@link #setDisableGZipContent(boolean)} for information on when content is gzipped and how to
- * control that behavior.
- * </p>
+ * <p>See {@link #setDisableGZipContent(boolean)} for information on when content is gzipped and how
+ * to control that behavior.
  *
- * <p>
- * Back-off is disabled by default. To enable it for an abnormal HTTP response and an I/O exception
- * you should call {@link HttpRequest#setUnsuccessfulResponseHandler} with a new
- * {@link HttpBackOffUnsuccessfulResponseHandler} instance and
- * {@link HttpRequest#setIOExceptionHandler} with {@link HttpBackOffIOExceptionHandler}.
- * </p>
+ * <p>Back-off is disabled by default. To enable it for an abnormal HTTP response and an I/O
+ * exception you should call {@link HttpRequest#setUnsuccessfulResponseHandler} with a new {@link
+ * HttpBackOffUnsuccessfulResponseHandler} instance and {@link HttpRequest#setIOExceptionHandler}
+ * with {@link HttpBackOffIOExceptionHandler}.
  *
- * <p>
- * Upgrade warning: in prior version 1.14 exponential back-off was enabled by default for an
+ * <p>Upgrade warning: in prior version 1.14 exponential back-off was enabled by default for an
  * abnormal HTTP response and there was a regular retry (without back-off) when I/O exception was
  * thrown. Starting with version 1.15 back-off is disabled and there is no retry on I/O exception by
  * default.
- * </p>
  *
- * <p>
- * Upgrade warning: in prior version 1.16 {@link #serverErrorCallback} was public but starting with
- * version 1.17 it has been removed from the public API, and changed to be package private.
- * </p>
+ * <p>Upgrade warning: in prior version 1.16 {@link #serverErrorCallback} was public but starting
+ * with version 1.17 it has been removed from the public API, and changed to be package private.
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @since 1.9
- *
  * @author rmistry@google.com (Ravi Mistry)
  * @author peleyal@google.com (Eyal Peled)
  */
@@ -105,9 +92,7 @@ public final class MediaHttpUploader {
    */
   public static final String CONTENT_TYPE_HEADER = "X-Upload-Content-Type";
 
-  /**
-   * Upload state associated with the Media HTTP uploader.
-   */
+  /** Upload state associated with the Media HTTP uploader. */
   public enum UploadState {
     /** The upload process has not started yet. */
     NOT_STARTED,
@@ -131,9 +116,7 @@ public enum UploadState {
   static final int MB = 0x100000;
   private static final int KB = 0x400;
 
-  /**
-   * Minimum number of bytes that can be uploaded to the server (set to 256KB).
-   */
+  /** Minimum number of bytes that can be uploaded to the server (set to 256KB). */
   public static final int MINIMUM_CHUNK_SIZE = 256 * KB;
 
   /**
@@ -157,11 +140,9 @@ public enum UploadState {
   /**
    * The length of the HTTP media content.
    *
-   * <p>
-   * {@code 0} before it is lazily initialized in {@link #getMediaContentLength()} after which it
+   * <p>{@code 0} before it is lazily initialized in {@link #getMediaContentLength()} after which it
    * could still be {@code 0} for empty media content. Will be {@code < 0} if the media content
    * length has not been specified.
-   * </p>
    */
   private long mediaContentLength;
 
@@ -173,10 +154,8 @@ public enum UploadState {
   /**
    * The HTTP method used for the initiation request.
    *
-   * <p>
-   * Can only be {@link HttpMethods#POST} (for media upload) or {@link HttpMethods#PUT} (for media
-   * update). The default value is {@link HttpMethods#POST}.
-   * </p>
+   * <p>Can only be {@link HttpMethods#POST} (for media upload) or {@link HttpMethods#PUT} (for
+   * media update). The default value is {@link HttpMethods#POST}.
    */
   private String initiationRequestMethod = HttpMethods.POST;
 
@@ -200,9 +179,7 @@ public enum UploadState {
    */
   private boolean directUploadEnabled;
 
-  /**
-   * Progress listener to send progress notifications to or {@code null} for none.
-   */
+  /** Progress listener to send progress notifications to or {@code null} for none. */
   private MediaHttpUploaderProgressListener progressListener;
 
   /**
@@ -246,82 +223,77 @@ public enum UploadState {
   /**
    * The content buffer of the current request or {@code null} for none. It is used for resumable
    * media upload when the media content length is not specified. It is instantiated for every
-   * request in {@link #setContentAndHeadersOnCurrentRequest} and is set to {@code null} when the
-   * request is completed in {@link #upload}.
+   * request in {@link #buildContentChunk()} and is set to {@code null} when the request is
+   * completed in {@link #upload}.
    */
   private byte currentRequestContentBuffer[];
 
   /**
    * Whether to disable GZip compression of HTTP content.
    *
-   * <p>
-   * The default value is {@code false}.
-   * </p>
+   * <p>The default value is {@code false}.
    */
   private boolean disableGZipContent;
 
-  /** Sleeper. **/
+  /** Sleeper. * */
   Sleeper sleeper = Sleeper.DEFAULT;
 
   /**
    * Construct the {@link MediaHttpUploader}.
    *
-   * <p>
-   * The input stream received by calling {@link AbstractInputStreamContent#getInputStream} is
+   * <p>The input stream received by calling {@link AbstractInputStreamContent#getInputStream} is
    * closed when the upload process is successfully completed. For resumable uploads, when the media
-   * content length is known, if the input stream has {@link InputStream#markSupported} as
-   * {@code false} then it is wrapped in an {@link BufferedInputStream} to support the
-   * {@link InputStream#mark} and {@link InputStream#reset} methods required for handling server
-   * errors. If the media content length is unknown then each chunk is stored temporarily in memory.
-   * This is required to determine when the last chunk is reached.
-   * </p>
+   * content length is known, if the input stream has {@link InputStream#markSupported} as {@code
+   * false} then it is wrapped in an {@link BufferedInputStream} to support the {@link
+   * InputStream#mark} and {@link InputStream#reset} methods required for handling server errors. If
+   * the media content length is unknown then each chunk is stored temporarily in memory. This is
+   * required to determine when the last chunk is reached.
    *
    * @param mediaContent The Input stream content of the media to be uploaded
    * @param transport The transport to use for requests
    * @param httpRequestInitializer The initializer to use when creating an {@link HttpRequest} or
-   *        {@code null} for none
+   *     {@code null} for none
    */
-  public MediaHttpUploader(AbstractInputStreamContent mediaContent, HttpTransport transport,
+  public MediaHttpUploader(
+      AbstractInputStreamContent mediaContent,
+      HttpTransport transport,
       HttpRequestInitializer httpRequestInitializer) {
     this.mediaContent = Preconditions.checkNotNull(mediaContent);
     this.transport = Preconditions.checkNotNull(transport);
-    this.requestFactory = httpRequestInitializer == null
-        ? transport.createRequestFactory() : transport.createRequestFactory(httpRequestInitializer);
+    this.requestFactory =
+        httpRequestInitializer == null
+            ? transport.createRequestFactory()
+            : transport.createRequestFactory(httpRequestInitializer);
   }
 
   /**
    * Executes a direct media upload or resumable media upload conforming to the specifications
-   * listed <a href='http://code.google.com/apis/gdata/docs/resumable_upload.html'>here.</a>
+   * listed <a
+   * href='https://developers.google.com/api-client-library/java/google-api-java-client/media-upload'>here.</a>
    *
-   * <p>
-   * This method is not reentrant. A new instance of {@link MediaHttpUploader} must be instantiated
-   * before upload called be called again.
-   * </p>
+   * <p>This method is not reentrant. A new instance of {@link MediaHttpUploader} must be
+   * instantiated before upload called be called again.
    *
-   * <p>
-   * If an error is encountered during the request execution the caller is responsible for parsing
-   * the response correctly. For example for JSON errors:
-   * </p>
+   * <p>If an error is encountered during the request execution the caller is responsible for
+   * parsing the response correctly. For example for JSON errors:
    *
    * <pre>
-    if (!response.isSuccessStatusCode()) {
-      throw GoogleJsonResponseException.from(jsonFactory, response);
-    }
+   * if (!response.isSuccessStatusCode()) {
+   * throw GoogleJsonResponseException.from(jsonFactory, response);
+   * }
    * </pre>
    *
-   * <p>
-   * Callers should call {@link HttpResponse#disconnect} when the returned HTTP response object is
-   * no longer needed. However, {@link HttpResponse#disconnect} does not have to be called if the
+   * <p>Callers should call {@link HttpResponse#disconnect} when the returned HTTP response object
+   * is no longer needed. However, {@link HttpResponse#disconnect} does not have to be called if the
    * response stream is properly closed. Example usage:
-   * </p>
    *
    * <pre>
-     HttpResponse response = batch.upload(initiationRequestUrl);
-     try {
-       // process the HTTP response object
-     } finally {
-       response.disconnect();
-     }
+   * HttpResponse response = batch.upload(initiationRequestUrl);
+   * try {
+   * // process the HTTP response object
+   * } finally {
+   * response.disconnect();
+   * }
    * </pre>
    *
    * @param initiationRequestUrl The request URL where the initiation request will be sent
@@ -405,15 +377,18 @@ private HttpResponse resumableUpload(GenericUrl initiationRequestUrl) throws IOE
     HttpResponse response;
     // Upload the media content in chunks.
     while (true) {
+      ContentChunk contentChunk = buildContentChunk();
       currentRequest = requestFactory.buildPutRequest(uploadUrl, null);
-      setContentAndHeadersOnCurrentRequest();
+      currentRequest.setContent(contentChunk.getContent());
+      currentRequest.getHeaders().setContentRange(contentChunk.getContentRange());
+
       // set mediaErrorHandler as I/O exception handler and as unsuccessful response handler for
       // calling to serverErrorCallback on an I/O exception or an abnormal HTTP response
       new MediaUploadErrorHandler(this, currentRequest);
 
       if (isMediaLengthKnown()) {
         // TODO(rmistry): Support gzipping content for the case where media content length is
-        // known (https://code.google.com/p/google-api-java-client/issues/detail?id=691).
+        // known (https://github.com/googleapis/google-api-java-client/issues/691).
         response = executeCurrentRequestWithoutGZip(currentRequest);
       } else {
         response = executeCurrentRequest(currentRequest);
@@ -431,6 +406,9 @@ private HttpResponse resumableUpload(GenericUrl initiationRequestUrl) throws IOE
         }
 
         if (response.getStatusCode() != 308) {
+          if (mediaContent.getCloseInputStream()) {
+            contentInputStream.close();
+          }
           returningResponse = true;
           return response;
         }
@@ -477,9 +455,7 @@ private HttpResponse resumableUpload(GenericUrl initiationRequestUrl) throws IOE
     }
   }
 
-  /**
-   * @return {@code true} if the media length is known, otherwise {@code false}
-   */
+  /** @return {@code true} if the media length is known, otherwise {@code false} */
   private boolean isMediaLengthKnown() throws IOException {
     return getMediaContentLength() >= 0;
   }
@@ -487,9 +463,7 @@ private boolean isMediaLengthKnown() throws IOException {
   /**
    * Uses lazy initialization to compute the media content length.
    *
-   * <p>
-   * This is done to avoid throwing an {@link IOException} in the constructor.
-   * </p>
+   * <p>This is done to avoid throwing an {@link IOException} in the constructor.
    */
   private long getMediaContentLength() throws IOException {
     if (!isMediaContentLengthCalculated) {
@@ -567,7 +541,7 @@ private HttpResponse executeCurrentRequest(HttpRequest request) throws IOExcepti
    * Sets the HTTP media content chunk and the required headers that should be used in the upload
    * request.
    */
-  private void setContentAndHeadersOnCurrentRequest() throws IOException {
+  private ContentChunk buildContentChunk() throws IOException {
     int blockSize;
     if (isMediaLengthKnown()) {
       // We know exactly what the blockSize will be because we know the media content length.
@@ -584,9 +558,11 @@ private void setContentAndHeadersOnCurrentRequest() throws IOException {
       contentInputStream.mark(blockSize);
 
       InputStream limitInputStream = ByteStreams.limit(contentInputStream, blockSize);
-      contentChunk = new InputStreamContent(
-          mediaContent.getType(), limitInputStream).setRetrySupported(true)
-          .setLength(blockSize).setCloseInputStream(false);
+      contentChunk =
+          new InputStreamContent(mediaContent.getType(), limitInputStream)
+              .setRetrySupported(true)
+              .setLength(blockSize)
+              .setCloseInputStream(false);
       mediaContentLengthStr = String.valueOf(getMediaContentLength());
     } else {
       // If the media content length is not known we implement a custom buffered input stream that
@@ -616,8 +592,12 @@ private void setContentAndHeadersOnCurrentRequest() throws IOException {
         copyBytes = (int) (totalBytesClientSent - totalBytesServerReceived);
         // shift copyBytes bytes to the beginning - those are the bytes which weren't received by
         // the server in the last chunk.
-        System.arraycopy(currentRequestContentBuffer, currentChunkLength - copyBytes,
-            currentRequestContentBuffer, 0, copyBytes);
+        System.arraycopy(
+            currentRequestContentBuffer,
+            currentChunkLength - copyBytes,
+            currentRequestContentBuffer,
+            0,
+            copyBytes);
         if (cachedByte != null) {
           // add the last cached byte to the buffer
           currentRequestContentBuffer[copyBytes] = cachedByte;
@@ -626,9 +606,12 @@ private void setContentAndHeadersOnCurrentRequest() throws IOException {
         bytesAllowedToRead = blockSize - copyBytes;
       }
 
-      actualBytesRead = ByteStreams.read(
-          contentInputStream, currentRequestContentBuffer, blockSize + 1 - bytesAllowedToRead,
-          bytesAllowedToRead);
+      actualBytesRead =
+          ByteStreams.read(
+              contentInputStream,
+              currentRequestContentBuffer,
+              blockSize + 1 - bytesAllowedToRead,
+              bytesAllowedToRead);
 
       if (actualBytesRead < bytesAllowedToRead) {
         actualBlockSize = copyBytes + Math.max(0, actualBytesRead);
@@ -646,33 +629,57 @@ private void setContentAndHeadersOnCurrentRequest() throws IOException {
         cachedByte = currentRequestContentBuffer[blockSize];
       }
 
-      contentChunk = new ByteArrayContent(
-          mediaContent.getType(), currentRequestContentBuffer, 0, actualBlockSize);
+      contentChunk =
+          new ByteArrayContent(
+              mediaContent.getType(), currentRequestContentBuffer, 0, actualBlockSize);
       totalBytesClientSent = totalBytesServerReceived + actualBlockSize;
     }
 
     currentChunkLength = actualBlockSize;
-    currentRequest.setContent(contentChunk);
+
+    String contentRange;
     if (actualBlockSize == 0) {
       // No bytes to upload. Either zero content media being uploaded, or a server failure on the
       // last write, even though the write actually succeeded. Either way,
       // mediaContentLengthStr will contain the actual media length.
-      currentRequest.getHeaders().setContentRange("bytes */" + mediaContentLengthStr);
+      contentRange = "bytes */" + mediaContentLengthStr;
     } else {
-      currentRequest.getHeaders().setContentRange("bytes " + totalBytesServerReceived + "-"
-          + (totalBytesServerReceived + actualBlockSize - 1) + "/" + mediaContentLengthStr);
+      contentRange =
+          "bytes "
+              + totalBytesServerReceived
+              + "-"
+              + (totalBytesServerReceived + actualBlockSize - 1)
+              + "/"
+              + mediaContentLengthStr;
+    }
+    return new ContentChunk(contentChunk, contentRange);
+  }
+
+  private static class ContentChunk {
+    private final AbstractInputStreamContent content;
+    private final String contentRange;
+
+    ContentChunk(AbstractInputStreamContent content, String contentRange) {
+      this.content = content;
+      this.contentRange = contentRange;
+    }
+
+    AbstractInputStreamContent getContent() {
+      return content;
+    }
+
+    String getContentRange() {
+      return contentRange;
     }
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * The call back method that will be invoked on a server error or an I/O exception during
    * resumable upload inside {@link #upload}.
    *
-   * <p>
-   * This method changes the current request to query the current status of the upload to find how
-   * many bytes were successfully uploaded before the server error occurred.
-   * </p>
+   * <p>This method changes the current request to query the current status of the upload to find
+   * how many bytes were successfully uploaded before the server error occurred.
    */
   @Beta
   void serverErrorCallback() throws IOException {
@@ -722,22 +729,16 @@ public HttpTransport getTransport() {
   /**
    * Sets whether direct media upload is enabled or disabled.
    *
-   * <p>
-   * If value is set to {@code true} then a direct upload will be done where the whole media content
-   * is uploaded in a single request. If value is set to {@code false} then the upload uses the
-   * resumable media upload protocol to upload in data chunks.
-   * </p>
+   * <p>If value is set to {@code true} then a direct upload will be done where the whole media
+   * content is uploaded in a single request. If value is set to {@code false} then the upload uses
+   * the resumable media upload protocol to upload in data chunks.
    *
-   * <p>
-   * Direct upload is recommended if the content size falls below a certain minimum limit. This is
-   * because there's minimum block write size for some Google APIs, so if the resumable request
+   * <p>Direct upload is recommended if the content size falls below a certain minimum limit. This
+   * is because there's minimum block write size for some Google APIs, so if the resumable request
    * fails in the space of that first block, the client will have to restart from the beginning
    * anyway.
-   * </p>
    *
-   * <p>
-   * Defaults to {@code false}.
-   * </p>
+   * <p>Defaults to {@code false}.
    *
    * @since 1.9
    */
@@ -758,17 +759,13 @@ public boolean isDirectUploadEnabled() {
     return directUploadEnabled;
   }
 
-  /**
-   * Sets the progress listener to send progress notifications to or {@code null} for none.
-   */
+  /** Sets the progress listener to send progress notifications to or {@code null} for none. */
   public MediaHttpUploader setProgressListener(MediaHttpUploaderProgressListener progressListener) {
     this.progressListener = progressListener;
     return this;
   }
 
-  /**
-   * Returns the progress listener to send progress notifications to or {@code null} for none.
-   */
+  /** Returns the progress listener to send progress notifications to or {@code null} for none. */
   public MediaHttpUploaderProgressListener getProgressListener() {
     return progressListener;
   }
@@ -777,14 +774,13 @@ public MediaHttpUploaderProgressListener getProgressListener() {
    * Sets the maximum size of individual chunks that will get uploaded by single HTTP requests. The
    * default value is {@link #DEFAULT_CHUNK_SIZE}.
    *
-   * <p>
-   * The minimum allowable value is {@link #MINIMUM_CHUNK_SIZE} and the specified chunk size must be
-   * a multiple of {@link #MINIMUM_CHUNK_SIZE}.
-   * </p>
+   * <p>The minimum allowable value is {@link #MINIMUM_CHUNK_SIZE} and the specified chunk size must
+   * be a multiple of {@link #MINIMUM_CHUNK_SIZE}.
    */
   public MediaHttpUploader setChunkSize(int chunkSize) {
-    Preconditions.checkArgument(chunkSize > 0 && chunkSize % MINIMUM_CHUNK_SIZE == 0, "chunkSize"
-        + " must be a positive multiple of " + MINIMUM_CHUNK_SIZE + ".");
+    Preconditions.checkArgument(
+        chunkSize > 0 && chunkSize % MINIMUM_CHUNK_SIZE == 0,
+        "chunkSize" + " must be a positive multiple of " + MINIMUM_CHUNK_SIZE + ".");
     this.chunkSize = chunkSize;
     return this;
   }
@@ -809,16 +805,12 @@ public boolean getDisableGZipContent() {
   /**
    * Sets whether to disable GZip compression of HTTP content.
    *
-   * <p>
-   * By default it is {@code false}.
-   * </p>
+   * <p>By default it is {@code false}.
    *
-   * <p>
-   * If {@link #setDisableGZipContent(boolean)} is set to false (the default value) then content is
-   * gzipped for direct media upload and resumable media uploads when content length is not known.
-   * Due to a current limitation, content is not gzipped for resumable media uploads when content
-   * length is known; this limitation will be removed in the future.
-   * </p>
+   * <p>If {@link #setDisableGZipContent(boolean)} is set to false (the default value) then content
+   * is gzipped for direct media upload and resumable media uploads when content length is not
+   * known. Due to a current limitation, content is not gzipped for resumable media uploads when
+   * content length is known; this limitation will be removed in the future.
    *
    * @since 1.13
    */
@@ -849,9 +841,7 @@ public MediaHttpUploader setSleeper(Sleeper sleeper) {
   /**
    * Returns the HTTP method used for the initiation request.
    *
-   * <p>
-   * The default value is {@link HttpMethods#POST}.
-   * </p>
+   * <p>The default value is {@link HttpMethods#POST}.
    *
    * @since 1.12
    */
@@ -862,17 +852,16 @@ public String getInitiationRequestMethod() {
   /**
    * Sets the HTTP method used for the initiation request.
    *
-   * <p>
-   * Can only be {@link HttpMethods#POST} (for media upload) or {@link HttpMethods#PUT} (for media
-   * update). The default value is {@link HttpMethods#POST}.
-   * </p>
+   * <p>Can only be {@link HttpMethods#POST} (for media upload) or {@link HttpMethods#PUT} (for
+   * media update). The default value is {@link HttpMethods#POST}.
    *
    * @since 1.12
    */
   public MediaHttpUploader setInitiationRequestMethod(String initiationRequestMethod) {
-    Preconditions.checkArgument(initiationRequestMethod.equals(HttpMethods.POST)
-        || initiationRequestMethod.equals(HttpMethods.PUT)
-        || initiationRequestMethod.equals(HttpMethods.PATCH));
+    Preconditions.checkArgument(
+        initiationRequestMethod.equals(HttpMethods.POST)
+            || initiationRequestMethod.equals(HttpMethods.PUT)
+            || initiationRequestMethod.equals(HttpMethods.PATCH));
     this.initiationRequestMethod = initiationRequestMethod;
     return this;
   }
@@ -923,20 +912,21 @@ public UploadState getUploadState() {
    * Gets the upload progress denoting the percentage of bytes that have been uploaded, represented
    * between 0.0 (0%) and 1.0 (100%).
    *
-   * <p>
-   * Do not use if the specified {@link AbstractInputStreamContent} has no content length specified.
-   * Instead, consider using {@link #getNumBytesUploaded} to denote progress.
-   * </p>
+   * <p>Do not use if the specified {@link AbstractInputStreamContent} has no content length
+   * specified. Instead, consider using {@link #getNumBytesUploaded} to denote progress.
    *
    * @throws IllegalArgumentException if the specified {@link AbstractInputStreamContent} has no
-   *         content length
+   *     content length
    * @return the upload progress
    */
   public double getProgress() throws IOException {
-    Preconditions.checkArgument(isMediaLengthKnown(), "Cannot call getProgress() if "
-        + "the specified AbstractInputStreamContent has no content length. Use "
-        + " getNumBytesUploaded() to denote progress instead.");
-    return getMediaContentLength() == 0 ? 0 : (double) totalBytesServerReceived
-        / getMediaContentLength();
+    Preconditions.checkArgument(
+        isMediaLengthKnown(),
+        "Cannot call getProgress() if "
+            + "the specified AbstractInputStreamContent has no content length. Use "
+            + " getNumBytesUploaded() to denote progress instead.");
+    return getMediaContentLength() == 0
+        ? 0
+        : (double) totalBytesServerReceived / getMediaContentLength();
   }
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploaderProgressListener.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploaderProgressListener.java
index 7f6c5f6d0..f85708626 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploaderProgressListener.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaHttpUploaderProgressListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -16,36 +16,33 @@
 
 import java.io.IOException;
 
-
 /**
  * An interface for receiving progress notifications for uploads.
  *
- * <p>
- * Sample usage (if media content length is provided, else consider using
- * {@link MediaHttpUploader#getNumBytesUploaded} instead of {@link MediaHttpUploader#getProgress}:
- * </p>
+ * <p>Sample usage (if media content length is provided, else consider using {@link
+ * MediaHttpUploader#getNumBytesUploaded} instead of {@link MediaHttpUploader#getProgress}:
  *
  * <pre>
-  public static class MyUploadProgressListener implements MediaHttpUploaderProgressListener {
-
-    public void progressChanged(MediaHttpUploader uploader) throws IOException {
-      switch (uploader.getUploadState()) {
-        case INITIATION_STARTED:
-          System.out.println("Initiation Started");
-          break;
-        case INITIATION_COMPLETE:
-          System.out.println("Initiation Completed");
-          break;
-        case MEDIA_IN_PROGRESS:
-          System.out.println("Upload in progress");
-          System.out.println("Upload percentage: " + uploader.getProgress());
-          break;
-        case MEDIA_COMPLETE:
-          System.out.println("Upload Completed!");
-          break;
-      }
-    }
-  }
+ * public static class MyUploadProgressListener implements MediaHttpUploaderProgressListener {
+ *
+ * public void progressChanged(MediaHttpUploader uploader) throws IOException {
+ * switch (uploader.getUploadState()) {
+ * case INITIATION_STARTED:
+ * System.out.println("Initiation Started");
+ * break;
+ * case INITIATION_COMPLETE:
+ * System.out.println("Initiation Completed");
+ * break;
+ * case MEDIA_IN_PROGRESS:
+ * System.out.println("Upload in progress");
+ * System.out.println("Upload percentage: " + uploader.getProgress());
+ * break;
+ * case MEDIA_COMPLETE:
+ * System.out.println("Upload Completed!");
+ * break;
+ * }
+ * }
+ * }
  * </pre>
  *
  * @since 1.9
@@ -56,16 +53,12 @@ public interface MediaHttpUploaderProgressListener {
   /**
    * Called to notify that progress has been changed.
    *
-   * <p>
-   * This method is called once before and after the initiation request. For media uploads it is
+   * <p>This method is called once before and after the initiation request. For media uploads it is
    * called multiple times depending on how many chunks are uploaded. Once the upload completes it
    * is called one final time.
-   * </p>
    *
-   * <p>
-   * The upload state can be queried by calling {@link MediaHttpUploader#getUploadState} and the
+   * <p>The upload state can be queried by calling {@link MediaHttpUploader#getUploadState} and the
    * progress by calling {@link MediaHttpUploader#getProgress}.
-   * </p>
    *
    * @param uploader Media HTTP uploader
    */
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaUploadErrorHandler.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaUploadErrorHandler.java
index 3e0a65031..d1eab7543 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaUploadErrorHandler.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/MediaUploadErrorHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -20,7 +20,6 @@
 import com.google.api.client.http.HttpUnsuccessfulResponseHandler;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -45,9 +44,7 @@ class MediaUploadErrorHandler implements HttpUnsuccessfulResponseHandler, HttpIO
   /** The original {@link HttpUnsuccessfulResponseHandler} of the HTTP request. */
   private final HttpUnsuccessfulResponseHandler originalUnsuccessfulHandler;
 
-  /**
-   * Constructs a new instance from {@link MediaHttpUploader} and {@link HttpRequest}.
-   */
+  /** Constructs a new instance from {@link MediaHttpUploader} and {@link HttpRequest}. */
   public MediaUploadErrorHandler(MediaHttpUploader uploader, HttpRequest request) {
     this.uploader = Preconditions.checkNotNull(uploader);
     originalIOExceptionHandler = request.getIOExceptionHandler();
@@ -58,8 +55,9 @@ public MediaUploadErrorHandler(MediaHttpUploader uploader, HttpRequest request)
   }
 
   public boolean handleIOException(HttpRequest request, boolean supportsRetry) throws IOException {
-    boolean handled = originalIOExceptionHandler != null
-        && originalIOExceptionHandler.handleIOException(request, supportsRetry);
+    boolean handled =
+        originalIOExceptionHandler != null
+            && originalIOExceptionHandler.handleIOException(request, supportsRetry);
 
     // TODO(peleyal): figure out what is best practice - call serverErrorCallback only if I/O
     // exception was handled, or call it regardless
@@ -75,8 +73,9 @@ public boolean handleIOException(HttpRequest request, boolean supportsRetry) thr
 
   public boolean handleResponse(HttpRequest request, HttpResponse response, boolean supportsRetry)
       throws IOException {
-    boolean handled = originalUnsuccessfulHandler != null
-        && originalUnsuccessfulHandler.handleResponse(request, response, supportsRetry);
+    boolean handled =
+        originalUnsuccessfulHandler != null
+            && originalUnsuccessfulHandler.handleResponse(request, response, supportsRetry);
 
     // TODO(peleyal): figure out what is best practice - call serverErrorCallback only if the
     // abnormal response was handled, or call it regardless
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/media/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/media/package-info.java
index 98dd9023e..dc226937a 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/media/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/media/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 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
@@ -18,6 +18,4 @@
  * @since 1.9
  * @author Ravi Mistry
  */
-
 package com.google.api.client.googleapis.media;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/mtls/ContextAwareMetadataJson.java b/google-api-client/src/main/java/com/google/api/client/googleapis/mtls/ContextAwareMetadataJson.java
new file mode 100644
index 000000000..d900594ac
--- /dev/null
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/mtls/ContextAwareMetadataJson.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.api.client.googleapis.mtls;
+
+import com.google.api.client.json.GenericJson;
+import com.google.api.client.util.Beta;
+import com.google.api.client.util.Key;
+import java.util.List;
+
+/**
+ * {@link Beta} <br>
+ * Data class representing context_aware_metadata.json file.
+ *
+ * @since 1.31
+ */
+@Beta
+public class ContextAwareMetadataJson extends GenericJson {
+  /** Cert provider command */
+  @Key("cert_provider_command")
+  private List<String> commands;
+
+  /**
+   * Returns the cert provider command.
+   *
+   * @since 1.31
+   */
+  public final List<String> getCommands() {
+    return commands;
+  }
+}
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/mtls/MtlsProvider.java b/google-api-client/src/main/java/com/google/api/client/googleapis/mtls/MtlsProvider.java
new file mode 100644
index 000000000..cb0813b45
--- /dev/null
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/mtls/MtlsProvider.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.api.client.googleapis.mtls;
+
+import com.google.api.client.util.Beta;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+
+/**
+ * {@link Beta} <br>
+ * Provider interface for mutual TLS. It is used in {@link
+ * GoogleApacheHttpTransport#newTrustedTransport(MtlsProvider)} and {@link
+ * GoogleNetHttpTransport#newTrustedTransport(MtlsProvider)} to configure the mutual TLS in the
+ * transport.
+ *
+ * @since 1.31
+ */
+@Beta
+public interface MtlsProvider {
+  /**
+   * Returns if mutual TLS client certificate should be used. If the value is true, the key store
+   * from {@link #getKeyStore()} and key store password from {@link #getKeyStorePassword()} will be
+   * used to configure mutual TLS transport.
+   */
+  boolean useMtlsClientCertificate();
+
+  /** The key store to use for mutual TLS. */
+  String getKeyStorePassword();
+
+  /** The password for mutual TLS key store. */
+  KeyStore getKeyStore() throws IOException, GeneralSecurityException;
+}
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/mtls/MtlsUtils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/mtls/MtlsUtils.java
new file mode 100644
index 000000000..f08913e7f
--- /dev/null
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/mtls/MtlsUtils.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.api.client.googleapis.mtls;
+
+import com.google.api.client.googleapis.util.Utils;
+import com.google.api.client.json.JsonParser;
+import com.google.api.client.util.Beta;
+import com.google.api.client.util.SecurityUtils;
+import com.google.common.annotations.VisibleForTesting;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.util.List;
+
+/**
+ * {@link Beta} <br>
+ * Utilities for mutual TLS.
+ *
+ * @since 1.31
+ */
+@Beta
+public class MtlsUtils {
+  @VisibleForTesting
+  static class DefaultMtlsProvider implements MtlsProvider {
+    private static final String DEFAULT_CONTEXT_AWARE_METADATA_PATH =
+        System.getProperty("user.home") + "/.secureConnect/context_aware_metadata.json";
+
+    /** GOOGLE_API_USE_CLIENT_CERTIFICATE environment variable. */
+    public static final String GOOGLE_API_USE_CLIENT_CERTIFICATE =
+        "GOOGLE_API_USE_CLIENT_CERTIFICATE";
+
+    interface EnvironmentProvider {
+      String getenv(String name);
+    }
+
+    static class SystemEnvironmentProvider implements EnvironmentProvider {
+      @Override
+      public String getenv(String name) {
+        return System.getenv(name);
+      }
+    }
+
+    DefaultMtlsProvider() {
+      this(new SystemEnvironmentProvider(), DEFAULT_CONTEXT_AWARE_METADATA_PATH);
+    }
+
+    private EnvironmentProvider envProvider;
+    private String metadataPath;
+
+    @VisibleForTesting
+    DefaultMtlsProvider(EnvironmentProvider envProvider, String metadataPath) {
+      this.envProvider = envProvider;
+      this.metadataPath = metadataPath;
+    }
+
+    @Override
+    public boolean useMtlsClientCertificate() {
+      String useClientCertificate = envProvider.getenv(GOOGLE_API_USE_CLIENT_CERTIFICATE);
+      return "true".equals(useClientCertificate);
+    }
+
+    @Override
+    public String getKeyStorePassword() {
+      return "";
+    }
+
+    @Override
+    public KeyStore getKeyStore() throws IOException, GeneralSecurityException {
+      try {
+        // Load the cert provider command from the json file.
+        InputStream stream = new FileInputStream(metadataPath);
+        List<String> command = extractCertificateProviderCommand(stream);
+
+        // Run the command and timeout after 1000 milliseconds.
+        Process process = new ProcessBuilder(command).start();
+        int exitCode = runCertificateProviderCommand(process, 1000);
+        if (exitCode != 0) {
+          throw new IOException("Cert provider command failed with exit code: " + exitCode);
+        }
+
+        // Create mTLS key store with the input certificates from shell command.
+        return SecurityUtils.createMtlsKeyStore(process.getInputStream());
+      } catch (FileNotFoundException ignored) {
+        // file doesn't exist
+        return null;
+      } catch (InterruptedException e) {
+        throw new IOException("Interrupted executing certificate provider command", e);
+      }
+    }
+
+    @VisibleForTesting
+    static List<String> extractCertificateProviderCommand(InputStream contextAwareMetadata)
+        throws IOException {
+      JsonParser parser = Utils.getDefaultJsonFactory().createJsonParser(contextAwareMetadata);
+      ContextAwareMetadataJson json = parser.parse(ContextAwareMetadataJson.class);
+      return json.getCommands();
+    }
+
+    @VisibleForTesting
+    static int runCertificateProviderCommand(Process commandProcess, long timeoutMilliseconds)
+        throws IOException, InterruptedException {
+      long startTime = System.currentTimeMillis();
+      long remainTime = timeoutMilliseconds;
+      boolean terminated = false;
+
+      do {
+        try {
+          // Check if process is terminated by polling the exitValue, which throws
+          // IllegalThreadStateException if not terminated.
+          commandProcess.exitValue();
+          terminated = true;
+          break;
+        } catch (IllegalThreadStateException ex) {
+          if (remainTime > 0) {
+            Thread.sleep(Math.min(remainTime + 1, 100));
+          }
+        }
+        remainTime = remainTime - (System.currentTimeMillis() - startTime);
+      } while (remainTime > 0);
+
+      if (!terminated) {
+        commandProcess.destroy();
+        throw new IOException("cert provider command timed out");
+      }
+
+      return commandProcess.exitValue();
+    }
+  }
+
+  private static final MtlsProvider MTLS_PROVIDER = new DefaultMtlsProvider();
+
+  /**
+   * Returns the default MtlsProvider instance.
+   *
+   * @return The default MtlsProvider instance
+   */
+  public static MtlsProvider getDefaultMtlsProvider() {
+    return MTLS_PROVIDER;
+  }
+}
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/mtls/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/mtls/package-info.java
new file mode 100644
index 000000000..fce7f4e26
--- /dev/null
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/mtls/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+/**
+ * Mutual TLS utilities for the Google API Client Library.
+ *
+ * @since 1.31
+ */
+package com.google.api.client.googleapis.mtls;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/AbstractNotification.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/AbstractNotification.java
index f53e77cfc..5fe9a3b24 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/AbstractNotification.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/AbstractNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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,12 +19,10 @@
 import com.google.api.client.util.Preconditions;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Notification metadata sent to this client about a watched resource.
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @author Yaniv Inbar
  * @author Matthias Linder (mlinder)
@@ -68,11 +66,15 @@ public abstract class AbstractNotification {
    * @param resourceState {@link ResourceStates resource state}
    * @param resourceId opaque ID for the watched resource that is stable across API versions
    * @param resourceUri opaque ID (in the form of a canonicalized URI) for the watched resource that
-   *        is sensitive to the API version
+   *     is sensitive to the API version
    * @param channelId notification channel UUID provided by the client in the watch request
    */
-  protected AbstractNotification(long messageNumber, String resourceState, String resourceId,
-      String resourceUri, String channelId) {
+  protected AbstractNotification(
+      long messageNumber,
+      String resourceState,
+      String resourceId,
+      String resourceUri,
+      String channelId) {
     setMessageNumber(messageNumber);
     setResourceState(resourceState);
     setResourceId(resourceId);
@@ -82,8 +84,12 @@ protected AbstractNotification(long messageNumber, String resourceState, String
 
   /** Copy constructor based on a source notification object. */
   protected AbstractNotification(AbstractNotification source) {
-    this(source.getMessageNumber(), source.getResourceState(), source.getResourceId(), source
-        .getResourceUri(), source.getChannelId());
+    this(
+        source.getMessageNumber(),
+        source.getResourceState(),
+        source.getResourceId(),
+        source.getResourceUri(),
+        source.getChannelId());
     setChannelExpiration(source.getChannelExpiration());
     setChannelToken(source.getChannelToken());
     setChanged(source.getChanged());
@@ -96,10 +102,14 @@ public String toString() {
 
   /** Returns the helper for {@link #toString()}. */
   protected Objects.ToStringHelper toStringHelper() {
-    return Objects.toStringHelper(this).add("messageNumber", messageNumber)
-        .add("resourceState", resourceState).add("resourceId", resourceId)
-        .add("resourceUri", resourceUri).add("channelId", channelId)
-        .add("channelExpiration", channelExpiration).add("channelToken", channelToken)
+    return Objects.toStringHelper(this)
+        .add("messageNumber", messageNumber)
+        .add("resourceState", resourceState)
+        .add("resourceId", resourceId)
+        .add("resourceUri", resourceUri)
+        .add("channelId", channelId)
+        .add("channelExpiration", channelExpiration)
+        .add("channelToken", channelToken)
         .add("changed", changed);
   }
 
@@ -111,10 +121,8 @@ public final long getMessageNumber() {
   /**
    * Sets the message number (a monotonically increasing value starting with 1).
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public AbstractNotification setMessageNumber(long messageNumber) {
     Preconditions.checkArgument(messageNumber >= 1);
@@ -130,10 +138,8 @@ public final String getResourceState() {
   /**
    * Sets the {@link ResourceStates resource state}.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public AbstractNotification setResourceState(String resourceState) {
     this.resourceState = Preconditions.checkNotNull(resourceState);
@@ -148,10 +154,8 @@ public final String getResourceId() {
   /**
    * Sets the opaque ID for the watched resource that is stable across API versions.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public AbstractNotification setResourceId(String resourceId) {
     this.resourceId = Preconditions.checkNotNull(resourceId);
@@ -170,10 +174,8 @@ public final String getResourceUri() {
    * Sets the opaque ID (in the form of a canonicalized URI) for the watched resource that is
    * sensitive to the API version.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public AbstractNotification setResourceUri(String resourceUri) {
     this.resourceUri = Preconditions.checkNotNull(resourceUri);
@@ -188,10 +190,8 @@ public final String getChannelId() {
   /**
    * Sets the notification channel UUID provided by the client in the watch request.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public AbstractNotification setChannelId(String channelId) {
     this.channelId = Preconditions.checkNotNull(channelId);
@@ -206,10 +206,8 @@ public final String getChannelExpiration() {
   /**
    * Sets the notification channel expiration time or {@code null} for none.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public AbstractNotification setChannelExpiration(String channelExpiration) {
     this.channelExpiration = channelExpiration;
@@ -228,19 +226,15 @@ public final String getChannelToken() {
    * Sets the notification channel token (an opaque string) provided by the client in the watch
    * request or {@code null} for none.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public AbstractNotification setChannelToken(String channelToken) {
     this.channelToken = channelToken;
     return this;
   }
 
-  /**
-   * Returns the type of change performed on the resource or {@code null} for none.
-   */
+  /** Returns the type of change performed on the resource or {@code null} for none. */
   public final String getChanged() {
     return changed;
   }
@@ -248,10 +242,8 @@ public final String getChanged() {
   /**
    * Sets the type of change performed on the resource or {@code null} for none.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public AbstractNotification setChanged(String changed) {
     this.changed = changed;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/NotificationUtils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/NotificationUtils.java
index c39cbab2e..d48157135 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/NotificationUtils.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/NotificationUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -29,6 +29,5 @@ public static String randomUuidString() {
     return UUID.randomUUID().toString();
   }
 
-  private NotificationUtils() {
-  }
+  private NotificationUtils() {}
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/ResourceStates.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/ResourceStates.java
index 5de4b2049..a3906e7db 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/ResourceStates.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/ResourceStates.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -17,7 +17,7 @@
 import com.google.api.client.util.Beta;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Standard resource states used by notifications.
  *
  * @author Yaniv Inbar
@@ -35,6 +35,5 @@ public final class ResourceStates {
   /** Resource does not exist, for example on a delete. */
   public static final String NOT_EXISTS = "NOT_EXISTS";
 
-  private ResourceStates() {
-  }
+  private ResourceStates() {}
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java
index 36a52cc48..b2599f5b2 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/StoredChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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,19 +19,16 @@
 import com.google.api.client.util.Preconditions;
 import com.google.api.client.util.store.DataStore;
 import com.google.api.client.util.store.DataStoreFactory;
-
 import java.io.IOException;
 import java.io.Serializable;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Notification channel information to be stored in a data store.
  *
- * <p>
- * Implementation is thread safe.
- * </p>
+ * <p>Implementation is thread safe.
  *
  * @author Yaniv Inbar
  * @author Matthias Linder (mlinder)
@@ -76,7 +73,7 @@ public final class StoredChannel implements Serializable {
    * Constructor with a random UUID using {@link NotificationUtils#randomUuidString()}.
    *
    * @param notificationCallback notification handler called when a notification is received for
-   *        this subscription
+   *     this subscription
    */
   public StoredChannel(UnparsedNotificationCallback notificationCallback) {
     this(notificationCallback, NotificationUtils.randomUuidString());
@@ -86,7 +83,7 @@ public StoredChannel(UnparsedNotificationCallback notificationCallback) {
    * Constructor with a custom UUID.
    *
    * @param notificationCallback notification handler called when a notification is received for
-   *        this subscription
+   *     this subscription
    * @param id subscription UUID
    */
   public StoredChannel(UnparsedNotificationCallback notificationCallback, String id) {
@@ -98,10 +95,8 @@ public StoredChannel(UnparsedNotificationCallback notificationCallback, String i
    * Stores this notification channel in the notification channel data store, which is derived from
    * {@link #getDefaultDataStore(DataStoreFactory)} on the given data store factory.
    *
-   * <p>
-   * It is important that this method be called before the watch HTTP request is made in case the
+   * <p>It is important that this method be called before the watch HTTP request is made in case the
    * notification is received before the watch HTTP response is received.
-   * </p>
    *
    * @param dataStoreFactory data store factory
    */
@@ -112,10 +107,8 @@ public StoredChannel store(DataStoreFactory dataStoreFactory) throws IOException
   /**
    * Stores this notification channel in the given notification channel data store.
    *
-   * <p>
-   * It is important that this method be called before the watch HTTP request is made in case the
+   * <p>It is important that this method be called before the watch HTTP request is made in case the
    * notification is received before the watch HTTP response is received.
-   * </p>
    *
    * @param dataStore notification channel data store
    */
@@ -206,8 +199,8 @@ public String getId() {
   }
 
   /**
-   * Returns the opaque ID for the subscribed resource that is stable across API versions or
-   * {@code null} for none.
+   * Returns the opaque ID for the subscribed resource that is stable across API versions or {@code
+   * null} for none.
    */
   public String getTopicId() {
     lock.lock();
@@ -219,8 +212,8 @@ public String getTopicId() {
   }
 
   /**
-   * Sets the opaque ID for the subscribed resource that is stable across API versions or
-   * {@code null} for none.
+   * Sets the opaque ID for the subscribed resource that is stable across API versions or {@code
+   * null} for none.
    */
   public StoredChannel setTopicId(String topicId) {
     lock.lock();
@@ -235,8 +228,11 @@ public StoredChannel setTopicId(String topicId) {
   @Override
   public String toString() {
     return Objects.toStringHelper(StoredChannel.class)
-        .add("notificationCallback", getNotificationCallback()).add("clientToken", getClientToken())
-        .add("expiration", getExpiration()).add("id", getId()).add("topicId", getTopicId())
+        .add("notificationCallback", getNotificationCallback())
+        .add("clientToken", getClientToken())
+        .add("expiration", getExpiration())
+        .add("id", getId())
+        .add("topicId", getTopicId())
         .toString();
   }
 
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java
index e3da8d0b3..588a55582 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -17,15 +17,12 @@
 import com.google.api.client.util.Beta;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Notification metadata and parsed content sent to this client about a watched resource.
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @param <T> Java type of the notification content
- *
  * @author Yaniv Inbar
  * @author Matthias Linder (mlinder)
  * @since 1.16
@@ -41,24 +38,24 @@ public class TypedNotification<T> extends AbstractNotification {
    * @param resourceState {@link ResourceStates resource state}
    * @param resourceId opaque ID for the watched resource that is stable across API versions
    * @param resourceUri opaque ID (in the form of a canonicalized URI) for the watched resource that
-   *        is sensitive to the API version
+   *     is sensitive to the API version
    * @param channelId notification channel UUID provided by the client in the watch request
    */
-  public TypedNotification(long messageNumber, String resourceState, String resourceId,
-      String resourceUri, String channelId) {
+  public TypedNotification(
+      long messageNumber,
+      String resourceState,
+      String resourceId,
+      String resourceUri,
+      String channelId) {
     super(messageNumber, resourceState, resourceId, resourceUri, channelId);
   }
 
-  /**
-   * @param sourceNotification source notification metadata to copy
-   */
+  /** @param sourceNotification source notification metadata to copy */
   public TypedNotification(UnparsedNotification sourceNotification) {
     super(sourceNotification);
   }
 
-  /**
-   * Returns the parsed notification content or {@code null} for none.
-   */
+  /** Returns the parsed notification content or {@code null} for none. */
   public final T getContent() {
     return content;
   }
@@ -66,10 +63,8 @@ public final T getContent() {
   /**
    * Sets the parsed notification content or {@code null} for none.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public TypedNotification<T> setContent(T content) {
     this.content = content;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java
index 4c912d1be..be7f5fe52 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/TypedNotificationCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -18,54 +18,47 @@
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.ObjectParser;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.nio.charset.Charset;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Callback to receive notifications for watched resource in which the . Callback which is used to
  * receive typed {@link AbstractNotification}s after subscribing to a topic.
  *
- * <p>
- * Must NOT be implemented in form of an anonymous class as this will break serialization.
- * </p>
- *
- * <p>
- * Implementation should be thread-safe.
- * </p>
+ * <p>Must NOT be implemented in form of an anonymous class as this will break serialization.
  *
- * <b>Example usage:</b>
+ * <p>Implementation should be thread-safe. <b>Example usage:</b>
  *
  * <pre>
-  static class MyNotificationCallback
-      extends JsonNotificationCallback{@literal <}ListResponse{@literal >} {
-
-    private static final long serialVersionUID = 1L;
-
-    {@literal @}Override
-    protected void onNotification(
-        StoredChannel subscription, Notification notification, ListResponse content) {
-      switch (notification.getResourceState()) {
-        case ResourceStates.SYNC:
-          break;
-        case ResourceStates.EXISTS:
-          break;
-        case ResourceStates.NOT_EXISTS:
-          break;
-      }
-    }
-
-    {@literal @}Override
-    protected ObjectParser getObjectParser(Notification notification) throws IOException {
-      return new JsonObjectParser(new JacksonFactory());
-    }
-
-    {@literal @}Override
-    protected Class{@literal <}ListResponse{@literal >} getDataClass() throws IOException {
-      return ListResponse.class;
-    }
-  }
+ * static class MyNotificationCallback
+ * extends JsonNotificationCallback{@literal <}ListResponse{@literal >} {
+ *
+ * private static final long serialVersionUID = 1L;
+ *
+ * {@literal @}Override
+ * protected void onNotification(
+ * StoredChannel subscription, Notification notification, ListResponse content) {
+ * switch (notification.getResourceState()) {
+ * case ResourceStates.SYNC:
+ * break;
+ * case ResourceStates.EXISTS:
+ * break;
+ * case ResourceStates.NOT_EXISTS:
+ * break;
+ * }
+ * }
+ *
+ * {@literal @}Override
+ * protected ObjectParser getObjectParser(Notification notification) throws IOException {
+ * return new JsonObjectParser(new GsonFactory());
+ * }
+ *
+ * {@literal @}Override
+ * protected Class{@literal <}ListResponse{@literal >} getDataClass() throws IOException {
+ * return ListResponse.class;
+ * }
+ * }
  * </pre>
  *
  * @param <T> Java type of the notification content
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotification.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotification.java
index e9b65951e..ad0a28a86 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotification.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -15,16 +15,13 @@
 package com.google.api.client.googleapis.notifications;
 
 import com.google.api.client.util.Beta;
-
 import java.io.InputStream;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Notification metadata and unparsed content stream sent to this client about a watched resource.
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @author Yaniv Inbar
  * @author Matthias Linder (mlinder)
@@ -44,11 +41,15 @@ public class UnparsedNotification extends AbstractNotification {
    * @param resourceState {@link ResourceStates resource state}
    * @param resourceId opaque ID for the watched resource that is stable across API versions
    * @param resourceUri opaque ID (in the form of a canonicalized URI) for the watched resource that
-   *        is sensitive to the API version
+   *     is sensitive to the API version
    * @param channelId notification channel UUID provided by the client in the watch request
    */
-  public UnparsedNotification(long messageNumber, String resourceState, String resourceId,
-      String resourceUri, String channelId) {
+  public UnparsedNotification(
+      long messageNumber,
+      String resourceState,
+      String resourceId,
+      String resourceUri,
+      String channelId) {
     super(messageNumber, resourceState, resourceId, resourceUri, channelId);
   }
 
@@ -64,19 +65,15 @@ public final String getContentType() {
    * Sets the notification content media type for the content stream or {@code null} for none or
    * unknown.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public UnparsedNotification setContentType(String contentType) {
     this.contentType = contentType;
     return this;
   }
 
-  /**
-   * Returns the notification content input stream or {@code null} for none.
-   */
+  /** Returns the notification content input stream or {@code null} for none. */
   public final InputStream getContentStream() {
     return contentStream;
   }
@@ -84,10 +81,8 @@ public final InputStream getContentStream() {
   /**
    * Sets the notification content content input stream or {@code null} for none.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public UnparsedNotification setContentStream(InputStream contentStream) {
     this.contentStream = contentStream;
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotificationCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotificationCallback.java
index 79fec239d..e87dffff0 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotificationCallback.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/UnparsedNotificationCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -15,43 +15,37 @@
 package com.google.api.client.googleapis.notifications;
 
 import com.google.api.client.util.Beta;
-
 import java.io.IOException;
 import java.io.Serializable;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Callback to receive unparsed notifications for watched resource.
  *
- * <p>
- * Must NOT be implemented in form of an anonymous class since this would break serialization.
- * </p>
- *
- * <p>
- * Should be thread-safe as several notifications might be processed at the same time.
- * </p>
+ * <p>Must NOT be implemented in form of an anonymous class since this would break serialization.
  *
- * <b>Example usage:</b>
+ * <p>Should be thread-safe as several notifications might be processed at the same time. <b>Example
+ * usage:</b>
  *
  * <pre>
-  static class MyNotificationCallback implements UnparsedNotificationCallback {
-
-    private static final long serialVersionUID = 1L;
-
-    {@literal @}Override
-    public void onNotification(StoredChannel storedChannel, UnparsedNotification notification) {
-      String contentType = notification.getContentType();
-      InputStream contentStream = notification.getContentStream();
-      switch (notification.getResourceState()) {
-        case ResourceStates.SYNC:
-          break;
-        case ResourceStates.EXISTS:
-          break;
-        case ResourceStates.NOT_EXISTS:
-          break;
-      }
-    }
-  }
+ * static class MyNotificationCallback implements UnparsedNotificationCallback {
+ *
+ * private static final long serialVersionUID = 1L;
+ *
+ * {@literal @}Override
+ * public void onNotification(StoredChannel storedChannel, UnparsedNotification notification) {
+ * String contentType = notification.getContentType();
+ * InputStream contentStream = notification.getContentStream();
+ * switch (notification.getResourceState()) {
+ * case ResourceStates.SYNC:
+ * break;
+ * case ResourceStates.EXISTS:
+ * break;
+ * case ResourceStates.NOT_EXISTS:
+ * break;
+ * }
+ * }
+ * }
  * </pre>
  *
  * @author Yaniv Inbar
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java
index b8e9e5bda..70658bce7 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/JsonNotificationCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -18,53 +18,46 @@
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
 import com.google.api.client.util.Beta;
-
 import java.io.IOException;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * A {@link TypedNotificationCallback} which uses an JSON content encoding.
  *
- * <p>
- * Must NOT be implemented in form of an anonymous class as this will break serialization.
- * </p>
- *
- * <p>
- * Implementation should be thread-safe.
- * </p>
+ * <p>Must NOT be implemented in form of an anonymous class as this will break serialization.
  *
- * <b>Example usage:</b>
+ * <p>Implementation should be thread-safe. <b>Example usage:</b>
  *
  * <pre>
-  static class MyNotificationCallback
-      extends JsonNotificationCallback{@literal <}ListResponse{@literal >} {
-
-    private static final long serialVersionUID = 1L;
-
-    {@literal @}Override
-    protected void onNotification(
-        StoredChannel channel, TypedNotification{@literal <}ListResponse{@literal >} notification) {
-      ListResponse content = notification.getContent();
-      switch (notification.getResourceState()) {
-        case ResourceStates.SYNC:
-          break;
-        case ResourceStates.EXISTS:
-          break;
-        case ResourceStates.NOT_EXISTS:
-          break;
-      }
-    }
-
-    {@literal @}Override
-    protected JsonFactory getJsonFactory() throws IOException {
-      return new JacksonFactory();
-    }
-
-    {@literal @}Override
-    protected Class{@literal <}ListResponse{@literal >} getDataClass() throws IOException {
-      return ListResponse.class;
-    }
-  }
+ * static class MyNotificationCallback
+ * extends JsonNotificationCallback{@literal <}ListResponse{@literal >} {
+ *
+ * private static final long serialVersionUID = 1L;
+ *
+ * {@literal @}Override
+ * protected void onNotification(
+ * StoredChannel channel, TypedNotification{@literal <}ListResponse{@literal >} notification) {
+ * ListResponse content = notification.getContent();
+ * switch (notification.getResourceState()) {
+ * case ResourceStates.SYNC:
+ * break;
+ * case ResourceStates.EXISTS:
+ * break;
+ * case ResourceStates.NOT_EXISTS:
+ * break;
+ * }
+ * }
+ *
+ * {@literal @}Override
+ * protected JsonFactory getJsonFactory() throws IOException {
+ * return new GsonFactory();
+ * }
+ *
+ * {@literal @}Override
+ * protected Class{@literal <}ListResponse{@literal >} getDataClass() throws IOException {
+ * return ListResponse.class;
+ * }
+ * }
  * </pre>
  *
  * @param <T> Type of the data contained within a notification
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/package-info.java
index 4252b92e8..8dd40e217 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/json/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,7 +13,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * JSON-based notification handling for notification channels.
  *
  * @author Yaniv Inbar
@@ -21,4 +21,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.notifications.json;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/package-info.java
index 20c069035..2a60f79ba 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/notifications/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,7 +13,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Support for notification channels to listen for changes to watched Google API resources.
  *
  * @author Yaniv Inbar
@@ -22,4 +22,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.notifications;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/package-info.java
index 6057d4811..a04f9602f 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 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
@@ -18,6 +18,4 @@
  * @since 1.0
  * @author Yaniv Inbar
  */
-
 package com.google.api.client.googleapis;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClient.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClient.java
index 439952cad..04f2e33d9 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClient.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClient.java
@@ -31,7 +31,7 @@
  */
 public abstract class AbstractGoogleClient {
 
-  static final Logger logger = Logger.getLogger(AbstractGoogleClient.class.getName());
+  private static final Logger logger = Logger.getLogger(AbstractGoogleClient.class.getName());
 
   /** The request factory for connections to the server. */
   private final HttpRequestFactory requestFactory;
@@ -48,14 +48,10 @@ public abstract class AbstractGoogleClient {
    */
   private final String rootUrl;
 
-  /**
-   * Service path, for example {@code "tasks/v1/"}. Must be URL-encoded and must end with a "/".
-   */
+  /** Service path, for example {@code "tasks/v1/"}. Must be URL-encoded and must end with a "/". */
   private final String servicePath;
 
-  /**
-   * Batch path, for example {@code "batch/tasks"}.  Must be URL-encoded.
-   */
+  /** Batch path, for example {@code "batch/tasks"}. Must be URL-encoded. */
   private final String batchPath;
 
   /**
@@ -74,7 +70,6 @@ public abstract class AbstractGoogleClient {
 
   /**
    * @param builder builder
-   *
    * @since 1.14
    */
   protected AbstractGoogleClient(Builder builder) {
@@ -86,21 +81,20 @@ protected AbstractGoogleClient(Builder builder) {
       logger.warning("Application name is not set. Call Builder#setApplicationName.");
     }
     applicationName = builder.applicationName;
-    requestFactory = builder.httpRequestInitializer == null
-        ? builder.transport.createRequestFactory()
-        : builder.transport.createRequestFactory(builder.httpRequestInitializer);
+    requestFactory =
+        builder.httpRequestInitializer == null
+            ? builder.transport.createRequestFactory()
+            : builder.transport.createRequestFactory(builder.httpRequestInitializer);
     objectParser = builder.objectParser;
     suppressPatternChecks = builder.suppressPatternChecks;
     suppressRequiredParameterChecks = builder.suppressRequiredParameterChecks;
   }
 
   /**
-   * Returns the URL-encoded root URL of the service, for example
-   * {@code "https://www.googleapis.com/"}.
+   * Returns the URL-encoded root URL of the service, for example {@code
+   * "https://www.googleapis.com/"}.
    *
-   * <p>
-   * Must end with a "/".
-   * </p>
+   * <p>Must end with a "/".
    */
   public final String getRootUrl() {
     return rootUrl;
@@ -109,30 +103,27 @@ public final String getRootUrl() {
   /**
    * Returns the URL-encoded service path of the service, for example {@code "tasks/v1/"}.
    *
-   * <p>
-   * Must end with a "/" and not begin with a "/". It is allowed to be an empty string {@code ""} or
-   * a forward slash {@code "/"}, if it is a forward slash then it is treated as an empty string
-   * </p>
+   * <p>Must end with a "/" and not begin with a "/". It is allowed to be an empty string {@code ""}
+   * or a forward slash {@code "/"}, if it is a forward slash then it is treated as an empty string
    */
   public final String getServicePath() {
     return servicePath;
   }
 
   /**
-   * Returns the URL-encoded base URL of the service, for example
-   * {@code "https://www.googleapis.com/tasks/v1/"}.
+   * Returns the URL-encoded base URL of the service, for example {@code
+   * "https://www.googleapis.com/tasks/v1/"}.
    *
-   * <p>
-   * Must end with a "/". It is guaranteed to be equal to {@code getRootUrl() + getServicePath()}.
-   * </p>
+   * <p>Must end with a "/". It is guaranteed to be equal to {@code getRootUrl() +
+   * getServicePath()}.
    */
   public final String getBaseUrl() {
     return rootUrl + servicePath;
   }
 
   /**
-   * Returns the application name to be sent in the User-Agent header of each request or
-   * {@code null} for none.
+   * Returns the application name to be sent in the User-Agent header of each request or {@code
+   * null} for none.
    */
   public final String getApplicationName() {
     return applicationName;
@@ -151,39 +142,33 @@ public final GoogleClientRequestInitializer getGoogleClientRequestInitializer()
   /**
    * Returns the object parser or {@code null} for none.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public ObjectParser getObjectParser() {
     return objectParser;
   }
 
   /**
-   * Initializes a {@link AbstractGoogleClientRequest} using a
-   * {@link GoogleClientRequestInitializer}.
+   * Initializes a {@link AbstractGoogleClientRequest} using a {@link
+   * GoogleClientRequestInitializer}.
    *
-   * <p>
-   * Must be called before the Google client request is executed, preferably right after the request
-   * is instantiated. Sample usage:
-   * </p>
+   * <p>Must be called before the Google client request is executed, preferably right after the
+   * request is instantiated. Sample usage:
    *
    * <pre>
-    public class Get extends HttpClientRequest {
-      ...
-    }
-
-    public Get get(String userId) throws IOException {
-      Get result = new Get(userId);
-      initialize(result);
-      return result;
-    }
+   * public class Get extends HttpClientRequest {
+   * ...
+   * }
+   *
+   * public Get get(String userId) throws IOException {
+   * Get result = new Get(userId);
+   * initialize(result);
+   * return result;
+   * }
    * </pre>
    *
-   * <p>
-   * Subclasses may override by calling the super implementation.
-   * </p>
+   * <p>Subclasses may override by calling the super implementation.
    *
    * @param httpClientRequest Google client request type
    */
@@ -196,15 +181,13 @@ protected void initialize(AbstractGoogleClientRequest<?> httpClientRequest) thro
   /**
    * Create an {@link BatchRequest} object from this Google API client instance.
    *
-   * <p>
-   * Sample usage:
-   * </p>
+   * <p>Sample usage:
    *
    * <pre>
-     client.batch()
-         .queue(...)
-         .queue(...)
-         .execute();
+   * client.batch()
+   * .queue(...)
+   * .queue(...)
+   * .execute();
    * </pre>
    *
    * @return newly created Batch request
@@ -216,22 +199,21 @@ public final BatchRequest batch() {
   /**
    * Create an {@link BatchRequest} object from this Google API client instance.
    *
-   * <p>
-   * Sample usage:
-   * </p>
+   * <p>Sample usage:
    *
    * <pre>
-     client.batch(httpRequestInitializer)
-         .queue(...)
-         .queue(...)
-         .execute();
+   * client.batch(httpRequestInitializer)
+   * .queue(...)
+   * .queue(...)
+   * .execute();
    * </pre>
    *
    * @param httpRequestInitializer The initializer to use when creating the top-level batch HTTP
-   *        request or {@code null} for none
+   *     request or {@code null} for none
    * @return newly created Batch request
    */
   public final BatchRequest batch(HttpRequestInitializer httpRequestInitializer) {
+    @SuppressWarnings("deprecated")
     BatchRequest batch =
         new BatchRequest(getRequestFactory().getTransport(), httpRequestInitializer);
     if (Strings.isNullOrEmpty(batchPath)) {
@@ -289,9 +271,7 @@ static String normalizeServicePath(String servicePath) {
   /**
    * Builder for {@link AbstractGoogleClient}.
    *
-   * <p>
-   * Implementation is not thread-safe.
-   * </p>
+   * <p>Implementation is not thread-safe.
    */
   public abstract static class Builder {
 
@@ -340,8 +320,12 @@ public abstract static class Builder {
      * @param objectParser object parser or {@code null} for none
      * @param httpRequestInitializer HTTP request initializer or {@code null} for none
      */
-    protected Builder(HttpTransport transport, String rootUrl, String servicePath,
-        ObjectParser objectParser, HttpRequestInitializer httpRequestInitializer) {
+    protected Builder(
+        HttpTransport transport,
+        String rootUrl,
+        String servicePath,
+        ObjectParser objectParser,
+        HttpRequestInitializer httpRequestInitializer) {
       this.transport = Preconditions.checkNotNull(transport);
       this.objectParser = objectParser;
       setRootUrl(rootUrl);
@@ -360,22 +344,18 @@ public final HttpTransport getTransport() {
     /**
      * Returns the object parser or {@code null} for none.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public ObjectParser getObjectParser() {
       return objectParser;
     }
 
     /**
-     * Returns the URL-encoded root URL of the service, for example
-     * {@code https://www.googleapis.com/}.
+     * Returns the URL-encoded root URL of the service, for example {@code
+     * https://www.googleapis.com/}.
      *
-     * <p>
-     * Must be URL-encoded and must end with a "/".
-     * </p>
+     * <p>Must be URL-encoded and must end with a "/".
      */
     public final String getRootUrl() {
       return rootUrl;
@@ -384,14 +364,11 @@ public final String getRootUrl() {
     /**
      * Sets the URL-encoded root URL of the service, for example {@code https://www.googleapis.com/}
      * .
-     * <p>
-     * If the specified root URL does not end with a "/" then a "/" is added to the end.
-     * </p>
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>If the specified root URL does not end with a "/" then a "/" is added to the end.
+     *
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setRootUrl(String rootUrl) {
       this.rootUrl = normalizeRootUrl(rootUrl);
@@ -401,10 +378,8 @@ public Builder setRootUrl(String rootUrl) {
     /**
      * Returns the URL-encoded service path of the service, for example {@code "tasks/v1/"}.
      *
-     * <p>
-     * Must be URL-encoded and must end with a "/" and not begin with a "/". It is allowed to be an
-     * empty string {@code ""}.
-     * </p>
+     * <p>Must be URL-encoded and must end with a "/" and not begin with a "/". It is allowed to be
+     * an empty string {@code ""}.
      */
     public final String getServicePath() {
       return servicePath;
@@ -413,30 +388,22 @@ public final String getServicePath() {
     /**
      * Sets the URL-encoded service path of the service, for example {@code "tasks/v1/"}.
      *
-     * <p>
-     * It is allowed to be an empty string {@code ""} or a forward slash {@code "/"}, if it is a
+     * <p>It is allowed to be an empty string {@code ""} or a forward slash {@code "/"}, if it is a
      * forward slash then it is treated as an empty string. This is determined when the library is
      * generated and normally should not be changed.
-     * </p>
      *
-     * <p>
-     * If the specified service path does not end with a "/" then a "/" is added to the end. If the
-     * specified service path begins with a "/" then the "/" is removed.
-     * </p>
+     * <p>If the specified service path does not end with a "/" then a "/" is added to the end. If
+     * the specified service path begins with a "/" then the "/" is removed.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setServicePath(String servicePath) {
       this.servicePath = normalizeServicePath(servicePath);
       return this;
     }
 
-    /**
-     * Sets the URL-encoded batch path of the service, for example {@code "batch/tasks"}.
-     */
+    /** Sets the URL-encoded batch path of the service, for example {@code "batch/tasks"}. */
     public Builder setBatchPath(String batchPath) {
       this.batchPath = batchPath;
       return this;
@@ -450,10 +417,8 @@ public final GoogleClientRequestInitializer getGoogleClientRequestInitializer()
     /**
      * Sets the Google client request initializer or {@code null} for none.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setGoogleClientRequestInitializer(
         GoogleClientRequestInitializer googleClientRequestInitializer) {
@@ -469,10 +434,8 @@ public final HttpRequestInitializer getHttpRequestInitializer() {
     /**
      * Sets the HTTP request initializer or {@code null} for none.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setHttpRequestInitializer(HttpRequestInitializer httpRequestInitializer) {
       this.httpRequestInitializer = httpRequestInitializer;
@@ -480,8 +443,8 @@ public Builder setHttpRequestInitializer(HttpRequestInitializer httpRequestIniti
     }
 
     /**
-     * Returns the application name to be used in the UserAgent header of each request or
-     * {@code null} for none.
+     * Returns the application name to be used in the UserAgent header of each request or {@code
+     * null} for none.
      */
     public final String getApplicationName() {
       return applicationName;
@@ -491,10 +454,8 @@ public final String getApplicationName() {
      * Sets the application name to be used in the UserAgent header of each request or {@code null}
      * for none.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setApplicationName(String applicationName) {
       this.applicationName = applicationName;
@@ -509,14 +470,10 @@ public final boolean getSuppressPatternChecks() {
     /**
      * Sets whether discovery pattern checks should be suppressed on required parameters.
      *
-     * <p>
-     * Default value is {@code false}.
-     * </p>
+     * <p>Default value is {@code false}.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      */
     public Builder setSuppressPatternChecks(boolean suppressPatternChecks) {
       this.suppressPatternChecks = suppressPatternChecks;
@@ -535,14 +492,10 @@ public final boolean getSuppressRequiredParameterChecks() {
     /**
      * Sets whether discovery required parameter checks should be suppressed.
      *
-     * <p>
-     * Default value is {@code false}.
-     * </p>
+     * <p>Default value is {@code false}.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      *
      * @since 1.14
      */
@@ -554,10 +507,8 @@ public Builder setSuppressRequiredParameterChecks(boolean suppressRequiredParame
     /**
      * Suppresses all discovery pattern and required parameter checks.
      *
-     * <p>
-     * Overriding is only supported for the purpose of calling the super implementation and changing
-     * the return type, but nothing else.
-     * </p>
+     * <p>Overriding is only supported for the purpose of calling the super implementation and
+     * changing the return type, but nothing else.
      *
      * @since 1.14
      */
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java
index 958378107..d16a71c5b 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequest.java
@@ -12,6 +12,10 @@
 
 package com.google.api.client.googleapis.services;
 
+import static com.google.common.base.StandardSystemProperty.OS_NAME;
+import static com.google.common.base.StandardSystemProperty.OS_VERSION;
+
+import com.google.api.client.googleapis.GoogleUtils;
 import com.google.api.client.googleapis.MethodOverride;
 import com.google.api.client.googleapis.batch.BatchCallback;
 import com.google.api.client.googleapis.batch.BatchRequest;
@@ -33,20 +37,18 @@
 import com.google.api.client.http.UriTemplate;
 import com.google.api.client.util.GenericData;
 import com.google.api.client.util.Preconditions;
-
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 /**
  * Abstract Google client request for a {@link AbstractGoogleClient}.
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @param <T> type of the response
- *
  * @since 1.12
  * @author Yaniv Inbar
  */
@@ -59,6 +61,8 @@ public abstract class AbstractGoogleClientRequest<T> extends GenericData {
    */
   public static final String USER_AGENT_SUFFIX = "Google-API-Java-Client";
 
+  private static final String API_VERSION_HEADER = "X-Goog-Api-Client";
+
   /** Google client. */
   private final AbstractGoogleClient abstractGoogleClient;
 
@@ -86,6 +90,9 @@ public abstract class AbstractGoogleClientRequest<T> extends GenericData {
   /** Whether to disable GZip compression of HTTP content. */
   private boolean disableGZipContent;
 
+  /** Whether to return raw input stream in {@link HttpResponse#getContent()}. */
+  private boolean returnRawInputStream;
+
   /** Response class to parse into. */
   private Class<T> responseClass;
 
@@ -99,14 +106,18 @@ public abstract class AbstractGoogleClientRequest<T> extends GenericData {
    * @param abstractGoogleClient Google client
    * @param requestMethod HTTP Method
    * @param uriTemplate URI template for the path relative to the base URL. If it starts with a "/"
-   *        the base path from the base URL will be stripped out. The URI template can also be a
-   *        full URL. URI template expansion is done using
-   *        {@link UriTemplate#expand(String, String, Object, boolean)}
+   *     the base path from the base URL will be stripped out. The URI template can also be a full
+   *     URL. URI template expansion is done using {@link UriTemplate#expand(String, String, Object,
+   *     boolean)}
    * @param httpContent HTTP content or {@code null} for none
    * @param responseClass response class to parse into
    */
-  protected AbstractGoogleClientRequest(AbstractGoogleClient abstractGoogleClient,
-      String requestMethod, String uriTemplate, HttpContent httpContent, Class<T> responseClass) {
+  protected AbstractGoogleClientRequest(
+      AbstractGoogleClient abstractGoogleClient,
+      String requestMethod,
+      String uriTemplate,
+      HttpContent httpContent,
+      Class<T> responseClass) {
     this.responseClass = Preconditions.checkNotNull(responseClass);
     this.abstractGoogleClient = Preconditions.checkNotNull(abstractGoogleClient);
     this.requestMethod = Preconditions.checkNotNull(requestMethod);
@@ -115,9 +126,90 @@ protected AbstractGoogleClientRequest(AbstractGoogleClient abstractGoogleClient,
     // application name
     String applicationName = abstractGoogleClient.getApplicationName();
     if (applicationName != null) {
-      requestHeaders.setUserAgent(applicationName + " " + USER_AGENT_SUFFIX);
+      requestHeaders.setUserAgent(
+          applicationName + " " + USER_AGENT_SUFFIX + "/" + GoogleUtils.VERSION);
     } else {
-      requestHeaders.setUserAgent(USER_AGENT_SUFFIX);
+      requestHeaders.setUserAgent(USER_AGENT_SUFFIX + "/" + GoogleUtils.VERSION);
+    }
+    // Set the header for the Api Client version (Java and OS version)
+    requestHeaders.set(API_VERSION_HEADER, ApiClientVersion.DEFAULT_VERSION);
+  }
+
+  /**
+   * Internal class to help build the X-Goog-Api-Client header. This header identifies the API
+   * Client version and environment.
+   *
+   * <p>See <a href="https://cloud.google.com/apis/docs/system-parameters"></a>
+   */
+  static class ApiClientVersion {
+    static final String DEFAULT_VERSION = new ApiClientVersion().toString();
+    private final String versionString;
+
+    ApiClientVersion() {
+      this(getJavaVersion(), OS_NAME.value(), OS_VERSION.value(), GoogleUtils.VERSION);
+    }
+
+    ApiClientVersion(String javaVersion, String osName, String osVersion, String clientVersion) {
+      StringBuilder sb = new StringBuilder("gl-java/");
+      sb.append(formatSemver(javaVersion));
+      sb.append(" gdcl/");
+      sb.append(formatSemver(clientVersion));
+      if (osName != null && osVersion != null) {
+        sb.append(" ");
+        sb.append(formatName(osName));
+        sb.append("/");
+        sb.append(formatSemver(osVersion));
+      }
+      this.versionString = sb.toString();
+    }
+
+    public String toString() {
+      return versionString;
+    }
+
+    private static String getJavaVersion() {
+      String version = System.getProperty("java.version");
+      if (version == null) {
+        return null;
+      }
+
+      // Try parsing the full semver
+      String formatted = formatSemver(version, null);
+      if (formatted != null) {
+        return formatted;
+      }
+
+      // Some java versions start with the version number and may contain extra info
+      // e.g. Java 9 reports something like 9-Debian+0-x-y while Java 11 reports "11"
+      Matcher m = Pattern.compile("^(\\d+)[^\\d]?").matcher(version);
+      if (m.find()) {
+        return m.group(1) + ".0.0";
+      }
+
+      return null;
+    }
+
+    private static String formatName(String name) {
+      // Only lowercase letters, digits, and "-" are allowed
+      return name.toLowerCase().replaceAll("[^\\w\\d\\-]", "-");
+    }
+
+    private static String formatSemver(String version) {
+      return formatSemver(version, version);
+    }
+
+    private static String formatSemver(String version, String defaultValue) {
+      if (version == null) {
+        return null;
+      }
+
+      // Take only the semver version: x.y.z-a_b_c -> x.y.z
+      Matcher m = Pattern.compile("(\\d+\\.\\d+\\.\\d+).*").matcher(version);
+      if (m.find()) {
+        return m.group(1);
+      } else {
+        return defaultValue;
+      }
     }
   }
 
@@ -126,23 +218,45 @@ public final boolean getDisableGZipContent() {
     return disableGZipContent;
   }
 
+  /**
+   * Returns whether response should return raw input stream.
+   *
+   * @since 1.30
+   */
+  public final boolean getReturnRawInputSteam() {
+    return returnRawInputStream;
+  }
+
   /**
    * Sets whether to disable GZip compression of HTTP content.
    *
-   * <p>
-   * By default it is {@code false}.
-   * </p>
+   * <p>By default it is {@code false}.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public AbstractGoogleClientRequest<T> setDisableGZipContent(boolean disableGZipContent) {
     this.disableGZipContent = disableGZipContent;
     return this;
   }
 
+  /**
+   * Sets whether the response should return raw input stream or not.
+   *
+   * <p>By default it is {@code false}.
+   *
+   * <p>When the response contains a known content-encoding header, the response stream is wrapped
+   * with an InputStream that decodes the content. This fails when we download large files in chunks
+   * (see <a href="https://github.com/googleapis/google-api-java-client/issues/1009">#1009 </a>).
+   * Setting this to true will make the response return the raw input stream.
+   *
+   * @since 1.30
+   */
+  public AbstractGoogleClientRequest<T> setReturnRawInputStream(boolean returnRawInputStream) {
+    this.returnRawInputStream = returnRawInputStream;
+    return this;
+  }
+
   /** Returns the HTTP method. */
   public final String getRequestMethod() {
     return requestMethod;
@@ -161,10 +275,8 @@ public final HttpContent getHttpContent() {
   /**
    * Returns the Google client.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public AbstractGoogleClient getAbstractGoogleClient() {
     return abstractGoogleClient;
@@ -178,15 +290,11 @@ public final HttpHeaders getRequestHeaders() {
   /**
    * Sets the HTTP headers used for the Google client request.
    *
-   * <p>
-   * These headers are set on the request after {@link #buildHttpRequest} is called, this means that
-   * {@link HttpRequestInitializer#initialize} is called first.
-   * </p>
+   * <p>These headers are set on the request after {@link #buildHttpRequest} is called, this means
+   * that {@link HttpRequestInitializer#initialize} is called first.
    *
-   * <p>
-   * Overriding is only supported for the purpose of calling the super implementation and changing
-   * the return type, but nothing else.
-   * </p>
+   * <p>Overriding is only supported for the purpose of calling the super implementation and
+   * changing the return type, but nothing else.
    */
   public AbstractGoogleClientRequest<T> setRequestHeaders(HttpHeaders headers) {
     this.requestHeaders = headers;
@@ -232,8 +340,9 @@ public final MediaHttpUploader getMediaHttpUploader() {
    */
   protected final void initializeMediaUpload(AbstractInputStreamContent mediaContent) {
     HttpRequestFactory requestFactory = abstractGoogleClient.getRequestFactory();
-    this.uploader = new MediaHttpUploader(
-        mediaContent, requestFactory.getTransport(), requestFactory.getInitializer());
+    this.uploader =
+        new MediaHttpUploader(
+            mediaContent, requestFactory.getTransport(), requestFactory.getInitializer());
     this.uploader.setInitiationRequestMethod(requestMethod);
     if (httpContent != null) {
       this.uploader.setMetadata(httpContent);
@@ -255,9 +364,7 @@ protected final void initializeMediaDownload() {
   /**
    * Creates a new instance of {@link GenericUrl} suitable for use against this service.
    *
-   * <p>
-   * Subclasses may override by calling the super implementation.
-   * </p>
+   * <p>Subclasses may override by calling the super implementation.
    *
    * @return newly created {@link GenericUrl}
    */
@@ -269,9 +376,7 @@ public GenericUrl buildHttpRequestUrl() {
   /**
    * Create a request suitable for use against this service.
    *
-   * <p>
-   * Subclasses may override by calling the super implementation.
-   * </p>
+   * <p>Subclasses may override by calling the super implementation.
    */
   public HttpRequest buildHttpRequest() throws IOException {
     return buildHttpRequest(false);
@@ -280,13 +385,9 @@ public HttpRequest buildHttpRequest() throws IOException {
   /**
    * Create a request suitable for use against this service, but using HEAD instead of GET.
    *
-   * <p>
-   * Only supported when the original request method is GET.
-   * </p>
+   * <p>Only supported when the original request method is GET.
    *
-   * <p>
-   * Subclasses may override by calling the super implementation.
-   * </p>
+   * <p>Subclasses may override by calling the super implementation.
    */
   protected HttpRequest buildHttpRequestUsingHead() throws IOException {
     return buildHttpRequest(true);
@@ -297,54 +398,56 @@ private HttpRequest buildHttpRequest(boolean usingHead) throws IOException {
     Preconditions.checkArgument(uploader == null);
     Preconditions.checkArgument(!usingHead || requestMethod.equals(HttpMethods.GET));
     String requestMethodToUse = usingHead ? HttpMethods.HEAD : requestMethod;
-    final HttpRequest httpRequest = getAbstractGoogleClient()
-        .getRequestFactory().buildRequest(requestMethodToUse, buildHttpRequestUrl(), httpContent);
+    final HttpRequest httpRequest =
+        getAbstractGoogleClient()
+            .getRequestFactory()
+            .buildRequest(requestMethodToUse, buildHttpRequestUrl(), httpContent);
     new MethodOverride().intercept(httpRequest);
     httpRequest.setParser(getAbstractGoogleClient().getObjectParser());
     // custom methods may use POST with no content but require a Content-Length header
-    if (httpContent == null && (requestMethod.equals(HttpMethods.POST)
-        || requestMethod.equals(HttpMethods.PUT) || requestMethod.equals(HttpMethods.PATCH))) {
+    if (httpContent == null
+        && (requestMethod.equals(HttpMethods.POST)
+            || requestMethod.equals(HttpMethods.PUT)
+            || requestMethod.equals(HttpMethods.PATCH))) {
       httpRequest.setContent(new EmptyContent());
     }
     httpRequest.getHeaders().putAll(requestHeaders);
     if (!disableGZipContent) {
       httpRequest.setEncoding(new GZipEncoding());
     }
+    httpRequest.setResponseReturnRawInputStream(returnRawInputStream);
     final HttpResponseInterceptor responseInterceptor = httpRequest.getResponseInterceptor();
-    httpRequest.setResponseInterceptor(new HttpResponseInterceptor() {
-
-      public void interceptResponse(HttpResponse response) throws IOException {
-        if (responseInterceptor != null) {
-          responseInterceptor.interceptResponse(response);
-        }
-        if (!response.isSuccessStatusCode() && httpRequest.getThrowExceptionOnExecuteError()) {
-          throw newExceptionOnError(response);
-        }
-      }
-    });
+    httpRequest.setResponseInterceptor(
+        new HttpResponseInterceptor() {
+
+          public void interceptResponse(HttpResponse response) throws IOException {
+            if (responseInterceptor != null) {
+              responseInterceptor.interceptResponse(response);
+            }
+            if (!response.isSuccessStatusCode() && httpRequest.getThrowExceptionOnExecuteError()) {
+              throw newExceptionOnError(response);
+            }
+          }
+        });
     return httpRequest;
   }
 
   /**
    * Sends the metadata request to the server and returns the raw metadata {@link HttpResponse}.
    *
-   * <p>
-   * Callers are responsible for disconnecting the HTTP response by calling
-   * {@link HttpResponse#disconnect}. Example usage:
-   * </p>
+   * <p>Callers are responsible for disconnecting the HTTP response by calling {@link
+   * HttpResponse#disconnect}. Example usage:
    *
    * <pre>
-     HttpResponse response = request.executeUnparsed();
-     try {
-       // process response..
-     } finally {
-       response.disconnect();
-     }
+   * HttpResponse response = request.executeUnparsed();
+   * try {
+   * // process response..
+   * } finally {
+   * response.disconnect();
+   * }
    * </pre>
    *
-   * <p>
-   * Subclasses may override by calling the super implementation.
-   * </p>
+   * <p>Subclasses may override by calling the super implementation.
    *
    * @return the {@link HttpResponse}
    */
@@ -355,23 +458,19 @@ public HttpResponse executeUnparsed() throws IOException {
   /**
    * Sends the media request to the server and returns the raw media {@link HttpResponse}.
    *
-   * <p>
-   * Callers are responsible for disconnecting the HTTP response by calling
-   * {@link HttpResponse#disconnect}. Example usage:
-   * </p>
+   * <p>Callers are responsible for disconnecting the HTTP response by calling {@link
+   * HttpResponse#disconnect}. Example usage:
    *
    * <pre>
-     HttpResponse response = request.executeMedia();
-     try {
-       // process response..
-     } finally {
-       response.disconnect();
-     }
+   * HttpResponse response = request.executeMedia();
+   * try {
+   * // process response..
+   * } finally {
+   * response.disconnect();
+   * }
    * </pre>
    *
-   * <p>
-   * Subclasses may override by calling the super implementation.
-   * </p>
+   * <p>Subclasses may override by calling the super implementation.
    *
    * @return the {@link HttpResponse}
    */
@@ -381,23 +480,19 @@ protected HttpResponse executeMedia() throws IOException {
   }
 
   /**
-   * Sends the metadata request using HEAD to the server and returns the raw metadata
-   * {@link HttpResponse} for the response headers.
+   * Sends the metadata request using HEAD to the server and returns the raw metadata {@link
+   * HttpResponse} for the response headers.
    *
-   * <p>
-   * Only supported when the original request method is GET. The response content is assumed to be
-   * empty and ignored. Calls {@link HttpResponse#ignore()} so there is no need to disconnect the
+   * <p>Only supported when the original request method is GET. The response content is assumed to
+   * be empty and ignored. Calls {@link HttpResponse#ignore()} so there is no need to disconnect the
    * response. Example usage:
-   * </p>
    *
    * <pre>
-     HttpResponse response = request.executeUsingHead();
-     // look at response.getHeaders()
+   * HttpResponse response = request.executeUsingHead();
+   * // look at response.getHeaders()
    * </pre>
    *
-   * <p>
-   * Subclasses may override by calling the super implementation.
-   * </p>
+   * <p>Subclasses may override by calling the super implementation.
    *
    * @return the {@link HttpResponse}
    */
@@ -420,12 +515,17 @@ private HttpResponse executeUnparsed(boolean usingHead) throws IOException {
     } else {
       // upload request
       GenericUrl httpRequestUrl = buildHttpRequestUrl();
-      HttpRequest httpRequest = getAbstractGoogleClient()
-          .getRequestFactory().buildRequest(requestMethod, httpRequestUrl, httpContent);
+      HttpRequest httpRequest =
+          getAbstractGoogleClient()
+              .getRequestFactory()
+              .buildRequest(requestMethod, httpRequestUrl, httpContent);
       boolean throwExceptionOnExecuteError = httpRequest.getThrowExceptionOnExecuteError();
 
-      response = uploader.setInitiationHeaders(requestHeaders)
-          .setDisableGZipContent(disableGZipContent).upload(httpRequestUrl);
+      response =
+          uploader
+              .setInitiationHeaders(requestHeaders)
+              .setDisableGZipContent(disableGZipContent)
+              .upload(httpRequestUrl);
       response.getRequest().setParser(getAbstractGoogleClient().getObjectParser());
       // process any error
       if (throwExceptionOnExecuteError && !response.isSuccessStatusCode()) {
@@ -440,14 +540,12 @@ private HttpResponse executeUnparsed(boolean usingHead) throws IOException {
   }
 
   /**
-   * Returns the exception to throw on an HTTP error response as defined by
-   * {@link HttpResponse#isSuccessStatusCode()}.
+   * Returns the exception to throw on an HTTP error response as defined by {@link
+   * HttpResponse#isSuccessStatusCode()}.
    *
-   * <p>
-   * It is guaranteed that {@link HttpResponse#isSuccessStatusCode()} is {@code false}. Default
+   * <p>It is guaranteed that {@link HttpResponse#isSuccessStatusCode()} is {@code false}. Default
    * implementation is to call {@link HttpResponseException#HttpResponseException(HttpResponse)},
    * but subclasses may override.
-   * </p>
    *
    * @param response HTTP response
    * @return exception to throw
@@ -459,9 +557,7 @@ protected IOException newExceptionOnError(HttpResponse response) {
   /**
    * Sends the metadata request to the server and returns the parsed metadata response.
    *
-   * <p>
-   * Subclasses may override by calling the super implementation.
-   * </p>
+   * <p>Subclasses may override by calling the super implementation.
    *
    * @return parsed HTTP response
    */
@@ -473,22 +569,18 @@ public T execute() throws IOException {
    * Sends the metadata request to the server and returns the metadata content input stream of
    * {@link HttpResponse}.
    *
-   * <p>
-   * Callers are responsible for closing the input stream after it is processed. Example sample:
-   * </p>
+   * <p>Callers are responsible for closing the input stream after it is processed. Example sample:
    *
    * <pre>
-     InputStream is = request.executeAsInputStream();
-     try {
-       // Process input stream..
-     } finally {
-       is.close();
-     }
+   * InputStream is = request.executeAsInputStream();
+   * try {
+   * // Process input stream..
+   * } finally {
+   * is.close();
+   * }
    * </pre>
    *
-   * <p>
-   * Subclasses may override by calling the super implementation.
-   * </p>
+   * <p>Subclasses may override by calling the super implementation.
    *
    * @return input stream of the response content
    */
@@ -497,25 +589,21 @@ public InputStream executeAsInputStream() throws IOException {
   }
 
   /**
-   * Sends the media request to the server and returns the media content input stream of
-   * {@link HttpResponse}.
+   * Sends the media request to the server and returns the media content input stream of {@link
+   * HttpResponse}.
    *
-   * <p>
-   * Callers are responsible for closing the input stream after it is processed. Example sample:
-   * </p>
+   * <p>Callers are responsible for closing the input stream after it is processed. Example sample:
    *
    * <pre>
-     InputStream is = request.executeMediaAsInputStream();
-     try {
-       // Process input stream..
-     } finally {
-       is.close();
-     }
+   * InputStream is = request.executeMediaAsInputStream();
+   * try {
+   * // Process input stream..
+   * } finally {
+   * is.close();
+   * }
    * </pre>
    *
-   * <p>
-   * Subclasses may override by calling the super implementation.
-   * </p>
+   * <p>Subclasses may override by calling the super implementation.
    *
    * @return input stream of the response content
    */
@@ -524,16 +612,12 @@ protected InputStream executeMediaAsInputStream() throws IOException {
   }
 
   /**
-   * Sends the metadata request to the server and writes the metadata content input stream of
-   * {@link HttpResponse} into the given destination output stream.
+   * Sends the metadata request to the server and writes the metadata content input stream of {@link
+   * HttpResponse} into the given destination output stream.
    *
-   * <p>
-   * This method closes the content of the HTTP response from {@link HttpResponse#getContent()}.
-   * </p>
+   * <p>This method closes the content of the HTTP response from {@link HttpResponse#getContent()}.
    *
-   * <p>
-   * Subclasses may override by calling the super implementation.
-   * </p>
+   * <p>Subclasses may override by calling the super implementation.
    *
    * @param outputStream destination output stream
    */
@@ -542,16 +626,12 @@ public void executeAndDownloadTo(OutputStream outputStream) throws IOException {
   }
 
   /**
-   * Sends the media request to the server and writes the media content input stream of
-   * {@link HttpResponse} into the given destination output stream.
+   * Sends the media request to the server and writes the media content input stream of {@link
+   * HttpResponse} into the given destination output stream.
    *
-   * <p>
-   * This method closes the content of the HTTP response from {@link HttpResponse#getContent()}.
-   * </p>
+   * <p>This method closes the content of the HTTP response from {@link HttpResponse#getContent()}.
    *
-   * <p>
-   * Subclasses may override by calling the super implementation.
-   * </p>
+   * <p>Subclasses may override by calling the super implementation.
    *
    * @param outputStream destination output stream
    */
@@ -566,13 +646,11 @@ protected void executeMediaAndDownloadTo(OutputStream outputStream) throws IOExc
   /**
    * Queues the request into the specified batch request container using the specified error class.
    *
-   * <p>
-   * Batched requests are then executed when {@link BatchRequest#execute()} is called.
-   * </p>
+   * <p>Batched requests are then executed when {@link BatchRequest#execute()} is called.
    *
    * @param batchRequest batch request container
-   * @param errorClass data class the unsuccessful response will be parsed into or
-   *        {@code Void.class} to ignore the content
+   * @param errorClass data class the unsuccessful response will be parsed into or {@code
+   *     Void.class} to ignore the content
    * @param callback batch callback
    */
   public final <E> void queue(
@@ -593,18 +671,19 @@ public AbstractGoogleClientRequest<T> set(String fieldName, Object value) {
   }
 
   /**
-   * Ensures that the specified required parameter is not null or
-   * {@link AbstractGoogleClient#getSuppressRequiredParameterChecks()} is true.
+   * Ensures that the specified required parameter is not null or {@link
+   * AbstractGoogleClient#getSuppressRequiredParameterChecks()} is true.
    *
    * @param value the value of the required parameter
    * @param name the name of the required parameter
-   * @throws IllegalArgumentException if the specified required parameter is null and
-   *         {@link AbstractGoogleClient#getSuppressRequiredParameterChecks()} is false
+   * @throws IllegalArgumentException if the specified required parameter is null and {@link
+   *     AbstractGoogleClient#getSuppressRequiredParameterChecks()} is false
    * @since 1.14
    */
   protected final void checkRequiredParameter(Object value, String name) {
     Preconditions.checkArgument(
         abstractGoogleClient.getSuppressRequiredParameterChecks() || value != null,
-        "Required parameter %s must be specified", name);
+        "Required parameter %s must be specified",
+        name);
   }
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializer.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializer.java
index e14fa4e89..7491a10f7 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializer.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializer.java
@@ -14,86 +14,105 @@
 
 import java.io.IOException;
 
-
 /**
  * Google common client request initializer implementation for setting properties like key and
  * userIp.
  *
- * <p>
- * The simplest usage is to use it to set the key parameter:
- * </p>
+ * <p>The simplest usage is to use it to set the key parameter:
  *
  * <pre>
-  public static final GoogleClientRequestInitializer KEY_INITIALIZER =
-      new CommonGoogleClientRequestInitializer(KEY);
+ * public static final GoogleClientRequestInitializer KEY_INITIALIZER =
+ * CommonGoogleClientRequestInitializer.newBuilder()
+ * .setKey(KEY)
+ * .build();
  * </pre>
  *
- * <p>
- * There is also a constructor to set both the key and userIp parameters:
- * </p>
+ * <p>There is also a constructor to set both the key and userIp parameters:
  *
  * <pre>
-  public static final GoogleClientRequestInitializer INITIALIZER =
-      new CommonGoogleClientRequestInitializer(KEY, USER_IP);
+ * public static final GoogleClientRequestInitializer INITIALIZER =
+ * CommonGoogleClientRequestInitializer.newBuilder()
+ * .setKey(KEY)
+ * .setUserIp(USER_IP)
+ * .build();
  * </pre>
  *
- * <p>
- * If you want to implement custom logic, extend it like this:
- * </p>
+ * <p>If you want to implement custom logic, extend it like this:
  *
  * <pre>
-  public static class MyRequestInitializer extends CommonGoogleClientRequestInitializer {
-
-    {@literal @}Override
-    public void initialize(AbstractGoogleClientRequest{@literal <}?{@literal >} request)
-        throws IOException {
-      // custom logic
-    }
-  }
+ * public static class MyRequestInitializer extends CommonGoogleClientRequestInitializer {
+ *
+ * {@literal @}Override
+ * public void initialize(AbstractGoogleClientRequest{@literal <}?{@literal >} request)
+ * throws IOException {
+ * // custom logic
+ * }
+ * }
  * </pre>
  *
- * <p>
- * Finally, to set the key and userIp parameters and insert custom logic, extend it like this:
- * </p>
+ * <p>Finally, to set the key and userIp parameters and insert custom logic, extend it like this:
  *
  * <pre>
-  public static class MyRequestInitializer2 extends CommonGoogleClientRequestInitializer {
-
-    public MyRequestInitializer2() {
-      super(KEY, USER_IP);
-    }
-
-    {@literal @}Override
-    public void initialize(AbstractGoogleClientRequest{@literal <}?{@literal >} request)
-        throws IOException {
-      super.initialize(request); // must be called to set the key and userIp parameters
-      // insert some additional logic
-    }
-  }
+ * public static class MyRequestInitializer2 extends CommonGoogleClientRequestInitializer {
+ *
+ * public MyRequestInitializer2() {
+ * super(KEY, USER_IP);
+ * }
+ *
+ * {@literal @}Override
+ * public void initialize(AbstractGoogleClientRequest{@literal <}?{@literal >} request)
+ * throws IOException {
+ * super.initialize(request); // must be called to set the key and userIp parameters
+ * // insert some additional logic
+ * }
+ * }
  * </pre>
  *
- * <p>
- * Subclasses should be thread-safe.
- * </p>
+ * <p>Subclasses should be thread-safe.
  *
  * @since 1.12
  * @author Yaniv Inbar
  */
 public class CommonGoogleClientRequestInitializer implements GoogleClientRequestInitializer {
 
+  /**
+   * Contains a reason for making the request, which is intended to be recorded in audit logging. An
+   * example reason would be a support-case ticket number.
+   */
+  private static final String REQUEST_REASON_HEADER_NAME = "X-Goog-Request-Reason";
+
+  /**
+   * A caller-specified project for quota and billing purposes. The caller must have
+   * serviceusage.services.use permission on the project.
+   */
+  private static final String USER_PROJECT_HEADER_NAME = "X-Goog-User-Project";
+
   /** API key or {@code null} to leave it unchanged. */
   private final String key;
 
   /** User IP or {@code null} to leave it unchanged. */
   private final String userIp;
 
+  /** User Agent or {@code null} to leave it unchanged. */
+  private final String userAgent;
+
+  /** Reason for request or {@code null} to leave it unchanged. */
+  private final String requestReason;
+
+  /** Project for quota and billing purposes of {@code null} to leave it unchanged. */
+  private final String userProject;
+
+  /** @deprecated Please use the builder interface */
+  @Deprecated
   public CommonGoogleClientRequestInitializer() {
-    this(null);
+    this(newBuilder());
   }
 
   /**
    * @param key API key or {@code null} to leave it unchanged
+   * @deprecated Please use the builder interface
    */
+  @Deprecated
   public CommonGoogleClientRequestInitializer(String key) {
     this(key, null);
   }
@@ -101,10 +120,28 @@ public CommonGoogleClientRequestInitializer(String key) {
   /**
    * @param key API key or {@code null} to leave it unchanged
    * @param userIp user IP or {@code null} to leave it unchanged
+   * @deprecated Please use the builder interface
    */
+  @Deprecated
   public CommonGoogleClientRequestInitializer(String key, String userIp) {
-    this.key = key;
-    this.userIp = userIp;
+    this(newBuilder().setKey(key).setUserIp(userIp));
+  }
+
+  protected CommonGoogleClientRequestInitializer(Builder builder) {
+    this.key = builder.getKey();
+    this.userIp = builder.getUserIp();
+    this.userAgent = builder.getUserAgent();
+    this.requestReason = builder.getRequestReason();
+    this.userProject = builder.getUserProject();
+  }
+
+  /**
+   * Returns new builder.
+   *
+   * @since 1.30
+   */
+  public static Builder newBuilder() {
+    return new Builder();
   }
 
   /**
@@ -119,6 +156,15 @@ public void initialize(AbstractGoogleClientRequest<?> request) throws IOExceptio
     if (userIp != null) {
       request.put("userIp", userIp);
     }
+    if (userAgent != null) {
+      request.getRequestHeaders().setUserAgent(userAgent);
+    }
+    if (requestReason != null) {
+      request.getRequestHeaders().set(REQUEST_REASON_HEADER_NAME, requestReason);
+    }
+    if (userProject != null) {
+      request.getRequestHeaders().set(USER_PROJECT_HEADER_NAME, userProject);
+    }
   }
 
   /** Returns the API key or {@code null} to leave it unchanged. */
@@ -130,4 +176,149 @@ public final String getKey() {
   public final String getUserIp() {
     return userIp;
   }
+
+  /** Returns the user agent or {@code null} to leave it unchanged. */
+  public final String getUserAgent() {
+    return userAgent;
+  }
+
+  /** Returns the request reason or {@code null} to leave it unchanged. */
+  public final String getRequestReason() {
+    return requestReason;
+  }
+
+  /** Returns the user project or {@code null}. */
+  public final String getUserProject() {
+    return userProject;
+  }
+
+  /**
+   * Builder for {@code CommonGoogleClientRequestInitializer}.
+   *
+   * @since 1.30
+   */
+  public static class Builder {
+    private String key;
+    private String userIp;
+    private String userAgent;
+    private String requestReason;
+    private String userProject;
+
+    /**
+     * Set the API Key for outgoing requests.
+     *
+     * @param key the API key
+     * @return the builder
+     */
+    public Builder setKey(String key) {
+      this.key = key;
+      return self();
+    }
+
+    /**
+     * Returns the API key.
+     *
+     * @return the API key
+     */
+    public String getKey() {
+      return key;
+    }
+
+    /**
+     * Set the IP address of the end user for whom the API call is being made.
+     *
+     * @param userIp the user's IP address
+     * @return the builder
+     */
+    public Builder setUserIp(String userIp) {
+      this.userIp = userIp;
+      return self();
+    }
+
+    /**
+     * Returns the configured userIp.
+     *
+     * @return the userIp
+     */
+    public String getUserIp() {
+      return userIp;
+    }
+
+    /**
+     * Set the user agent.
+     *
+     * @param userAgent the user agent
+     * @return the builder
+     */
+    public Builder setUserAgent(String userAgent) {
+      this.userAgent = userAgent;
+      return self();
+    }
+
+    /**
+     * Returns the configured user agent.
+     *
+     * @return the user agent
+     */
+    public String getUserAgent() {
+      return userAgent;
+    }
+
+    /**
+     * Set the reason for making the request, which is intended to be recorded in audit logging. An
+     * example reason would be a support-case ticket number.
+     *
+     * @param requestReason the reason for making the request
+     * @return the builder
+     */
+    public Builder setRequestReason(String requestReason) {
+      this.requestReason = requestReason;
+      return self();
+    }
+
+    /**
+     * Get the configured request reason.
+     *
+     * @return the request reason
+     */
+    public String getRequestReason() {
+      return requestReason;
+    }
+
+    /**
+     * Set the user project for the request. This is a caller-specified project for quota and
+     * billing purposes. The caller must have serviceusage.services.use permission on the project.
+     *
+     * @param userProject the user project
+     * @return the builder
+     */
+    public Builder setUserProject(String userProject) {
+      this.userProject = userProject;
+      return self();
+    }
+
+    /**
+     * Get the configured user project.
+     *
+     * @return the user project
+     */
+    public String getUserProject() {
+      return userProject;
+    }
+
+    /**
+     * Returns the constructed CommonGoogleClientRequestInitializer instance.
+     *
+     * @return the constructed CommonGoogleClientRequestInitializer instance
+     */
+    public CommonGoogleClientRequestInitializer build() {
+      return new CommonGoogleClientRequestInitializer(this);
+    }
+
+    protected Builder self() {
+      return this;
+    }
+
+    protected Builder() {}
+  }
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/GoogleClientRequestInitializer.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/GoogleClientRequestInitializer.java
index c1a76cea0..f8bcf90db 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/GoogleClientRequestInitializer.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/GoogleClientRequestInitializer.java
@@ -17,21 +17,17 @@
 /**
  * Google client request initializer.
  *
- * <p>
- * For example, this might be used to set a key URL query parameter on all requests:
- * </p>
+ * <p>For example, this might be used to set a key URL query parameter on all requests:
  *
  * <pre>
-  public class KeyRequestInitializer implements GoogleClientRequestInitializer {
-    public void initialize(GoogleClientRequest<?> request) {
-      request.put("key", KEY);
-    }
-  }
+ * public class KeyRequestInitializer implements GoogleClientRequestInitializer {
+ * public void initialize(GoogleClientRequest<?> request) {
+ * request.put("key", KEY);
+ * }
+ * }
  * </pre>
  *
- * <p>
- * Implementations should be thread-safe.
- * </p>
+ * <p>Implementations should be thread-safe.
  *
  * @since 1.12
  * @author Yaniv Inbar
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java
index 65faf653c..b2983f7c4 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -20,7 +20,6 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
-
 import java.util.Arrays;
 import java.util.Collections;
 
@@ -34,7 +33,6 @@ public abstract class AbstractGoogleJsonClient extends AbstractGoogleClient {
 
   /**
    * @param builder builder
-   *
    * @since 1.14
    */
   protected AbstractGoogleJsonClient(Builder builder) {
@@ -54,9 +52,7 @@ public final JsonFactory getJsonFactory() {
   /**
    * Builder for {@link AbstractGoogleJsonClient}.
    *
-   * <p>
-   * Implementation is not thread-safe.
-   * </p>
+   * <p>Implementation is not thread-safe.
    */
   public abstract static class Builder extends AbstractGoogleClient.Builder {
 
@@ -68,13 +64,24 @@ public abstract static class Builder extends AbstractGoogleClient.Builder {
      * @param httpRequestInitializer HTTP request initializer or {@code null} for none
      * @param legacyDataWrapper whether using the legacy data wrapper in responses
      */
-    protected Builder(HttpTransport transport, JsonFactory jsonFactory, String rootUrl,
-        String servicePath, HttpRequestInitializer httpRequestInitializer,
+    protected Builder(
+        HttpTransport transport,
+        JsonFactory jsonFactory,
+        String rootUrl,
+        String servicePath,
+        HttpRequestInitializer httpRequestInitializer,
         boolean legacyDataWrapper) {
-      super(transport, rootUrl, servicePath, new JsonObjectParser.Builder(
-          jsonFactory).setWrapperKeys(
-          legacyDataWrapper ? Arrays.asList("data", "error") : Collections.<String>emptySet())
-          .build(), httpRequestInitializer);
+      super(
+          transport,
+          rootUrl,
+          servicePath,
+          new JsonObjectParser.Builder(jsonFactory)
+              .setWrapperKeys(
+                  legacyDataWrapper
+                      ? Arrays.asList("data", "error")
+                      : Collections.<String>emptySet())
+              .build(),
+          httpRequestInitializer);
     }
 
     @Override
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java
index 6a2634546..a1f2d3694 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientRequest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -23,15 +23,12 @@
 import com.google.api.client.http.HttpResponse;
 import com.google.api.client.http.UriTemplate;
 import com.google.api.client.http.json.JsonHttpContent;
-
 import java.io.IOException;
 
 /**
  * Google JSON request for a {@link AbstractGoogleJsonClient}.
  *
- * <p>
- * Implementation is not thread-safe.
- * </p>
+ * <p>Implementation is not thread-safe.
  *
  * @param <T> type of the response
  * @since 1.12
@@ -46,18 +43,30 @@ public abstract class AbstractGoogleJsonClientRequest<T> extends AbstractGoogleC
    * @param abstractGoogleJsonClient Google JSON client
    * @param requestMethod HTTP Method
    * @param uriTemplate URI template for the path relative to the base URL. If it starts with a "/"
-   *        the base path from the base URL will be stripped out. The URI template can also be a
-   *        full URL. URI template expansion is done using
-   *        {@link UriTemplate#expand(String, String, Object, boolean)}
+   *     the base path from the base URL will be stripped out. The URI template can also be a full
+   *     URL. URI template expansion is done using {@link UriTemplate#expand(String, String, Object,
+   *     boolean)}
    * @param jsonContent POJO that can be serialized into JSON content or {@code null} for none
    * @param responseClass response class to parse into
    */
-  protected AbstractGoogleJsonClientRequest(AbstractGoogleJsonClient abstractGoogleJsonClient,
-      String requestMethod, String uriTemplate, Object jsonContent, Class<T> responseClass) {
-    super(abstractGoogleJsonClient, requestMethod, uriTemplate, jsonContent == null ? null
-        : new JsonHttpContent(abstractGoogleJsonClient.getJsonFactory(), jsonContent)
-            .setWrapperKey(abstractGoogleJsonClient.getObjectParser().getWrapperKeys().isEmpty()
-                ? null : "data"), responseClass);
+  protected AbstractGoogleJsonClientRequest(
+      AbstractGoogleJsonClient abstractGoogleJsonClient,
+      String requestMethod,
+      String uriTemplate,
+      Object jsonContent,
+      Class<T> responseClass) {
+    super(
+        abstractGoogleJsonClient,
+        requestMethod,
+        uriTemplate,
+        jsonContent == null
+            ? null
+            : new JsonHttpContent(abstractGoogleJsonClient.getJsonFactory(), jsonContent)
+                .setWrapperKey(
+                    abstractGoogleJsonClient.getObjectParser().getWrapperKeys().isEmpty()
+                        ? null
+                        : "data"),
+        responseClass);
     this.jsonContent = jsonContent;
   }
 
@@ -79,26 +88,22 @@ public AbstractGoogleJsonClientRequest<T> setRequestHeaders(HttpHeaders headers)
   /**
    * Queues the request into the specified batch request container.
    *
-   * <p>
-   * Batched requests are then executed when {@link BatchRequest#execute()} is called.
-   * </p>
-   * <p>
-   * Example usage:
-   * </p>
+   * <p>Batched requests are then executed when {@link BatchRequest#execute()} is called.
+   *
+   * <p>Example usage:
    *
    * <pre>
-     request.queue(batchRequest, new JsonBatchCallback&lt;SomeResponseType&gt;() {
-
-       public void onSuccess(SomeResponseType content, HttpHeaders responseHeaders) {
-         log("Success");
-       }
-
-       public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
-         log(e.getMessage());
-       }
-     });
-   * </pre>
+   * request.queue(batchRequest, new JsonBatchCallback&lt;SomeResponseType&gt;() {
+   *
+   * public void onSuccess(SomeResponseType content, HttpHeaders responseHeaders) {
+   * log("Success");
+   * }
    *
+   * public void onFailure(GoogleJsonError e, HttpHeaders responseHeaders) {
+   * log(e.getMessage());
+   * }
+   * });
+   * </pre>
    *
    * @param batchRequest batch request container
    * @param callback batch callback
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java
index 45784c316..020aba147 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -16,80 +16,78 @@
 
 import com.google.api.client.googleapis.services.AbstractGoogleClientRequest;
 import com.google.api.client.googleapis.services.CommonGoogleClientRequestInitializer;
-
 import java.io.IOException;
 
 /**
  * Google JSON client request initializer implementation for setting properties like key and userIp.
  *
- * <p>
- * The simplest usage is to use it to set the key parameter:
- * </p>
+ * <p>The simplest usage is to use it to set the key parameter:
  *
  * <pre>
-  public static final GoogleClientRequestInitializer KEY_INITIALIZER =
-      new CommonGoogleJsonClientRequestInitializer(KEY);
+ * public static final GoogleClientRequestInitializer KEY_INITIALIZER =
+ * CommonGoogleJsonClientRequestInitializer.newBuilder()
+ * .setKey(KEY)
+ * .build();
  * </pre>
  *
- * <p>
- * There is also a constructor to set both the key and userIp parameters:
- * </p>
+ * <p>There is also a constructor to set both the key and userIp parameters:
  *
  * <pre>
-  public static final GoogleClientRequestInitializer INITIALIZER =
-      new CommonGoogleJsonClientRequestInitializer(KEY, USER_IP);
+ * public static final GoogleClientRequestInitializer INITIALIZER =
+ * CommonGoogleJsonClientRequestInitializer.newBuilder()
+ * .setKey(KEY)
+ * .setUserIp(USER_IP)
+ * .build();
  * </pre>
  *
- * <p>
- * If you want to implement custom logic, extend it like this:
- * </p>
+ * <p>If you want to implement custom logic, extend it like this:
  *
  * <pre>
-  public static class MyRequestInitializer extends CommonGoogleJsonClientRequestInitializer {
-
-    {@literal @}Override
-    public void initialize(AbstractGoogleJsonClientRequest{@literal <}?{@literal >} request)
-        throws IOException {
-      // custom logic
-    }
-  }
+ * public static class MyRequestInitializer extends CommonGoogleJsonClientRequestInitializer {
+ *
+ * {@literal @}Override
+ * public void initialize(AbstractGoogleJsonClientRequest{@literal <}?{@literal >} request)
+ * throws IOException {
+ * // custom logic
+ * }
+ * }
  * </pre>
  *
- * <p>
- * Finally, to set the key and userIp parameters and insert custom logic, extend it like this:
- * </p>
+ * <p>Finally, to set the key and userIp parameters and insert custom logic, extend it like this:
  *
  * <pre>
-  public static class MyKeyRequestInitializer extends CommonGoogleJsonClientRequestInitializer {
-
-    public MyKeyRequestInitializer() {
-      super(KEY, USER_IP);
-    }
-
-    {@literal @}Override
-    public void initializeJsonRequest(
-        AbstractGoogleJsonClientRequest{@literal <}?{@literal >} request) throws IOException {
-      // custom logic
-    }
-  }
+ * public static class MyKeyRequestInitializer extends CommonGoogleJsonClientRequestInitializer {
+ *
+ * public MyKeyRequestInitializer() {
+ * super(KEY, USER_IP);
+ * }
+ *
+ * {@literal @}Override
+ * public void initializeJsonRequest(
+ * AbstractGoogleJsonClientRequest{@literal <}?{@literal >} request) throws IOException {
+ * // custom logic
+ * }
+ * }
  * </pre>
  *
- * <p>
- * Subclasses should be thread-safe.
- * </p>
+ * <p>Subclasses should be thread-safe.
  *
  * @since 1.12
  * @author Yaniv Inbar
  */
 public class CommonGoogleJsonClientRequestInitializer extends CommonGoogleClientRequestInitializer {
 
+  /** @deprecated Please use the builder interface */
+  @Deprecated
   public CommonGoogleJsonClientRequestInitializer() {
     super();
   }
 
   /**
    * @param key API key or {@code null} to leave it unchanged
+   * @deprecated Please use the builder interface
    */
+  @Deprecated
   public CommonGoogleJsonClientRequestInitializer(String key) {
     super(key);
   }
@@ -97,7 +95,9 @@ public CommonGoogleJsonClientRequestInitializer(String key) {
   /**
    * @param key API key or {@code null} to leave it unchanged
    * @param userIp user IP or {@code null} to leave it unchanged
+   * @deprecated Please use the builder interface
    */
+  @Deprecated
   public CommonGoogleJsonClientRequestInitializer(String key, String userIp) {
     super(key, userIp);
   }
@@ -111,14 +111,23 @@ public final void initialize(AbstractGoogleClientRequest<?> request) throws IOEx
   /**
    * Initializes a Google JSON client request.
    *
-   * <p>
-   * Default implementation does nothing. Called from
-   * {@link #initialize(AbstractGoogleClientRequest)}.
-   * </p>
+   * <p>Default implementation does nothing. Called from {@link
+   * #initialize(AbstractGoogleClientRequest)}.
    *
    * @throws IOException I/O exception
    */
   protected void initializeJsonRequest(AbstractGoogleJsonClientRequest<?> request)
-      throws IOException {
+      throws IOException {}
+
+  /**
+   * Builder for {@code CommonGoogleJsonClientRequestInitializer}.
+   *
+   * @since 1.30
+   */
+  public static class Builder extends CommonGoogleClientRequestInitializer.Builder {
+    @Override
+    protected Builder self() {
+      return this;
+    }
   }
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/package-info.java
index 14cbf0f61..cc07b77f9 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/json/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -18,6 +18,4 @@
  * @since 1.12
  * @author Yaniv Inbar
  */
-
 package com.google.api.client.googleapis.services.json;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/services/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/services/package-info.java
index f35dce213..764d1b3a9 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/services/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/services/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 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
@@ -18,6 +18,4 @@
  * @since 1.6
  * @author Ravi Mistry
  */
-
 package com.google.api.client.googleapis.services;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/TestUtils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/TestUtils.java
index 4eb84292d..e516c8e9d 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/TestUtils.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/TestUtils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Google Inc.
+ * Copyright 2014 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
@@ -16,16 +16,13 @@
 
 import com.google.common.base.Splitter;
 import com.google.common.collect.Lists;
-
 import java.io.IOException;
 import java.net.URLDecoder;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-/**
- * Utility class for test code.
- */
+/** Utility class for test code. */
 public final class TestUtils {
 
   private static final String UTF_8 = "UTF-8";
@@ -45,6 +42,5 @@ public static Map<String, String> parseQuery(String query) throws IOException {
     return map;
   }
 
-  private TestUtils() {
-  }
+  private TestUtils() {}
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockGoogleCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockGoogleCredential.java
index fa4879fbd..0058a2840 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockGoogleCredential.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockGoogleCredential.java
@@ -6,17 +6,16 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.api.client.util.Beta;
 import com.google.api.client.util.Clock;
-
 import java.io.IOException;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Mock for {@link GoogleCredential}.
  *
  * @since 1.20
@@ -27,15 +26,16 @@ public class MockGoogleCredential extends GoogleCredential {
   public static final String REFRESH_TOKEN = "refresh123";
   private static final String EXPIRES_IN_SECONDS = "3600";
   private static final String TOKEN_TYPE = "Bearer";
-  private static final String TOKEN_RESPONSE = "{"
-      +   "\"access_token\": \"%s\", "
-      +   "\"expires_in\":  %s, "
-      +   "\"refresh_token\": \"%s\", "
-      +   "\"token_type\": \"%s\""
-      + "}";
+  private static final String TOKEN_RESPONSE =
+      "{"
+          + "\"access_token\": \"%s\", "
+          + "\"expires_in\":  %s, "
+          + "\"refresh_token\": \"%s\", "
+          + "\"token_type\": \"%s\""
+          + "}";
 
-  private static final String DEFAULT_TOKEN_RESPONSE_JSON = String.format(TOKEN_RESPONSE,
-      ACCESS_TOKEN, EXPIRES_IN_SECONDS, REFRESH_TOKEN, TOKEN_TYPE);
+  private static final String DEFAULT_TOKEN_RESPONSE_JSON =
+      String.format(TOKEN_RESPONSE, ACCESS_TOKEN, EXPIRES_IN_SECONDS, REFRESH_TOKEN, TOKEN_TYPE);
 
   public MockGoogleCredential(Builder builder) {
     super(builder);
@@ -47,12 +47,11 @@ public MockGoogleCredential(Builder builder) {
    * <p>Setters that are necessary for simple {@link GoogleCredential} creation are overridden in
    * order to change the return type. A concrete {@link JsonFactory} is set by default, since JSON
    * parsing is relied upon often in GoogleCredential which makes mocking parse calls problematic.
-   * </p>
    *
    * <p>By default, a standard {@link MockHttpTransport} is supplied. For simple tests in which
-   * 'refresh' methods are called but the request/response isn't used
-   * {@link #newMockHttpTransportWithSampleTokenResponse()} provides a minimal implementation. For
-   * more complex tests which check request/response behavior prefer MockTokenServerTransport.</p>
+   * 'refresh' methods are called but the request/response isn't used {@link
+   * #newMockHttpTransportWithSampleTokenResponse()} provides a minimal implementation. For more
+   * complex tests which check request/response behavior prefer MockTokenServerTransport.
    */
   @Beta
   public static class Builder extends GoogleCredential.Builder {
@@ -85,36 +84,33 @@ public MockGoogleCredential build() {
         setClientAuthentication(new MockClientAuthentication());
       }
       if (getJsonFactory() == null) {
-        setJsonFactory(new JacksonFactory());
+        setJsonFactory(new GsonFactory());
       }
       return new MockGoogleCredential(this);
     }
   }
 
- /**
-  * Returns a new {@link MockHttpTransport} with a sample {@link MockLowLevelHttpResponse}. The
-  * response includes sample TokenResponse content as specified in DEFAULT_TOKEN_RESPONSE_JSON. This
-  * is meant to produce a minimal implementation that allows methods such as
-  * {@link GoogleCredential#executeRefreshToken()} to be called without failing abruptly. This
-  * content is static. If you are making assertions based on the content of the request, then
-  * MockTokenServerTransport should be used instead.
-  *
-  * @return mockHttpTransport
-  */
+  /**
+   * Returns a new {@link MockHttpTransport} with a sample {@link MockLowLevelHttpResponse}. The
+   * response includes sample TokenResponse content as specified in DEFAULT_TOKEN_RESPONSE_JSON.
+   * This is meant to produce a minimal implementation that allows methods such as {@link
+   * GoogleCredential#executeRefreshToken()} to be called without failing abruptly. This content is
+   * static. If you are making assertions based on the content of the request, then
+   * MockTokenServerTransport should be used instead.
+   *
+   * @return mockHttpTransport
+   */
   public static MockHttpTransport newMockHttpTransportWithSampleTokenResponse() {
-    MockLowLevelHttpResponse mockLowLevelHttpResponse = new MockLowLevelHttpResponse()
-       .setContentType(Json.MEDIA_TYPE)
-       .setContent(DEFAULT_TOKEN_RESPONSE_JSON);
-    MockLowLevelHttpRequest request = new MockLowLevelHttpRequest()
-        .setResponse(mockLowLevelHttpResponse);
-    return new MockHttpTransport.Builder()
-        .setLowLevelHttpRequest(request)
-        .build();
+    MockLowLevelHttpResponse mockLowLevelHttpResponse =
+        new MockLowLevelHttpResponse()
+            .setContentType(Json.MEDIA_TYPE)
+            .setContent(DEFAULT_TOKEN_RESPONSE_JSON);
+    MockLowLevelHttpRequest request =
+        new MockLowLevelHttpRequest().setResponse(mockLowLevelHttpResponse);
+    return new MockHttpTransport.Builder().setLowLevelHttpRequest(request).build();
   }
 
-  /**
-   * Mock for ClientAuthentication.
-   */
+  /** Mock for ClientAuthentication. */
   @Beta
   private static class MockClientAuthentication implements HttpExecuteInterceptor {
     @Override
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java
index b63eef47f..1ad0d7de0 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/MockTokenServerTransport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Google Inc.
+ * Copyright 2014 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
@@ -21,27 +21,33 @@
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.json.webtoken.JsonWebSignature;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.api.client.util.Beta;
-
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Logger;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * A test transport that simulates Google's token server for refresh tokens and service accounts.
  *
  * @since 1.19
  */
 @Beta
 public class MockTokenServerTransport extends MockHttpTransport {
+  /** Old URL of Google's token server (for backwards compatibility). */
+  private static final String LEGACY_TOKEN_SERVER_URL =
+      "https://accounts.google.com/o/oauth2/token";
+
+  private static final Logger LOGGER = Logger.getLogger(MockTokenServerTransport.class.getName());
+
   static final String EXPECTED_GRANT_TYPE = "urn:ietf:params:oauth:grant-type:jwt-bearer";
-  static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  static final JsonFactory JSON_FACTORY = new GsonFactory();
   final String tokenServerUrl;
   Map<String, String> serviceAccounts = new HashMap<String, String>();
   Map<String, String> clients = new HashMap<String, String>();
@@ -70,64 +76,71 @@ public void addRefreshToken(String refreshToken, String accessTokenToReturn) {
   @Override
   public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
     if (url.equals(tokenServerUrl)) {
-      MockLowLevelHttpRequest request = new MockLowLevelHttpRequest(url) {
-        @Override
-        public LowLevelHttpResponse execute() throws IOException {
-          String content = this.getContentAsString();
-          Map<String, String> query = TestUtils.parseQuery(content);
-          String accessToken = null;
+      return buildTokenRequest(url);
+    } else if (url.equals(LEGACY_TOKEN_SERVER_URL)) {
+      LOGGER.warning(
+          "Your configured token_uri is using a legacy endpoint. You may want to "
+              + "redownload your credentials.");
+      return buildTokenRequest(url);
+    }
+    return super.buildRequest(method, url);
+  }
 
-          String foundId = query.get("client_id");
-          if (foundId != null) {
-            if (!clients.containsKey(foundId)) {
-              throw new IOException("Client ID not found.");
-            }
-            String foundSecret = query.get("client_secret");
-            String expectedSecret = clients.get(foundId);
-            if (foundSecret == null || !foundSecret.equals(expectedSecret)) {
-              throw new IOException("Client secret not found.");
-            }
-            String foundRefresh = query.get("refresh_token");
-            if (!refreshTokens.containsKey(foundRefresh)) {
-              throw new IOException("Refresh Token not found.");
-            }
-            accessToken = refreshTokens.get(foundRefresh);
-          } else if (query.containsKey("grant_type")) {
-            String grantType = query.get("grant_type");
-            if (!EXPECTED_GRANT_TYPE.equals(grantType)) {
-              throw new IOException("Unexpected Grant Type.");
-            }
-            String assertion = query.get("assertion");
-            JsonWebSignature signature = JsonWebSignature.parse(JSON_FACTORY, assertion);
-            String foundEmail = signature.getPayload().getIssuer();
-            if (!serviceAccounts.containsKey(foundEmail)) {
-              throw new IOException("Service Account Email not found as issuer.");
-            }
-            accessToken = serviceAccounts.get(foundEmail);
-            String foundScopes = (String) signature.getPayload().get("scope");
-            if (foundScopes == null || foundScopes.length() == 0) {
-              throw new IOException("Scopes not found.");
-            }
-          } else {
-            throw new IOException("Unknown token type.");
+  private MockLowLevelHttpRequest buildTokenRequest(String url) {
+    return new MockLowLevelHttpRequest(url) {
+      @Override
+      public LowLevelHttpResponse execute() throws IOException {
+        String content = this.getContentAsString();
+        Map<String, String> query = TestUtils.parseQuery(content);
+        String accessToken = null;
+
+        String foundId = query.get("client_id");
+        if (foundId != null) {
+          if (!clients.containsKey(foundId)) {
+            throw new IOException("Client ID not found.");
+          }
+          String foundSecret = query.get("client_secret");
+          String expectedSecret = clients.get(foundId);
+          if (foundSecret == null || !foundSecret.equals(expectedSecret)) {
+            throw new IOException("Client secret not found.");
           }
+          String foundRefresh = query.get("refresh_token");
+          if (!refreshTokens.containsKey(foundRefresh)) {
+            throw new IOException("Refresh Token not found.");
+          }
+          accessToken = refreshTokens.get(foundRefresh);
+        } else if (query.containsKey("grant_type")) {
+          String grantType = query.get("grant_type");
+          if (!EXPECTED_GRANT_TYPE.equals(grantType)) {
+            throw new IOException("Unexpected Grant Type.");
+          }
+          String assertion = query.get("assertion");
+          JsonWebSignature signature = JsonWebSignature.parse(JSON_FACTORY, assertion);
+          String foundEmail = signature.getPayload().getIssuer();
+          if (!serviceAccounts.containsKey(foundEmail)) {
+            throw new IOException("Service Account Email not found as issuer.");
+          }
+          accessToken = serviceAccounts.get(foundEmail);
+          String foundScopes = (String) signature.getPayload().get("scope");
+          if (foundScopes == null || foundScopes.length() == 0) {
+            throw new IOException("Scopes not found.");
+          }
+        } else {
+          throw new IOException("Unknown token type.");
+        }
 
-          // Create the JSon response
-          GenericJson refreshContents = new GenericJson();
-          refreshContents.setFactory(JSON_FACTORY);
-          refreshContents.put("access_token", accessToken);
-          refreshContents.put("expires_in", 3600000);
-          refreshContents.put("token_type", "Bearer");
-          String refreshText  = refreshContents.toPrettyString();
+        // Create the JSon response
+        GenericJson refreshContents = new GenericJson();
+        refreshContents.setFactory(JSON_FACTORY);
+        refreshContents.put("access_token", accessToken);
+        refreshContents.put("expires_in", 3600);
+        refreshContents.put("token_type", "Bearer");
+        String refreshText = refreshContents.toPrettyString();
 
-          MockLowLevelHttpResponse response = new MockLowLevelHttpResponse()
-            .setContentType(Json.MEDIA_TYPE)
-            .setContent(refreshText);
-          return response;
-        }
-      };
-      return request;
-    }
-    return super.buildRequest(method, url);
+        MockLowLevelHttpResponse response =
+            new MockLowLevelHttpResponse().setContentType(Json.MEDIA_TYPE).setContent(refreshText);
+        return response;
+      }
+    };
   }
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/package-info.java
index ee154a4de..b58b4c4e3 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/auth/oauth2/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Google Inc.
+ * Copyright 2014 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
@@ -13,11 +13,10 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Test utilities for the {@code com.google.api.client.googleapis.auth.oauth2} package.
  *
  * @since 1.19
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.testing.auth.oauth2;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java
index da055afae..1814d067e 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/MockMetadataServerTransport.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Google Inc.
+ * Copyright 2014 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
@@ -20,16 +20,15 @@
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.api.client.util.Beta;
-
 import java.io.IOException;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Transport that simulates the GCE metadata server for access tokens.
  *
  * @since 1.19
@@ -42,7 +41,7 @@ public class MockMetadataServerTransport extends MockHttpTransport {
   private static final String METADATA_TOKEN_SERVER_URL =
       METADATA_SERVER_URL + "/computeMetadata/v1/instance/service-accounts/default/token";
 
-  static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  static final JsonFactory JSON_FACTORY = new GsonFactory();
 
   String accessToken;
 
@@ -60,47 +59,50 @@ public void setTokenRequestStatusCode(Integer tokenRequestStatusCode) {
   public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
     if (url.equals(METADATA_TOKEN_SERVER_URL)) {
 
-      MockLowLevelHttpRequest request = new MockLowLevelHttpRequest(url) {
-        @Override
-        public LowLevelHttpResponse execute() throws IOException {
-
-          if (tokenRequestStatusCode != null) {
-            MockLowLevelHttpResponse response = new MockLowLevelHttpResponse()
-              .setStatusCode(tokenRequestStatusCode)
-              .setContent("Token Fetch Error");
-            return response;
-          }
-
-          String metadataRequestHeader = getFirstHeaderValue("Metadata-Flavor");
-          if (!"Google".equals(metadataRequestHeader)) {
-            throw new IOException("Metadata request header not found.");
-          }
-
-          // Create the JSon response
-          GenericJson refreshContents = new GenericJson();
-          refreshContents.setFactory(JSON_FACTORY);
-          refreshContents.put("access_token", accessToken);
-          refreshContents.put("expires_in", 3600000);
-          refreshContents.put("token_type", "Bearer");
-          String refreshText  = refreshContents.toPrettyString();
-
-          MockLowLevelHttpResponse response = new MockLowLevelHttpResponse()
-            .setContentType(Json.MEDIA_TYPE)
-            .setContent(refreshText);
-          return response;
-
-        }
-      };
+      MockLowLevelHttpRequest request =
+          new MockLowLevelHttpRequest(url) {
+            @Override
+            public LowLevelHttpResponse execute() throws IOException {
+
+              if (tokenRequestStatusCode != null) {
+                MockLowLevelHttpResponse response =
+                    new MockLowLevelHttpResponse()
+                        .setStatusCode(tokenRequestStatusCode)
+                        .setContent("Token Fetch Error");
+                return response;
+              }
+
+              String metadataRequestHeader = getFirstHeaderValue("Metadata-Flavor");
+              if (!"Google".equals(metadataRequestHeader)) {
+                throw new IOException("Metadata request header not found.");
+              }
+
+              // Create the JSon response
+              GenericJson refreshContents = new GenericJson();
+              refreshContents.setFactory(JSON_FACTORY);
+              refreshContents.put("access_token", accessToken);
+              refreshContents.put("expires_in", 3600000);
+              refreshContents.put("token_type", "Bearer");
+              String refreshText = refreshContents.toPrettyString();
+
+              MockLowLevelHttpResponse response =
+                  new MockLowLevelHttpResponse()
+                      .setContentType(Json.MEDIA_TYPE)
+                      .setContent(refreshText);
+              return response;
+            }
+          };
       return request;
     } else if (url.equals(METADATA_SERVER_URL)) {
-      MockLowLevelHttpRequest request = new MockLowLevelHttpRequest(url) {
-        @Override
-        public LowLevelHttpResponse execute() {
-          MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
-          response.addHeader("Metadata-Flavor", "Google");
-          return response;
-        }
-      };
+      MockLowLevelHttpRequest request =
+          new MockLowLevelHttpRequest(url) {
+            @Override
+            public LowLevelHttpResponse execute() {
+              MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
+              response.addHeader("Metadata-Flavor", "Google");
+              return response;
+            }
+          };
       return request;
     }
     return super.buildRequest(method, url);
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/package-info.java
index 1ce05ee8c..3897b11d5 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/compute/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Google Inc.
+ * Copyright 2014 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
@@ -13,11 +13,10 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Test utilities for the {@code com.google.api.client.googleapis.compute} package.
  *
  * @since 1.19
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.testing.compute;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTesting.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTesting.java
index dd8e019dd..3afefe0d3 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTesting.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTesting.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -17,18 +17,17 @@
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpResponse;
+import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.testing.http.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
 import com.google.api.client.util.Beta;
-
 import java.io.IOException;
 
 /**
- * {@link Beta} <br/>
- * Factory class that builds {@link GoogleJsonResponseException} instances for
- * testing.
+ * {@link Beta} <br>
+ * Factory class that builds {@link GoogleJsonResponseException} instances for testing.
  *
  * @since 1.18
  */
@@ -36,35 +35,41 @@
 public final class GoogleJsonResponseExceptionFactoryTesting {
 
   /**
-   * Convenience factory method that builds a {@link GoogleJsonResponseException}
-   * from its arguments. The method builds a dummy {@link HttpRequest} and
-   * {@link HttpResponse}, sets the response's status to a user-specified HTTP
-   * error code, suppresses exceptions, and executes the request. This forces
-   * the underlying framework to create, but not throw, a
-   * {@link GoogleJsonResponseException}, which the method retrieves and returns
-   * to the invoker.
+   * Convenience factory method that builds a {@link GoogleJsonResponseException} from its
+   * arguments. The method builds a dummy {@link HttpRequest} and {@link HttpResponse}, sets the
+   * response's status to a user-specified HTTP error code, suppresses exceptions, and executes the
+   * request. This forces the underlying framework to create, but not throw, a {@link
+   * GoogleJsonResponseException}, which the method retrieves and returns to the invoker.
    *
-   * @param jsonFactory the JSON factory that will create all JSON required
-   *        by the underlying framework
-   * @param httpCode the desired HTTP error code. Note: do nut specify any codes
-   *        that indicate successful completion, e.g. 2XX.
-   * @param reasonPhrase the HTTP reason code that explains the error. For example,
-   *        if {@code httpCode} is {@code 404}, the reason phrase should be
-   *        {@code NOT FOUND}.
+   * @param jsonFactory the JSON factory that will create all JSON required by the underlying
+   *     framework
+   * @param httpCode the desired HTTP error code. Note: do nut specify any codes that indicate
+   *     successful completion, e.g. 2XX.
+   * @param reasonPhrase the HTTP reason code that explains the error. For example, if {@code
+   *     httpCode} is {@code 404}, the reason phrase should be {@code NOT FOUND}.
    * @return the generated {@link GoogleJsonResponseException}, as specified.
    * @throws IOException if request transport fails.
    */
-  public static GoogleJsonResponseException newMock(JsonFactory jsonFactory,
-      int httpCode, String reasonPhrase) throws IOException {
+  public static GoogleJsonResponseException newMock(
+      JsonFactory jsonFactory, int httpCode, String reasonPhrase) throws IOException {
     MockLowLevelHttpResponse otherServiceUnavaiableLowLevelResponse =
         new MockLowLevelHttpResponse()
-        .setStatusCode(httpCode)
-        .setReasonPhrase(reasonPhrase);
-    MockHttpTransport otherTransport = new MockHttpTransport.Builder()
-        .setLowLevelHttpResponse(otherServiceUnavaiableLowLevelResponse)
-        .build();
-    HttpRequest otherRequest = otherTransport
-        .createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
+            .setStatusCode(httpCode)
+            .setReasonPhrase(reasonPhrase)
+            .setContentType(Json.MEDIA_TYPE)
+            .setContent(
+                "{ \"error\": { \"errors\": [ { \"reason\": \""
+                    + reasonPhrase
+                    + "\" } ], "
+                    + "\"code\": "
+                    + httpCode
+                    + " } }");
+    MockHttpTransport otherTransport =
+        new MockHttpTransport.Builder()
+            .setLowLevelHttpResponse(otherServiceUnavaiableLowLevelResponse)
+            .build();
+    HttpRequest otherRequest =
+        otherTransport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
     otherRequest.setThrowExceptionOnExecuteError(false);
     HttpResponse otherServiceUnavailableResponse = otherRequest.execute();
     return GoogleJsonResponseException.from(jsonFactory, otherServiceUnavailableResponse);
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/package-info.java
index 6a04aba13..b1d92776e 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/json/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,11 +13,10 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Test utilities for the {@code com.google.api.client.googleapis.json} package.
  *
  * @since 1.18
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.testing.json;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/MockUnparsedNotificationCallback.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/MockUnparsedNotificationCallback.java
index 583afae41..a9edfe913 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/MockUnparsedNotificationCallback.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/MockUnparsedNotificationCallback.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -18,11 +18,10 @@
 import com.google.api.client.googleapis.notifications.UnparsedNotification;
 import com.google.api.client.googleapis.notifications.UnparsedNotificationCallback;
 import com.google.api.client.util.Beta;
-
 import java.io.IOException;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Mock for the {@link UnparsedNotificationCallback} class.
  *
  * @author Yaniv Inbar
@@ -43,8 +42,7 @@ public boolean wasCalled() {
     return wasCalled;
   }
 
-  public MockUnparsedNotificationCallback() {
-  }
+  public MockUnparsedNotificationCallback() {}
 
   @SuppressWarnings("unused")
   public void onNotification(StoredChannel storedChannel, UnparsedNotification notification)
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/package-info.java
index 0f619e03d..74c41c7e6 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/notifications/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -13,7 +13,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Test utilities for the {@code com.google.api.client.googleapis.notifications} package.
  *
  * @author Yaniv Inbar
@@ -22,4 +22,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.testing.notifications;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/package-info.java
index d2abd68d9..3b639950d 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Google Inc.
+ * Copyright 2014 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
@@ -13,11 +13,10 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Test utilities for the {@code com.google.api.client.googleapis} package.
  *
  * @since 1.19
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.testing;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/MockGoogleClient.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/MockGoogleClient.java
index 05587a323..41b4a9cf6 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/MockGoogleClient.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/MockGoogleClient.java
@@ -20,7 +20,7 @@
 import com.google.api.client.util.ObjectParser;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Thread-safe mock Google client.
  *
  * @since 1.12
@@ -35,17 +35,19 @@ public class MockGoogleClient extends AbstractGoogleClient {
    * @param servicePath service path
    * @param objectParser object parser or {@code null} for none
    * @param httpRequestInitializer HTTP request initializer or {@code null} for none
-   *
    * @since 1.14
    */
-  public MockGoogleClient(HttpTransport transport, String rootUrl, String servicePath,
-      ObjectParser objectParser, HttpRequestInitializer httpRequestInitializer) {
+  public MockGoogleClient(
+      HttpTransport transport,
+      String rootUrl,
+      String servicePath,
+      ObjectParser objectParser,
+      HttpRequestInitializer httpRequestInitializer) {
     this(new Builder(transport, rootUrl, servicePath, objectParser, httpRequestInitializer));
   }
 
   /**
    * @param builder builder
-   *
    * @since 1.14
    */
   protected MockGoogleClient(Builder builder) {
@@ -55,9 +57,7 @@ protected MockGoogleClient(Builder builder) {
   /**
    * Builder for {@link MockGoogleClient}.
    *
-   * <p>
-   * Implementation is not thread-safe.
-   * </p>
+   * <p>Implementation is not thread-safe.
    */
   @Beta
   public static class Builder extends AbstractGoogleClient.Builder {
@@ -69,8 +69,12 @@ public static class Builder extends AbstractGoogleClient.Builder {
      * @param objectParser object parser or {@code null} for none
      * @param httpRequestInitializer HTTP request initializer or {@code null} for none
      */
-    public Builder(HttpTransport transport, String rootUrl, String servicePath,
-        ObjectParser objectParser, HttpRequestInitializer httpRequestInitializer) {
+    public Builder(
+        HttpTransport transport,
+        String rootUrl,
+        String servicePath,
+        ObjectParser objectParser,
+        HttpRequestInitializer httpRequestInitializer) {
       super(transport, rootUrl, servicePath, objectParser, httpRequestInitializer);
     }
 
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/MockGoogleClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/MockGoogleClientRequest.java
index c82e2f6f4..c1cf32cc2 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/MockGoogleClientRequest.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/MockGoogleClientRequest.java
@@ -20,7 +20,7 @@
 import com.google.api.client.util.Beta;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Thread-safe mock Google request.
  *
  * @param <T> type of the response
@@ -34,14 +34,18 @@ public class MockGoogleClientRequest<T> extends AbstractGoogleClientRequest<T> {
    * @param client Google client
    * @param method HTTP Method
    * @param uriTemplate URI template for the path relative to the base URL. If it starts with a "/"
-   *        the base path from the base URL will be stripped out. The URI template can also be a
-   *        full URL. URI template expansion is done using
-   *        {@link UriTemplate#expand(String, String, Object, boolean)}
+   *     the base path from the base URL will be stripped out. The URI template can also be a full
+   *     URL. URI template expansion is done using {@link UriTemplate#expand(String, String, Object,
+   *     boolean)}
    * @param content HTTP content or {@code null} for none
    * @param responseClass response class to parse into
    */
-  public MockGoogleClientRequest(AbstractGoogleClient client, String method, String uriTemplate,
-      HttpContent content, Class<T> responseClass) {
+  public MockGoogleClientRequest(
+      AbstractGoogleClient client,
+      String method,
+      String uriTemplate,
+      HttpContent content,
+      Class<T> responseClass) {
     super(client, method, uriTemplate, content, responseClass);
   }
 
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/MockGoogleJsonClient.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/MockGoogleJsonClient.java
index 20a36abf2..c81d6a120 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/MockGoogleJsonClient.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/MockGoogleJsonClient.java
@@ -20,7 +20,7 @@
 import com.google.api.client.util.Beta;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Thread-safe mock Google JSON client.
  *
  * @since 1.12
@@ -31,7 +31,6 @@ public class MockGoogleJsonClient extends AbstractGoogleJsonClient {
 
   /**
    * @param builder builder
-   *
    * @since 1.14
    */
   protected MockGoogleJsonClient(Builder builder) {
@@ -46,20 +45,28 @@ protected MockGoogleJsonClient(Builder builder) {
    * @param httpRequestInitializer HTTP request initializer or {@code null} for none
    * @param legacyDataWrapper whether using the legacy data wrapper in responses
    */
-  public MockGoogleJsonClient(HttpTransport transport, JsonFactory jsonFactory, String rootUrl,
-      String servicePath, HttpRequestInitializer httpRequestInitializer,
+  public MockGoogleJsonClient(
+      HttpTransport transport,
+      JsonFactory jsonFactory,
+      String rootUrl,
+      String servicePath,
+      HttpRequestInitializer httpRequestInitializer,
       boolean legacyDataWrapper) {
-    this(new Builder(
-        transport, jsonFactory, rootUrl, servicePath, httpRequestInitializer, legacyDataWrapper));
+    this(
+        new Builder(
+            transport,
+            jsonFactory,
+            rootUrl,
+            servicePath,
+            httpRequestInitializer,
+            legacyDataWrapper));
   }
 
   /**
-   * {@link Beta} <br/>
+   * {@link Beta} <br>
    * Builder for {@link MockGoogleJsonClient}.
    *
-   * <p>
-   * Implementation is not thread-safe.
-   * </p>
+   * <p>Implementation is not thread-safe.
    */
   @Beta
   public static class Builder extends AbstractGoogleJsonClient.Builder {
@@ -72,8 +79,12 @@ public static class Builder extends AbstractGoogleJsonClient.Builder {
      * @param httpRequestInitializer HTTP request initializer or {@code null} for none
      * @param legacyDataWrapper whether using the legacy data wrapper in responses
      */
-    public Builder(HttpTransport transport, JsonFactory jsonFactory, String rootUrl,
-        String servicePath, HttpRequestInitializer httpRequestInitializer,
+    public Builder(
+        HttpTransport transport,
+        JsonFactory jsonFactory,
+        String rootUrl,
+        String servicePath,
+        HttpRequestInitializer httpRequestInitializer,
         boolean legacyDataWrapper) {
       super(
           transport, jsonFactory, rootUrl, servicePath, httpRequestInitializer, legacyDataWrapper);
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/MockGoogleJsonClientRequest.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/MockGoogleJsonClientRequest.java
index a98e47fcf..33974c250 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/MockGoogleJsonClientRequest.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/MockGoogleJsonClientRequest.java
@@ -19,7 +19,7 @@
 import com.google.api.client.util.Beta;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Thread-safe mock Google JSON request.
  *
  * @param <T> type of the response
@@ -33,13 +33,17 @@ public class MockGoogleJsonClientRequest<T> extends AbstractGoogleJsonClientRequ
    * @param client Google client
    * @param method HTTP Method
    * @param uriTemplate URI template for the path relative to the base URL. If it starts with a "/"
-   *        the base path from the base URL will be stripped out. The URI template can also be a
-   *        full URL. URI template expansion is done using
-   *        {@link UriTemplate#expand(String, String, Object, boolean)}
+   *     the base path from the base URL will be stripped out. The URI template can also be a full
+   *     URL. URI template expansion is done using {@link UriTemplate#expand(String, String, Object,
+   *     boolean)}
    * @param content A POJO that can be serialized into JSON or {@code null} for none
    */
-  public MockGoogleJsonClientRequest(AbstractGoogleJsonClient client, String method,
-      String uriTemplate, Object content, Class<T> responseClass) {
+  public MockGoogleJsonClientRequest(
+      AbstractGoogleJsonClient client,
+      String method,
+      String uriTemplate,
+      Object content,
+      Class<T> responseClass) {
     super(client, method, uriTemplate, content, responseClass);
   }
 
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/package-info.java
index fff5fc5ea..78741f9f6 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/json/package-info.java
@@ -11,7 +11,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Test utilities for the {@code com.google.api.client.googleapis.services.json} package.
  *
  * @since 1.12
@@ -19,4 +19,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.testing.services.json;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/package-info.java
index fd5c8a01d..cf6ddc241 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/testing/services/package-info.java
@@ -11,7 +11,7 @@
  */
 
 /**
- * {@link com.google.api.client.util.Beta} <br/>
+ * {@link com.google.api.client.util.Beta} <br>
  * Test utilities for the {@code com.google.api.client.googleapis.services} package.
  *
  * @since 1.12
@@ -19,4 +19,3 @@
  */
 @com.google.api.client.util.Beta
 package com.google.api.client.googleapis.testing.services;
-
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/util/Utils.java b/google-api-client/src/main/java/com/google/api/client/googleapis/util/Utils.java
index 8294c0e33..d1e9ca8c0 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/util/Utils.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/util/Utils.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -17,11 +17,11 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.util.Beta;
 
 /**
- * {@link Beta} <br/>
+ * {@link Beta} <br>
  * Utility class for the Google API Client Library.
  *
  * @since 1.19
@@ -29,9 +29,7 @@
 @Beta
 public final class Utils {
 
-  /**
-   * Returns a cached default implementation of the JsonFactory interface.
-   */
+  /** Returns a cached default implementation of the JsonFactory interface. */
   public static JsonFactory getDefaultJsonFactory() {
     return JsonFactoryInstanceHolder.INSTANCE;
   }
@@ -41,12 +39,10 @@ private static class JsonFactoryInstanceHolder {
     // other APIs to not require one of these for input. This was the most commonly used
     // implementation in public samples. This is a compile-time dependency to help detect the
     // dependency as early as possible.
-    static final JsonFactory INSTANCE = new JacksonFactory();
+    static final JsonFactory INSTANCE = new GsonFactory();
   }
 
-  /**
-   * Returns a cached default implementation of the HttpTransport interface.
-   */
+  /** Returns a cached default implementation of the HttpTransport interface. */
   public static HttpTransport getDefaultTransport() {
     return TransportInstanceHolder.INSTANCE;
   }
@@ -55,6 +51,5 @@ private static class TransportInstanceHolder {
     static final HttpTransport INSTANCE = new NetHttpTransport();
   }
 
-  private Utils() {
-  }
+  private Utils() {}
 }
diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/util/package-info.java b/google-api-client/src/main/java/com/google/api/client/googleapis/util/package-info.java
index 0269964d3..f1f9b0ee8 100644
--- a/google-api-client/src/main/java/com/google/api/client/googleapis/util/package-info.java
+++ b/google-api-client/src/main/java/com/google/api/client/googleapis/util/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Google Inc.
+ * Copyright 2014 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
@@ -18,4 +18,3 @@
  * @since 1.19
  */
 package com.google.api.client.googleapis.util;
-
diff --git a/google-api-client/src/main/properties/com/google/api/client/googleapis/google-api-client.properties b/google-api-client/src/main/properties/com/google/api/client/googleapis/google-api-client.properties
new file mode 100644
index 000000000..f6a515d62
--- /dev/null
+++ b/google-api-client/src/main/properties/com/google/api/client/googleapis/google-api-client.properties
@@ -0,0 +1 @@
+google-api-client.version=${project.version}
diff --git a/google-api-client/src/main/resources/META-INF/proguard/google-api-client.pro b/google-api-client/src/main/resources/META-INF/proguard/google-api-client.pro
new file mode 100644
index 000000000..8f805a49a
--- /dev/null
+++ b/google-api-client/src/main/resources/META-INF/proguard/google-api-client.pro
@@ -0,0 +1,2 @@
+# https://github.com/googleapis/google-api-java-client/issues/1450
+-keep public class com.google.api.client.googleapis.GoogleUtils
diff --git a/google-api-client/src/main/resources/com/google/api/client/googleapis/google.p12 b/google-api-client/src/main/resources/com/google/api/client/googleapis/google.p12
new file mode 100644
index 000000000..9f7953100
Binary files /dev/null and b/google-api-client/src/main/resources/com/google/api/client/googleapis/google.p12 differ
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java
index cad543e2a..372fdc106 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/GoogleUtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -16,6 +16,7 @@
 
 import java.security.KeyStore;
 import java.util.Enumeration;
+import java.util.regex.Matcher;
 import junit.framework.TestCase;
 
 /**
@@ -36,4 +37,30 @@ public void testGetCertificateTrustStore() throws Exception {
     // has been added or removed
     assertEquals(70, trustStore.size());
   }
+
+  public void testVersionMatcher() {
+    String version = "1.30.3";
+    Matcher matcher = GoogleUtils.VERSION_PATTERN.matcher(version);
+    assertTrue(matcher.find());
+    assertEquals(1, Integer.parseInt(matcher.group(1)));
+    assertEquals(30, Integer.parseInt(matcher.group(2)));
+    assertEquals(3, Integer.parseInt(matcher.group(3)));
+  }
+
+  public void testVersionMatcherSnapshot() {
+    String version = "1.30.3-SNAPSHOT";
+    Matcher matcher = GoogleUtils.VERSION_PATTERN.matcher(version);
+    assertTrue(matcher.find());
+    assertEquals(1, Integer.parseInt(matcher.group(1)));
+    assertEquals(30, Integer.parseInt(matcher.group(2)));
+    assertEquals(3, Integer.parseInt(matcher.group(3)));
+  }
+
+  public void testVersion() {
+    Matcher matcher = GoogleUtils.VERSION_PATTERN.matcher(GoogleUtils.VERSION);
+    assertTrue(matcher.find());
+    assertNotNull(GoogleUtils.MAJOR_VERSION);
+    assertNotNull(GoogleUtils.MINOR_VERSION);
+    assertNotNull(GoogleUtils.BUGFIX_VERSION);
+  }
 }
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/MethodOverrideTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/MethodOverrideTest.java
index f6f5a9dad..5d5b096da 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/MethodOverrideTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/MethodOverrideTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2010 Google Inc.
+ * Copyright 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
@@ -58,29 +58,47 @@ public MethodOverrideTest(String name) {
 
   public void testIntercept() throws Exception {
     subtestIntercept(ImmutableSet.<String>of(), new MockHttpTransport(), new MethodOverride());
-    subtestIntercept(OVERRIDDEN_METHODS, new MockHttpTransport(),
+    subtestIntercept(
+        OVERRIDDEN_METHODS,
+        new MockHttpTransport(),
         new MethodOverride.Builder().setOverrideAllMethods(true).build());
-    subtestIntercept(OVERRIDDEN_METHODS, new MockHttpTransport.Builder()
-        .setSupportedMethods(ImmutableSet.<String>of(HttpMethods.GET, HttpMethods.POST)).build(),
+    subtestIntercept(
+        OVERRIDDEN_METHODS,
+        new MockHttpTransport.Builder()
+            .setSupportedMethods(ImmutableSet.<String>of(HttpMethods.GET, HttpMethods.POST))
+            .build(),
         new MethodOverride());
   }
 
-  private void subtestIntercept(Collection<String> methodsThatShouldOverride,
-      HttpTransport transport, MethodOverride interceptor) throws Exception {
+  private void subtestIntercept(
+      Collection<String> methodsThatShouldOverride,
+      HttpTransport transport,
+      MethodOverride interceptor)
+      throws Exception {
     for (String requestMethod : SUPPORTED_METHODS) {
       subtestIntercept(
           methodsThatShouldOverride.contains(requestMethod), transport, interceptor, requestMethod);
     }
   }
 
-  private void subtestIntercept(boolean shouldOverride, HttpTransport transport,
-      MethodOverride interceptor, String requestMethod) throws Exception {
-    HttpRequest request = transport.createRequestFactory()
-        .buildRequest(requestMethod, HttpTesting.SIMPLE_GENERIC_URL, null);
+  private void subtestIntercept(
+      boolean shouldOverride,
+      HttpTransport transport,
+      MethodOverride interceptor,
+      String requestMethod)
+      throws Exception {
+    HttpRequest request =
+        transport
+            .createRequestFactory()
+            .buildRequest(requestMethod, HttpTesting.SIMPLE_GENERIC_URL, null);
     interceptor.intercept(request);
-    assertEquals(requestMethod, shouldOverride ? HttpMethods.POST : requestMethod,
+    assertEquals(
+        requestMethod,
+        shouldOverride ? HttpMethods.POST : requestMethod,
         request.getRequestMethod());
-    assertEquals(requestMethod, shouldOverride ? requestMethod : null,
+    assertEquals(
+        requestMethod,
+        shouldOverride ? requestMethod : null,
         request.getHeaders().get(MethodOverride.HEADER));
   }
 
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/apache/v2/GoogleApacheHttpTransportTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/apache/v2/GoogleApacheHttpTransportTest.java
new file mode 100644
index 000000000..18d504287
--- /dev/null
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/apache/v2/GoogleApacheHttpTransportTest.java
@@ -0,0 +1,43 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.api.client.googleapis.apache.v2;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import com.google.api.client.googleapis.apache.v2.GoogleApacheHttpTransport.SocketFactoryRegistryHandler;
+import com.google.api.client.googleapis.mtls.MtlsProvider;
+import com.google.api.client.googleapis.mtls.MtlsTransportBaseTest;
+import com.google.api.client.http.HttpTransport;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import org.junit.Test;
+
+public class GoogleApacheHttpTransportTest extends MtlsTransportBaseTest {
+  @Override
+  protected HttpTransport buildTrustedTransport(MtlsProvider mtlsProvider)
+      throws GeneralSecurityException, IOException {
+    return GoogleApacheHttpTransport.newTrustedTransport(mtlsProvider);
+  }
+
+  @Test
+  public void socketFactoryRegistryHandlerTest() throws GeneralSecurityException, IOException {
+    MtlsProvider mtlsProvider = new TestMtlsProvider(true, createTestMtlsKeyStore(), "", false);
+    SocketFactoryRegistryHandler handler = new SocketFactoryRegistryHandler(mtlsProvider);
+    assertNotNull(handler.getSocketFactoryRegistry().lookup("http"));
+    assertNotNull(handler.getSocketFactoryRegistry().lookup("https"));
+    assertTrue(handler.isMtls());
+  }
+}
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/CloudShellCredentialTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/CloudShellCredentialTest.java
index 30e66574a..69bc04839 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/CloudShellCredentialTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/CloudShellCredentialTest.java
@@ -44,14 +44,12 @@
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
-/**
- * Unit tests for CloudShellCredential
- */
+/** Unit tests for CloudShellCredential */
 @RunWith(JUnit4.class)
 public class CloudShellCredentialTest {
 
   @Test
-  public void refreshAccessToken() throws IOException{
+  public void refreshAccessToken() throws IOException {
     final ServerSocket authSocket = new ServerSocket(0);
     Runnable serverTask =
         new Runnable() {
@@ -65,8 +63,7 @@ public void run() {
               lines += '\n' + input.readLine();
               assertEquals(CloudShellCredential.GET_AUTH_TOKEN_REQUEST, lines);
 
-              PrintWriter out =
-                  new PrintWriter(clientSocket.getOutputStream(), true);
+              PrintWriter out = new PrintWriter(clientSocket.getOutputStream(), true);
               out.println("32\n[\"email\", \"project-id\", \"token\", 1234]");
             } catch (Exception reThrown) {
               throw new RuntimeException(reThrown);
@@ -76,8 +73,8 @@ public void run() {
     Thread serverThread = new Thread(serverTask);
     serverThread.start();
 
-    GoogleCredential creds = new CloudShellCredential(
-        authSocket.getLocalPort(), GsonFactory.getDefaultInstance());
+    GoogleCredential creds =
+        new CloudShellCredential(authSocket.getLocalPort(), GsonFactory.getDefaultInstance());
     assertEquals("token", creds.executeRefreshToken().getAccessToken());
   }
 }
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProviderTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProviderTest.java
index e3ff493f6..d3ea60ccc 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProviderTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/DefaultCredentialProviderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Google Inc.
+ * Copyright 2014 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
@@ -23,7 +23,7 @@
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import java.io.File;
@@ -42,30 +42,28 @@
 import java.util.concurrent.locks.ReentrantLock;
 import junit.framework.TestCase;
 
-/**
- * Tests {@link DefaultCredentialProvider}.
- *
- */
+/** Tests {@link DefaultCredentialProvider}. */
 public class DefaultCredentialProviderTest extends TestCase {
 
-  private static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  private static final JsonFactory JSON_FACTORY = new GsonFactory();
 
   private static final Collection<String> SCOPES =
       Collections.unmodifiableCollection(Arrays.asList("scope1", "scope2"));
 
   private static final String SA_KEY_ID = "key_id";
-  private static final String SA_KEY_TEXT = "-----BEGIN PRIVATE KEY-----\n"
-      + "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALX0PQoe1igW12i"
-      + "kv1bN/r9lN749y2ijmbc/mFHPyS3hNTyOCjDvBbXYbDhQJzWVUikh4mvGBA07qTj79Xc3yBDfKP2IeyYQIFe0t0"
-      + "zkd7R9Zdn98Y2rIQC47aAbDfubtkU1U72t4zL11kHvoa0/RuFZjncvlr42X7be7lYh4p3NAgMBAAECgYASk5wDw"
-      + "4Az2ZkmeuN6Fk/y9H+Lcb2pskJIXjrL533vrDWGOC48LrsThMQPv8cxBky8HFSEklPpkfTF95tpD43iVwJRB/Gr"
-      + "CtGTw65IfJ4/tI09h6zGc4yqvIo1cHX/LQ+SxKLGyir/dQM925rGt/VojxY5ryJR7GLbCzxPnJm/oQJBANwOCO6"
-      + "D2hy1LQYJhXh7O+RLtA/tSnT1xyMQsGT+uUCMiKS2bSKx2wxo9k7h3OegNJIu1q6nZ6AbxDK8H3+d0dUCQQDTrP"
-      + "SXagBxzp8PecbaCHjzNRSQE2in81qYnrAFNB4o3DpHyMMY6s5ALLeHKscEWnqP8Ur6X4PvzZecCWU9BKAZAkAut"
-      + "LPknAuxSCsUOvUfS1i87ex77Ot+w6POp34pEX+UWb+u5iFn2cQacDTHLV1LtE80L8jVLSbrbrlH43H0DjU5AkEA"
-      + "gidhycxS86dxpEljnOMCw8CKoUBd5I880IUahEiUltk7OLJYS/Ts1wbn3kPOVX3wyJs8WBDtBkFrDHW2ezth2QJ"
-      + "ADj3e1YhMVdjJW5jqwlD/VNddGjgzyunmiZg0uOXsHXbytYmsA545S8KRQFaJKFXYYFo2kOjqOiC1T2cAzMDjCQ"
-      + "==\n-----END PRIVATE KEY-----\n";
+  private static final String SA_KEY_TEXT =
+      "-----BEGIN PRIVATE KEY-----\n"
+          + "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALX0PQoe1igW12i"
+          + "kv1bN/r9lN749y2ijmbc/mFHPyS3hNTyOCjDvBbXYbDhQJzWVUikh4mvGBA07qTj79Xc3yBDfKP2IeyYQIFe0t0"
+          + "zkd7R9Zdn98Y2rIQC47aAbDfubtkU1U72t4zL11kHvoa0/RuFZjncvlr42X7be7lYh4p3NAgMBAAECgYASk5wDw"
+          + "4Az2ZkmeuN6Fk/y9H+Lcb2pskJIXjrL533vrDWGOC48LrsThMQPv8cxBky8HFSEklPpkfTF95tpD43iVwJRB/Gr"
+          + "CtGTw65IfJ4/tI09h6zGc4yqvIo1cHX/LQ+SxKLGyir/dQM925rGt/VojxY5ryJR7GLbCzxPnJm/oQJBANwOCO6"
+          + "D2hy1LQYJhXh7O+RLtA/tSnT1xyMQsGT+uUCMiKS2bSKx2wxo9k7h3OegNJIu1q6nZ6AbxDK8H3+d0dUCQQDTrP"
+          + "SXagBxzp8PecbaCHjzNRSQE2in81qYnrAFNB4o3DpHyMMY6s5ALLeHKscEWnqP8Ur6X4PvzZecCWU9BKAZAkAut"
+          + "LPknAuxSCsUOvUfS1i87ex77Ot+w6POp34pEX+UWb+u5iFn2cQacDTHLV1LtE80L8jVLSbrbrlH43H0DjU5AkEA"
+          + "gidhycxS86dxpEljnOMCw8CKoUBd5I880IUahEiUltk7OLJYS/Ts1wbn3kPOVX3wyJs8WBDtBkFrDHW2ezth2QJ"
+          + "ADj3e1YhMVdjJW5jqwlD/VNddGjgzyunmiZg0uOXsHXbytYmsA545S8KRQFaJKFXYYFo2kOjqOiC1T2cAzMDjCQ"
+          + "==\n-----END PRIVATE KEY-----\n";
   private static final String ACCESS_TOKEN = "1/MkSJoj1xsli0AccessToken_NKPY2";
 
   private static final String GAE_SIGNAL_CLASS = "com.google.appengine.api.utils.SystemProperty";
@@ -74,11 +72,11 @@ public class DefaultCredentialProviderTest extends TestCase {
 
   private static File tempDirectory = null;
 
-  public void testDefaultCredentialAppEngineDeployed() throws IOException  {
+  public void testDefaultCredentialAppEngineDeployed() throws IOException {
     HttpTransport transport = new MockHttpTransport();
     TestDefaultCredentialProvider testProvider = new TestDefaultCredentialProvider();
-    testProvider.addType(DefaultCredentialProvider.APP_ENGINE_CREDENTIAL_CLASS,
-        MockAppEngineCredential.class);
+    testProvider.addType(
+        DefaultCredentialProvider.APP_ENGINE_CREDENTIAL_CLASS, MockAppEngineCredential.class);
     testProvider.addType(GAE_SIGNAL_CLASS, MockAppEngineSystemProperty.class);
 
     Credential defaultCredential = testProvider.getDefaultCredential(transport, JSON_FACTORY);
@@ -92,8 +90,8 @@ public void testDefaultCredentialAppEngineDeployed() throws IOException  {
   public void testDefaultCredentialAppEngineComponentOffAppEngineGivesNotFoundError() {
     HttpTransport transport = new MockHttpTransport();
     TestDefaultCredentialProvider testProvider = new TestDefaultCredentialProvider();
-    testProvider.addType(DefaultCredentialProvider.APP_ENGINE_CREDENTIAL_CLASS,
-        MockAppEngineCredential.class);
+    testProvider.addType(
+        DefaultCredentialProvider.APP_ENGINE_CREDENTIAL_CLASS, MockAppEngineCredential.class);
     testProvider.addType(GAE_SIGNAL_CLASS, MockOffAppEngineSystemProperty.class);
 
     try {
@@ -121,11 +119,11 @@ public void testDefaultCredentialAppEngineWithoutDependencyThrowsHelpfulLoadErro
     }
   }
 
-  public void testDefaultCredentialCaches() throws IOException  {
+  public void testDefaultCredentialCaches() throws IOException {
     HttpTransport transport = new MockHttpTransport();
     TestDefaultCredentialProvider testProvider = new TestDefaultCredentialProvider();
-    testProvider.addType(DefaultCredentialProvider.APP_ENGINE_CREDENTIAL_CLASS,
-        MockAppEngineCredential.class);
+    testProvider.addType(
+        DefaultCredentialProvider.APP_ENGINE_CREDENTIAL_CLASS, MockAppEngineCredential.class);
     testProvider.addType(GAE_SIGNAL_CLASS, MockAppEngineSystemProperty.class);
 
     Credential firstCall = testProvider.getDefaultCredential(transport, JSON_FACTORY);
@@ -260,8 +258,8 @@ public void testDefaultCredentialNonExistentFileThrows() throws Exception {
 
     HttpTransport transport = new MockHttpTransport();
     TestDefaultCredentialProvider testProvider = new TestDefaultCredentialProvider();
-    testProvider.setEnv(DefaultCredentialProvider.CREDENTIAL_ENV_VAR,
-        nonExistentFile.getAbsolutePath());
+    testProvider.setEnv(
+        DefaultCredentialProvider.CREDENTIAL_ENV_VAR, nonExistentFile.getAbsolutePath());
     try {
       testProvider.getDefaultCredential(transport, JSON_FACTORY);
       fail("Non existent user credential should throw exception.");
@@ -286,8 +284,8 @@ public void testDefaultCredentialNotFoundError() {
   }
 
   public void testDefaultCredentialServiceAccount() throws IOException {
-    File serviceAccountFile = new java.io.File(getTempDirectory(),
-        "DefaultCredentialServiceAccount.json");
+    File serviceAccountFile =
+        new java.io.File(getTempDirectory(), "DefaultCredentialServiceAccount.json");
     if (serviceAccountFile.exists()) {
       serviceAccountFile.delete();
     }
@@ -315,8 +313,8 @@ public void testDefaultCredentialServiceAccount() throws IOException {
       writer.close();
 
       // Point the default credential to the file
-      testProvider.setEnv(DefaultCredentialProvider.CREDENTIAL_ENV_VAR,
-          serviceAccountFile.getAbsolutePath());
+      testProvider.setEnv(
+          DefaultCredentialProvider.CREDENTIAL_ENV_VAR, serviceAccountFile.getAbsolutePath());
 
       GoogleCredential credential = testProvider.getDefaultCredential(transport, JSON_FACTORY);
       assertNotNull(credential);
@@ -339,8 +337,8 @@ public void testDefaultCredentialUser() throws IOException {
 
     TestDefaultCredentialProvider testProvider = new TestDefaultCredentialProvider();
     // Point the default credential to the file
-    testProvider.setEnv(DefaultCredentialProvider.CREDENTIAL_ENV_VAR,
-        userCredentialFile.getAbsolutePath());
+    testProvider.setEnv(
+        DefaultCredentialProvider.CREDENTIAL_ENV_VAR, userCredentialFile.getAbsolutePath());
 
     testDefaultCredentialUser(userCredentialFile, testProvider);
   }
@@ -356,8 +354,8 @@ public void testDefaultCredentialWellKnownFileNonWindows() throws IOException {
     if (!cloudConfigDir.exists()) {
       cloudConfigDir.mkdir();
     }
-    File wellKnownFile = new File(
-        cloudConfigDir, DefaultCredentialProvider.WELL_KNOWN_CREDENTIALS_FILE);
+    File wellKnownFile =
+        new File(cloudConfigDir, DefaultCredentialProvider.WELL_KNOWN_CREDENTIALS_FILE);
     if (wellKnownFile.exists()) {
       wellKnownFile.delete();
     }
@@ -376,8 +374,8 @@ public void testDefaultCredentialWellKnownFileWindows() throws IOException {
     if (!cloudConfigDir.exists()) {
       cloudConfigDir.mkdir();
     }
-    File wellKnownFile = new File(
-        cloudConfigDir, DefaultCredentialProvider.WELL_KNOWN_CREDENTIALS_FILE);
+    File wellKnownFile =
+        new File(cloudConfigDir, DefaultCredentialProvider.WELL_KNOWN_CREDENTIALS_FILE);
     if (wellKnownFile.exists()) {
       wellKnownFile.delete();
     }
@@ -404,8 +402,8 @@ public void testDefaultCredentialEnvironmentVariableWinsOverWellKnownFile() thro
     if (environmentVariableFile.exists()) {
       environmentVariableFile.delete();
     }
-    testProvider.setEnv(DefaultCredentialProvider.CREDENTIAL_ENV_VAR,
-        environmentVariableFile.getAbsolutePath());
+    testProvider.setEnv(
+        DefaultCredentialProvider.CREDENTIAL_ENV_VAR, environmentVariableFile.getAbsolutePath());
 
     // Also set up a well-known-location file
     File homeDir = getTempDirectory();
@@ -417,8 +415,8 @@ public void testDefaultCredentialEnvironmentVariableWinsOverWellKnownFile() thro
     if (!cloudConfigDir.exists()) {
       cloudConfigDir.mkdir();
     }
-    File wellKnownFile = new File(
-        cloudConfigDir, DefaultCredentialProvider.WELL_KNOWN_CREDENTIALS_FILE);
+    File wellKnownFile =
+        new File(cloudConfigDir, DefaultCredentialProvider.WELL_KNOWN_CREDENTIALS_FILE);
     if (wellKnownFile.exists()) {
       wellKnownFile.delete();
     }
@@ -527,7 +525,7 @@ private static class MockAppEngineSystemProperty {
 
     @SuppressWarnings("unused")
     public static final MockEnvironment environment =
-      new MockEnvironment(MockEnvironmentEnum.Production);
+        new MockEnvironment(MockEnvironmentEnum.Production);
   }
 
   private static class MockOffAppEngineSystemProperty {
@@ -561,8 +559,7 @@ public MockEnvironmentEnum value() {
   private static class MockRequestUrlRecordingTransport extends MockHttpTransport {
     List<String> requestUrls = new ArrayList<String>();
 
-    MockRequestUrlRecordingTransport() {
-    }
+    MockRequestUrlRecordingTransport() {}
 
     int getRequestCount() {
       return requestUrls.size();
@@ -574,18 +571,19 @@ boolean urlWasRequested(String url) {
 
     @Override
     public LowLevelHttpRequest buildRequest(String method, String url) {
-      MockLowLevelHttpRequest request = new MockLowLevelHttpRequest(url) {
-        @Override
-        public LowLevelHttpResponse execute() throws IOException {
-          requestUrls.add(getUrl());
-          throw new IOException("MockRequestCountingTransport request failed.");
-        }
-      };
+      MockLowLevelHttpRequest request =
+          new MockLowLevelHttpRequest(url) {
+            @Override
+            public LowLevelHttpResponse execute() throws IOException {
+              requestUrls.add(getUrl());
+              throw new IOException("MockRequestCountingTransport request failed.");
+            }
+          };
       return request;
     }
   }
 
-  private static class TestDefaultCredentialProvider extends DefaultCredentialProvider  {
+  private static class TestDefaultCredentialProvider extends DefaultCredentialProvider {
 
     private Map<String, Class<?>> types = new HashMap<String, Class<?>>();
     private Map<String, String> variables = new HashMap<String, String>();
@@ -593,8 +591,7 @@ private static class TestDefaultCredentialProvider extends DefaultCredentialProv
     private Set<String> files = new HashSet<String>();
     private int forNameCallCount = 0;
 
-    TestDefaultCredentialProvider() {
-    }
+    TestDefaultCredentialProvider() {}
 
     void addFile(String file) {
       files.add(file);
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java
index 76283a3ca..ad3722982 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeFlowTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -14,10 +14,9 @@
 
 package com.google.api.client.googleapis.auth.oauth2;
 
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.common.collect.ImmutableList;
-
 import junit.framework.TestCase;
 
 /**
@@ -31,9 +30,13 @@ public class GoogleAuthorizationCodeFlowTest extends TestCase {
   private static final String CLIENT_SECRET = "{client_secret}";
 
   public void testBuilder() {
-    GoogleAuthorizationCodeFlow.Builder builder = new GoogleAuthorizationCodeFlow.Builder(
-        new MockHttpTransport(), new JacksonFactory(), CLIENT_ID, CLIENT_SECRET,
-        ImmutableList.of("https://www.googleapis.com/auth/userinfo.email"));
+    GoogleAuthorizationCodeFlow.Builder builder =
+        new GoogleAuthorizationCodeFlow.Builder(
+            new MockHttpTransport(),
+            new GsonFactory(),
+            CLIENT_ID,
+            CLIENT_SECRET,
+            ImmutableList.of("https://www.googleapis.com/auth/userinfo.email"));
     assertNull(builder.getApprovalPrompt());
     assertNull(builder.getAccessType());
   }
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrlTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrlTest.java
index 9634226ed..b9fd23bc1 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrlTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeRequestUrlTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -26,14 +26,20 @@ public class GoogleAuthorizationCodeRequestUrlTest extends TestCase {
 
   private static final String EXPECTED =
       "https://accounts.google.com/o/oauth2/auth?client_id=812741506391.apps.googleusercontent.com&"
-      + "redirect_uri=https://oauth2-login-demo.appspot.com/code&response_type=code"
-      + "&scope=https://www.googleapis.com/auth/userinfo.email%20"
-      + "https://www.googleapis.com/auth/userinfo.profile&state=/profile";
+          + "redirect_uri=https://oauth2-login-demo.appspot.com/code&response_type=code"
+          + "&scope=https://www.googleapis.com/auth/userinfo.email%20"
+          + "https://www.googleapis.com/auth/userinfo.profile&state=/profile";
 
   public void testBuild() {
-    assertEquals(EXPECTED, new GoogleAuthorizationCodeRequestUrl(
-        "812741506391.apps.googleusercontent.com", "https://oauth2-login-demo.appspot.com/code",
-        Arrays.asList("https://www.googleapis.com/auth/userinfo.email",
-            "https://www.googleapis.com/auth/userinfo.profile")).setState("/profile").build());
+    assertEquals(
+        EXPECTED,
+        new GoogleAuthorizationCodeRequestUrl(
+                "812741506391.apps.googleusercontent.com",
+                "https://oauth2-login-demo.appspot.com/code",
+                Arrays.asList(
+                    "https://www.googleapis.com/auth/userinfo.email",
+                    "https://www.googleapis.com/auth/userinfo.profile"))
+            .setState("/profile")
+            .build());
   }
 }
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java
index 2bddfbcb6..17d4e9d62 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleAuthorizationCodeTokenRequestTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -15,9 +15,8 @@
 package com.google.api.client.googleapis.auth.oauth2;
 
 import com.google.api.client.auth.oauth2.ClientParametersAuthentication;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
-
 import junit.framework.TestCase;
 
 /**
@@ -34,8 +33,9 @@ public class GoogleAuthorizationCodeTokenRequestTest extends TestCase {
 
   public void test() {
     GoogleAuthorizationCodeTokenRequest request =
-        new GoogleAuthorizationCodeTokenRequest(new MockHttpTransport(),
-            new JacksonFactory(),
+        new GoogleAuthorizationCodeTokenRequest(
+            new MockHttpTransport(),
+            new GsonFactory(),
             CLIENT_ID,
             CLIENT_SECRET,
             CODE,
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrlTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrlTest.java
index 6485107e7..c945aba99 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrlTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleBrowserClientRequestUrlTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -26,15 +26,20 @@ public class GoogleBrowserClientRequestUrlTest extends TestCase {
 
   private static final String EXPECTED =
       "https://accounts.google.com/o/oauth2/auth?client_id=812741506391.apps.googleusercontent.com&"
-      + "redirect_uri=https://oauth2-login-demo.appspot.com/oauthcallback&response_type=token"
-      + "&scope=https://www.googleapis.com/auth/userinfo.email%20"
-      + "https://www.googleapis.com/auth/userinfo.profile&state=/profile";
+          + "redirect_uri=https://oauth2-login-demo.appspot.com/oauthcallback&response_type=token"
+          + "&scope=https://www.googleapis.com/auth/userinfo.email%20"
+          + "https://www.googleapis.com/auth/userinfo.profile&state=/profile";
 
   public void testBuild() {
-    assertEquals(EXPECTED, new GoogleBrowserClientRequestUrl(
-        "812741506391.apps.googleusercontent.com",
-        "https://oauth2-login-demo.appspot.com/oauthcallback", Arrays.asList(
-            "https://www.googleapis.com/auth/userinfo.email",
-            "https://www.googleapis.com/auth/userinfo.profile")).setState("/profile").build());
+    assertEquals(
+        EXPECTED,
+        new GoogleBrowserClientRequestUrl(
+                "812741506391.apps.googleusercontent.com",
+                "https://oauth2-login-demo.appspot.com/oauthcallback",
+                Arrays.asList(
+                    "https://www.googleapis.com/auth/userinfo.email",
+                    "https://www.googleapis.com/auth/userinfo.profile"))
+            .setState("/profile")
+            .build());
   }
 }
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecretsTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecretsTest.java
index f50ec1ce4..3c89e6fb9 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecretsTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleClientSecretsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -30,8 +30,12 @@ public class GoogleClientSecretsTest extends TestCase {
 
   private static final String CLIENT_SECRET = "{client_secret}";
 
-  private final static String CLIENT_SECRETS = "{\"installed\": {\"client_id\": \"" + CLIENT_ID
-      + "\",\"client_secret\": \"" + CLIENT_SECRET + "\"}}";
+  private static final String CLIENT_SECRETS =
+      "{\"installed\": {\"client_id\": \""
+          + CLIENT_ID
+          + "\",\"client_secret\": \""
+          + CLIENT_SECRET
+          + "\"}}";
 
   public void testLoad() throws Exception {
     GoogleClientSecrets clientSecrets =
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredentialTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredentialTest.java
index a05fefe12..9c3fb2555 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredentialTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredentialTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -18,7 +18,7 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.util.SecurityTestUtils;
 import java.io.ByteArrayInputStream;
@@ -36,24 +36,25 @@
  */
 public class GoogleCredentialTest extends TestCase {
 
-  private static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  private static final JsonFactory JSON_FACTORY = new GsonFactory();
 
   private static final Collection<String> SCOPES =
       Collections.unmodifiableCollection(Arrays.asList("scope1", "scope2"));
   private static final Collection<String> EMPTY_SCOPES = Collections.emptyList();
 
-  private static final String SA_KEY_TEXT = "-----BEGIN PRIVATE KEY-----\n"
-      + "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALX0PQoe1igW12i"
-      + "kv1bN/r9lN749y2ijmbc/mFHPyS3hNTyOCjDvBbXYbDhQJzWVUikh4mvGBA07qTj79Xc3yBDfKP2IeyYQIFe0t0"
-      + "zkd7R9Zdn98Y2rIQC47aAbDfubtkU1U72t4zL11kHvoa0/RuFZjncvlr42X7be7lYh4p3NAgMBAAECgYASk5wDw"
-      + "4Az2ZkmeuN6Fk/y9H+Lcb2pskJIXjrL533vrDWGOC48LrsThMQPv8cxBky8HFSEklPpkfTF95tpD43iVwJRB/Gr"
-      + "CtGTw65IfJ4/tI09h6zGc4yqvIo1cHX/LQ+SxKLGyir/dQM925rGt/VojxY5ryJR7GLbCzxPnJm/oQJBANwOCO6"
-      + "D2hy1LQYJhXh7O+RLtA/tSnT1xyMQsGT+uUCMiKS2bSKx2wxo9k7h3OegNJIu1q6nZ6AbxDK8H3+d0dUCQQDTrP"
-      + "SXagBxzp8PecbaCHjzNRSQE2in81qYnrAFNB4o3DpHyMMY6s5ALLeHKscEWnqP8Ur6X4PvzZecCWU9BKAZAkAut"
-      + "LPknAuxSCsUOvUfS1i87ex77Ot+w6POp34pEX+UWb+u5iFn2cQacDTHLV1LtE80L8jVLSbrbrlH43H0DjU5AkEA"
-      + "gidhycxS86dxpEljnOMCw8CKoUBd5I880IUahEiUltk7OLJYS/Ts1wbn3kPOVX3wyJs8WBDtBkFrDHW2ezth2QJ"
-      + "ADj3e1YhMVdjJW5jqwlD/VNddGjgzyunmiZg0uOXsHXbytYmsA545S8KRQFaJKFXYYFo2kOjqOiC1T2cAzMDjCQ"
-      + "==\n-----END PRIVATE KEY-----\n";
+  private static final String SA_KEY_TEXT =
+      "-----BEGIN PRIVATE KEY-----\n"
+          + "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALX0PQoe1igW12i"
+          + "kv1bN/r9lN749y2ijmbc/mFHPyS3hNTyOCjDvBbXYbDhQJzWVUikh4mvGBA07qTj79Xc3yBDfKP2IeyYQIFe0t0"
+          + "zkd7R9Zdn98Y2rIQC47aAbDfubtkU1U72t4zL11kHvoa0/RuFZjncvlr42X7be7lYh4p3NAgMBAAECgYASk5wDw"
+          + "4Az2ZkmeuN6Fk/y9H+Lcb2pskJIXjrL533vrDWGOC48LrsThMQPv8cxBky8HFSEklPpkfTF95tpD43iVwJRB/Gr"
+          + "CtGTw65IfJ4/tI09h6zGc4yqvIo1cHX/LQ+SxKLGyir/dQM925rGt/VojxY5ryJR7GLbCzxPnJm/oQJBANwOCO6"
+          + "D2hy1LQYJhXh7O+RLtA/tSnT1xyMQsGT+uUCMiKS2bSKx2wxo9k7h3OegNJIu1q6nZ6AbxDK8H3+d0dUCQQDTrP"
+          + "SXagBxzp8PecbaCHjzNRSQE2in81qYnrAFNB4o3DpHyMMY6s5ALLeHKscEWnqP8Ur6X4PvzZecCWU9BKAZAkAut"
+          + "LPknAuxSCsUOvUfS1i87ex77Ot+w6POp34pEX+UWb+u5iFn2cQacDTHLV1LtE80L8jVLSbrbrlH43H0DjU5AkEA"
+          + "gidhycxS86dxpEljnOMCw8CKoUBd5I880IUahEiUltk7OLJYS/Ts1wbn3kPOVX3wyJs8WBDtBkFrDHW2ezth2QJ"
+          + "ADj3e1YhMVdjJW5jqwlD/VNddGjgzyunmiZg0uOXsHXbytYmsA545S8KRQFaJKFXYYFo2kOjqOiC1T2cAzMDjCQ"
+          + "==\n-----END PRIVATE KEY-----\n";
   private static final String SA_KEY_ID = "key_id";
 
   public void testRefreshToken_ServiceAccounts() throws Exception {
@@ -64,13 +65,14 @@ public void testRefreshToken_ServiceAccounts() throws Exception {
     MockTokenServerTransport transport = new MockTokenServerTransport();
     transport.addServiceAccount(serviceAccountEmail, accessToken);
 
-    GoogleCredential credential = new GoogleCredential.Builder()
-        .setServiceAccountId(serviceAccountEmail)
-        .setServiceAccountScopes(SCOPES)
-        .setServiceAccountPrivateKey(SecurityTestUtils.newRsaPrivateKey())
-        .setTransport(transport)
-        .setJsonFactory(JSON_FACTORY)
-        .build();
+    GoogleCredential credential =
+        new GoogleCredential.Builder()
+            .setServiceAccountId(serviceAccountEmail)
+            .setServiceAccountScopes(SCOPES)
+            .setServiceAccountPrivateKey(SecurityTestUtils.newRsaPrivateKey())
+            .setTransport(transport)
+            .setJsonFactory(JSON_FACTORY)
+            .build();
 
     assertTrue(credential.refreshToken());
     assertEquals(accessToken, credential.getAccessToken());
@@ -86,11 +88,12 @@ public void testRefreshToken_User() throws Exception {
     transport.addClient(clientId, clientSecret);
     transport.addRefreshToken(refreshToken, accessToken);
 
-    GoogleCredential credential = new GoogleCredential.Builder()
-        .setClientSecrets(clientId, clientSecret)
-        .setTransport(transport)
-        .setJsonFactory(JSON_FACTORY)
-        .build();
+    GoogleCredential credential =
+        new GoogleCredential.Builder()
+            .setClientSecrets(clientId, clientSecret)
+            .setTransport(transport)
+            .setJsonFactory(JSON_FACTORY)
+            .build();
     credential.setRefreshToken(refreshToken);
 
     assertTrue(credential.refreshToken());
@@ -104,13 +107,14 @@ public void testCreateScoped() throws Exception {
 
     MockTokenServerTransport transport = new MockTokenServerTransport();
     transport.addServiceAccount(serviceAccountEmail, accessToken);
-    GoogleCredential credential = new GoogleCredential.Builder()
-        .setServiceAccountId(serviceAccountEmail)
-        .setServiceAccountScopes(EMPTY_SCOPES)
-        .setServiceAccountPrivateKey(SecurityTestUtils.newRsaPrivateKey())
-        .setTransport(transport)
-        .setJsonFactory(JSON_FACTORY)
-        .build();
+    GoogleCredential credential =
+        new GoogleCredential.Builder()
+            .setServiceAccountId(serviceAccountEmail)
+            .setServiceAccountScopes(EMPTY_SCOPES)
+            .setServiceAccountPrivateKey(SecurityTestUtils.newRsaPrivateKey())
+            .setTransport(transport)
+            .setJsonFactory(JSON_FACTORY)
+            .build();
     assertTrue(credential.createScopedRequired());
     try {
       credential.refreshToken();
@@ -129,8 +133,8 @@ public void testCreateScoped() throws Exception {
     assertSame(credential.getJsonFactory(), scopedCredential.getJsonFactory());
     assertSame(credential.getServiceAccountId(), scopedCredential.getServiceAccountId());
     assertSame(credential.getServiceAccountUser(), scopedCredential.getServiceAccountUser());
-    assertSame(credential.getServiceAccountPrivateKey(),
-        scopedCredential.getServiceAccountPrivateKey());
+    assertSame(
+        credential.getServiceAccountPrivateKey(), scopedCredential.getServiceAccountPrivateKey());
   }
 
   public void testCreateScopesNotSet() throws Exception {
@@ -140,12 +144,13 @@ public void testCreateScopesNotSet() throws Exception {
     MockTokenServerTransport transport = new MockTokenServerTransport();
     transport.addServiceAccount(serviceAccountEmail, accessToken);
 
-    GoogleCredential credential = new GoogleCredential.Builder()
-        .setServiceAccountId(serviceAccountEmail)
-        .setServiceAccountPrivateKey(SecurityTestUtils.newRsaPrivateKey())
-        .setTransport(transport)
-        .setJsonFactory(JSON_FACTORY)
-        .build();
+    GoogleCredential credential =
+        new GoogleCredential.Builder()
+            .setServiceAccountId(serviceAccountEmail)
+            .setServiceAccountPrivateKey(SecurityTestUtils.newRsaPrivateKey())
+            .setTransport(transport)
+            .setJsonFactory(JSON_FACTORY)
+            .build();
     // Note that setServiceAccountScopes() is not called, so it is uninitialized (i.e. null) on the
     // builder.
     assertTrue(credential.getServiceAccountScopes().isEmpty());
@@ -217,8 +222,8 @@ public void testFromStreamServiceAccount() throws IOException {
     String json = serviceAccountContents.toPrettyString();
     InputStream serviceAccountStream = new ByteArrayInputStream(json.getBytes());
 
-    GoogleCredential defaultCredential = GoogleCredential
-        .fromStream(serviceAccountStream, transport, JSON_FACTORY);
+    GoogleCredential defaultCredential =
+        GoogleCredential.fromStream(serviceAccountStream, transport, JSON_FACTORY);
     assertNotNull(defaultCredential);
     defaultCredential = defaultCredential.createScoped(SCOPES);
 
@@ -249,8 +254,8 @@ public void testFromStreamServiceAccountAlternateTokenUri() throws IOException {
     String json = serviceAccountContents.toPrettyString();
     InputStream serviceAccountStream = new ByteArrayInputStream(json.getBytes());
 
-    GoogleCredential defaultCredential = GoogleCredential
-        .fromStream(serviceAccountStream, transport, JSON_FACTORY);
+    GoogleCredential defaultCredential =
+        GoogleCredential.fromStream(serviceAccountStream, transport, JSON_FACTORY);
     assertNotNull(defaultCredential);
     assertEquals(tokenServerUrl, defaultCredential.getTokenServerEncodedUrl());
     defaultCredential = defaultCredential.createScoped(SCOPES);
@@ -375,8 +380,8 @@ public void testFromStreamUser() throws IOException {
     String json = createUserJson(clientId, clientSecret, refreshToken);
     InputStream userStream = new ByteArrayInputStream(json.getBytes());
 
-    GoogleCredential defaultCredential = GoogleCredential
-        .fromStream(userStream, transport, JSON_FACTORY);
+    GoogleCredential defaultCredential =
+        GoogleCredential.fromStream(userStream, transport, JSON_FACTORY);
 
     assertNotNull(defaultCredential);
     assertEquals(refreshToken, defaultCredential.getRefreshToken());
@@ -451,6 +456,120 @@ public void testFromStreamUsertMissingRefreshTokenThrows() throws IOException {
     }
   }
 
+  public void testCreateDelegated() throws Exception {
+    final String serviceAccountEmail =
+        "36680232662-vrd7ji19q3ne0ah2csanun6bnr@developer.gserviceaccount.com";
+    final String accessToken = "1/MkSJoj1xsli0AccessToken_NKPY2";
+    final String delegateUser = "user@domain.com";
+
+    MockTokenServerTransport transport = new MockTokenServerTransport();
+    transport.addServiceAccount(serviceAccountEmail, accessToken);
+    GoogleCredential credential =
+        new GoogleCredential.Builder()
+            .setServiceAccountId(serviceAccountEmail)
+            .setServiceAccountScopes(SCOPES)
+            .setServiceAccountPrivateKey(SecurityTestUtils.newRsaPrivateKey())
+            .setTransport(transport)
+            .setJsonFactory(JSON_FACTORY)
+            .build();
+
+    assertNotSame(delegateUser, credential.getServiceAccountUser());
+
+    GoogleCredential delegatedCredential = credential.createDelegated(delegateUser);
+    assertNotSame(credential, delegatedCredential);
+
+    assertTrue(delegatedCredential.refreshToken());
+    assertEquals(accessToken, delegatedCredential.getAccessToken());
+
+    assertNotSame(credential.getServiceAccountUser(), delegatedCredential.getServiceAccountUser());
+
+    assertSame(credential.getTransport(), delegatedCredential.getTransport());
+    assertSame(credential.getJsonFactory(), delegatedCredential.getJsonFactory());
+    assertSame(credential.getServiceAccountId(), delegatedCredential.getServiceAccountId());
+    assertSame(
+        credential.getServiceAccountPrivateKey(),
+        delegatedCredential.getServiceAccountPrivateKey());
+  }
+
+  public void testBuilderUserAccount() throws Exception {
+    final String accessToken = "1/MkSJoj1xsli0AccessToken_NKPY2";
+    final String clientSecret = "jakuaL9YyieakhECKL2SwZcu";
+    final String clientId = "ya29.1.AADtN_UtlxN3PuGAxrN2XQnZTVRvDyVWnYq4I6dws";
+    final String refreshToken = "1/Tl6awhpFjkMkSJoj1xsli0H2eL5YsMgU_NKPY2TyGWY";
+
+    MockTokenServerTransport transport = new MockTokenServerTransport();
+    transport.addClient(clientId, clientSecret);
+    transport.addRefreshToken(refreshToken, accessToken);
+
+    GoogleCredential credential =
+        new GoogleCredential.Builder()
+            .setClientSecrets(clientId, clientSecret)
+            .setTransport(transport)
+            .setJsonFactory(JSON_FACTORY)
+            .build();
+    credential.setRefreshToken(refreshToken);
+
+    assertTrue(credential.refreshToken());
+    assertEquals(accessToken, credential.getAccessToken());
+
+    GoogleCredential newCredential = credential.toBuilder().build();
+
+    assertNotSame(credential, newCredential);
+
+    assertSame(credential.getClientAuthentication(), newCredential.getClientAuthentication());
+
+    assertEquals(credential.getTransport(), newCredential.getTransport());
+    assertEquals(credential.getJsonFactory(), newCredential.getJsonFactory());
+  }
+
+  public void testBuilderServiceAccount() throws Exception {
+    final String serviceAccountEmail =
+        "36680232662-vrd7ji19q3ne0ah2csanun6bnr@developer.gserviceaccount.com";
+    final String accessToken = "1/MkSJoj1xsli0AccessToken_NKPY2";
+    final String refreshToken = "1/Tl6awhpFjkMkSJoj1xsli0H2eL5YsMgU_NKPY2TyGWY";
+    final String delegateUser = "user@domain.com";
+
+    MockTokenServerTransport transport = new MockTokenServerTransport();
+    transport.addServiceAccount(serviceAccountEmail, accessToken);
+    GoogleCredential credential =
+        new GoogleCredential.Builder()
+            .setServiceAccountId(serviceAccountEmail)
+            .setServiceAccountScopes(SCOPES)
+            .setServiceAccountPrivateKey(SecurityTestUtils.newRsaPrivateKey())
+            .setServiceAccountUser(delegateUser)
+            .setTransport(transport)
+            .setJsonFactory(JSON_FACTORY)
+            .build();
+    assertTrue(credential.refreshToken());
+
+    GoogleCredential newCredential = credential.toBuilder().build();
+
+    assertNotSame(credential, newCredential);
+
+    assertEquals(credential.getServiceAccountId(), newCredential.getServiceAccountId());
+
+    assertEquals(
+        credential.getServiceAccountProjectId(), newCredential.getServiceAccountProjectId());
+
+    org.junit.Assert.assertArrayEquals(
+        credential.getServiceAccountScopes().toArray(),
+        newCredential.getServiceAccountScopes().toArray());
+
+    assertEquals(
+        credential.getServiceAccountPrivateKey(), newCredential.getServiceAccountPrivateKey());
+
+    assertEquals(
+        credential.getServiceAccountPrivateKeyId(), newCredential.getServiceAccountPrivateKeyId());
+
+    assertEquals(credential.getServiceAccountUser(), newCredential.getServiceAccountUser());
+
+    assertTrue(newCredential.refreshToken());
+    assertEquals(credential.getAccessToken(), newCredential.getAccessToken());
+
+    assertEquals(credential.getTransport(), newCredential.getTransport());
+    assertEquals(credential.getJsonFactory(), newCredential.getJsonFactory());
+  }
+
   static String createUserJson(String clientId, String clientSecret, String refreshToken)
       throws IOException {
     GenericJson userCredentialContents = new GenericJson();
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenTest.java
index 013bf0e1c..26144c165 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -15,11 +15,9 @@
 package com.google.api.client.googleapis.auth.oauth2;
 
 import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken.Payload;
-
 import junit.framework.TestCase;
 
-/** Tests for {@link GoogleIdToken}.*/
-
+/** Tests for {@link GoogleIdToken}. */
 public class GoogleIdTokenTest extends TestCase {
   private static final String USER_ID = "1234567890";
   private static final String ANOTHER_USER_ID = "2345678901";
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java
index 76aa74c22..22dac16fe 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -16,7 +16,7 @@
 
 import com.google.api.client.auth.openidconnect.IdTokenVerifier;
 import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken.Payload;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.json.webtoken.JsonWebSignature.Header;
 import com.google.api.client.testing.http.FixedClock;
 import com.google.api.client.util.Clock;
@@ -49,9 +49,11 @@ private static Payload newPayload(String clientId) {
   }
 
   public void testBuilder() throws Exception {
-    GoogleIdTokenVerifier.Builder builder = new GoogleIdTokenVerifier.Builder(
-        new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(), new JacksonFactory()).setIssuer(
-        ISSUER).setAudience(TRUSTED_CLIENT_IDS);
+    GoogleIdTokenVerifier.Builder builder =
+        new GoogleIdTokenVerifier.Builder(
+                new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(), new GsonFactory())
+            .setIssuer(ISSUER)
+            .setAudience(TRUSTED_CLIENT_IDS);
     assertEquals(Clock.SYSTEM, builder.getClock());
     assertEquals(ISSUER, builder.getIssuer());
     assertTrue(TRUSTED_CLIENT_IDS.equals(builder.getAudience()));
@@ -65,8 +67,10 @@ public void testBuilder() throws Exception {
   }
 
   public void testVerify() throws Exception {
-    GoogleIdTokenVerifier verifier = new GoogleIdTokenVerifier.Builder(
-        new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(), new JacksonFactory()).build();
+    GoogleIdTokenVerifier verifier =
+        new GoogleIdTokenVerifier.Builder(
+                new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(), new GsonFactory())
+            .build();
     Header header = new Header();
     header.setAlgorithm("RS25");
     Payload payload = newPayload(CLIENT_ID);
@@ -75,8 +79,9 @@ public void testVerify() throws Exception {
     GoogleIdToken idToken2 = new GoogleIdToken(header, payload2, new byte[0], new byte[0]);
     assertFalse(verifier.verify(idToken));
     assertFalse(verifier.verify(idToken2));
-    verifier = new GoogleIdTokenVerifier(
-        new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(), new JacksonFactory());
+    verifier =
+        new GoogleIdTokenVerifier(
+            new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(), new GsonFactory());
     assertFalse(verifier.verify(idToken));
     assertFalse(verifier.verify(idToken2));
     // TODO(yanivi): add a unit test that returns true
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManagerTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManagerTest.java
index c6a79fd72..59ee7794d 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManagerTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/auth/oauth2/GooglePublicKeysManagerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -20,12 +20,11 @@
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.FixedClock;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
-
 import junit.framework.TestCase;
 
 /**
@@ -37,31 +36,31 @@ public class GooglePublicKeysManagerTest extends TestCase {
 
   private static final String TEST_CERTIFICATES =
       "{\r\n \"69d93af12d09b07b1f55680ac7e7fb2513b823e7\": \"-----BEGIN CERTIFICATE-----"
-      + "\\nMIICITCCAYqgAwIBAgIIA9YgrgKJ4cowDQYJKoZIhvcNAQEFBQAwNjE0MDIGA1UE"
-      + "\\nAxMrZmVkZXJhdGVkLXNpZ25vbi5zeXN0ZW0uZ3NlcnZpY2VhY2NvdW50LmNvbTAe"
-      + "\\nFw0xMjA2MTIyMjQzMzRaFw0xMjA2MTQxMTQzMzRaMDYxNDAyBgNVBAMTK2ZlZGVy"
-      + "\\nYXRlZC1zaWdub24uc3lzdGVtLmdzZXJ2aWNlYWNjb3VudC5jb20wgZ8wDQYJKoZI"
-      + "\\nhvcNAQEBBQADgY0AMIGJAoGBAJ6TDzmLxYD67aoTrzA3b8ouMXMeFxQOmsHn0SIA"
-      + "\\nGjJypTQd0hXr3jGKqP53a4qtzm7YxyPyPOsvG8IMsB0RtB8gxh82KDQUqJ+mww8n"
-      + "\\ney7WxW1qSmzyYog1z80MDYojODZ3j7wv1r8ajeJQSxQjBMehMEQkfjPuzERuzkCk"
-      + "\\niBzzAgMBAAGjODA2MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMBYGA1Ud"
-      + "\\nJQEB/wQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBAIx9j1gXCEm2Vr9r"
-      + "\\nck6VK3ayG29+5ehNvzfYob+l731yU0yylEDEfN9OqqdW0dAqaauca+Ol8mGDIszx"
-      + "\\nxudWD0NzNyvm39jwypvYz9qMYwbwVnQdfbpY5O0qbcb30eIDKZRHXzpZUj0zWHPM"
-      + "\\nfwdrgc6XqQ48rjOsn22sWKQcB4/u\\n-----END CERTIFICATE-----\\n\",\r\n "
-      + "\"67aec7b8e284bb03f489a5828d0eba52cc84cc23\": \"-----BEGIN CERTIFICATE-----"
-      + "\\nMIICITCCAYqgAwIBAgIIcAqoF0CS2WgwDQYJKoZIhvcNAQEFBQAwNjE0MDIGA1UE"
-      + "\\nAxMrZmVkZXJhdGVkLXNpZ25vbi5zeXN0ZW0uZ3NlcnZpY2VhY2NvdW50LmNvbTAe"
-      + "\\nFw0xMjA2MTMyMjI4MzRaFw0xMjA2MTUxMTI4MzRaMDYxNDAyBgNVBAMTK2ZlZGVy"
-      + "\\nYXRlZC1zaWdub24uc3lzdGVtLmdzZXJ2aWNlYWNjb3VudC5jb20wgZ8wDQYJKoZI"
-      + "\\nhvcNAQEBBQADgY0AMIGJAoGBAMVlf20FzpqZHR7lzNWbbXq5Ol+j+/2gwTtYlgNz"
-      + "\\ns6njxEP4oTmViZQsuQABmvYzg7BHOOW2IRE0U2osrfAw97Gg8L/84D0Sdf9sAjr2"
-      + "\\nb3F6reVPUYJNDvpvKr6351+N+VRskOVnpqp/rS8k69jHlUYiGTpeQ5MA5n1BUCoF"
-      + "\\nJb/vAgMBAAGjODA2MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMBYGA1Ud"
-      + "\\nJQEB/wQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBAHoD+K9ffsDR+XWn"
-      + "\\nBODExaCtMTie0l2yRds1wsgc7645PeSYsLB8p4NABI/z28VMD2e7CFzoO2kzNj5I"
-      + "\\nKLO2FYliXRw35P3ZJxvxs8aSP0S/U2vlhfDM/W0a4KMF9ATfoWqTaoHG1rWmYOuj"
-      + "\\nncTIM79cE3iBrhFqq8HpetXj77Qf\\n-----END CERTIFICATE-----\\n\"\r\n}";
+          + "\\nMIICITCCAYqgAwIBAgIIA9YgrgKJ4cowDQYJKoZIhvcNAQEFBQAwNjE0MDIGA1UE"
+          + "\\nAxMrZmVkZXJhdGVkLXNpZ25vbi5zeXN0ZW0uZ3NlcnZpY2VhY2NvdW50LmNvbTAe"
+          + "\\nFw0xMjA2MTIyMjQzMzRaFw0xMjA2MTQxMTQzMzRaMDYxNDAyBgNVBAMTK2ZlZGVy"
+          + "\\nYXRlZC1zaWdub24uc3lzdGVtLmdzZXJ2aWNlYWNjb3VudC5jb20wgZ8wDQYJKoZI"
+          + "\\nhvcNAQEBBQADgY0AMIGJAoGBAJ6TDzmLxYD67aoTrzA3b8ouMXMeFxQOmsHn0SIA"
+          + "\\nGjJypTQd0hXr3jGKqP53a4qtzm7YxyPyPOsvG8IMsB0RtB8gxh82KDQUqJ+mww8n"
+          + "\\ney7WxW1qSmzyYog1z80MDYojODZ3j7wv1r8ajeJQSxQjBMehMEQkfjPuzERuzkCk"
+          + "\\niBzzAgMBAAGjODA2MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMBYGA1Ud"
+          + "\\nJQEB/wQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBAIx9j1gXCEm2Vr9r"
+          + "\\nck6VK3ayG29+5ehNvzfYob+l731yU0yylEDEfN9OqqdW0dAqaauca+Ol8mGDIszx"
+          + "\\nxudWD0NzNyvm39jwypvYz9qMYwbwVnQdfbpY5O0qbcb30eIDKZRHXzpZUj0zWHPM"
+          + "\\nfwdrgc6XqQ48rjOsn22sWKQcB4/u\\n-----END CERTIFICATE-----\\n\",\r\n "
+          + "\"67aec7b8e284bb03f489a5828d0eba52cc84cc23\": \"-----BEGIN CERTIFICATE-----"
+          + "\\nMIICITCCAYqgAwIBAgIIcAqoF0CS2WgwDQYJKoZIhvcNAQEFBQAwNjE0MDIGA1UE"
+          + "\\nAxMrZmVkZXJhdGVkLXNpZ25vbi5zeXN0ZW0uZ3NlcnZpY2VhY2NvdW50LmNvbTAe"
+          + "\\nFw0xMjA2MTMyMjI4MzRaFw0xMjA2MTUxMTI4MzRaMDYxNDAyBgNVBAMTK2ZlZGVy"
+          + "\\nYXRlZC1zaWdub24uc3lzdGVtLmdzZXJ2aWNlYWNjb3VudC5jb20wgZ8wDQYJKoZI"
+          + "\\nhvcNAQEBBQADgY0AMIGJAoGBAMVlf20FzpqZHR7lzNWbbXq5Ol+j+/2gwTtYlgNz"
+          + "\\ns6njxEP4oTmViZQsuQABmvYzg7BHOOW2IRE0U2osrfAw97Gg8L/84D0Sdf9sAjr2"
+          + "\\nb3F6reVPUYJNDvpvKr6351+N+VRskOVnpqp/rS8k69jHlUYiGTpeQ5MA5n1BUCoF"
+          + "\\nJb/vAgMBAAGjODA2MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMBYGA1Ud"
+          + "\\nJQEB/wQMMAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBAHoD+K9ffsDR+XWn"
+          + "\\nBODExaCtMTie0l2yRds1wsgc7645PeSYsLB8p4NABI/z28VMD2e7CFzoO2kzNj5I"
+          + "\\nKLO2FYliXRw35P3ZJxvxs8aSP0S/U2vlhfDM/W0a4KMF9ATfoWqTaoHG1rWmYOuj"
+          + "\\nncTIM79cE3iBrhFqq8HpetXj77Qf\\n-----END CERTIFICATE-----\\n\"\r\n}";
 
   private static final int MAX_AGE = 12345;
 
@@ -69,8 +68,9 @@ public class GooglePublicKeysManagerTest extends TestCase {
 
   public void testBuilder() throws Exception {
     HttpTransport transport = new MockHttpTransport();
-    JsonFactory jsonFactory = new JacksonFactory();
-    GooglePublicKeysManager.Builder builder = new GooglePublicKeysManager.Builder(transport, jsonFactory);
+    JsonFactory jsonFactory = new GsonFactory();
+    GooglePublicKeysManager.Builder builder =
+        new GooglePublicKeysManager.Builder(transport, jsonFactory);
 
     GooglePublicKeysManager certs = builder.build();
     assertEquals(transport, certs.getTransport());
@@ -83,7 +83,7 @@ static class PublicCertsMockHttpTransport extends MockHttpTransport {
     @Override
     public LowLevelHttpRequest buildRequest(String name, String url) {
       return new MockLowLevelHttpRequest() {
-          @Override
+        @Override
         public LowLevelHttpResponse execute() {
           MockLowLevelHttpResponse r = new MockLowLevelHttpResponse();
           r.setStatusCode(200);
@@ -100,8 +100,9 @@ public LowLevelHttpResponse execute() {
   }
 
   public void testRefresh() throws Exception {
-    GooglePublicKeysManager certs = new GooglePublicKeysManager.Builder(
-        new PublicCertsMockHttpTransport(), new JacksonFactory()).build();
+    GooglePublicKeysManager certs =
+        new GooglePublicKeysManager.Builder(new PublicCertsMockHttpTransport(), new GsonFactory())
+            .build();
     certs.refresh();
     assertEquals(2, certs.getPublicKeys().size());
   }
@@ -109,8 +110,10 @@ public void testRefresh() throws Exception {
   public void testLoadCerts_cache() throws Exception {
     PublicCertsMockHttpTransport transport = new PublicCertsMockHttpTransport();
     transport.useAgeHeader = true;
-    GooglePublicKeysManager certs = new GooglePublicKeysManager.Builder(
-        transport, new JacksonFactory()).setClock(new FixedClock(100)).build();
+    GooglePublicKeysManager certs =
+        new GooglePublicKeysManager.Builder(transport, new GsonFactory())
+            .setClock(new FixedClock(100))
+            .build();
 
     certs.refresh();
     assertEquals(2, certs.getPublicKeys().size());
@@ -119,9 +122,11 @@ public void testLoadCerts_cache() throws Exception {
 
   public void testGetCacheTimeInSec() throws Exception {
     GooglePublicKeysManager certs =
-        new GooglePublicKeysManager.Builder(new MockHttpTransport(), new JacksonFactory()).build();
-    assertEquals(12000, certs.getCacheTimeInSec(
-        new HttpHeaders().setAge(345L).setCacheControl("max-age=" + MAX_AGE)));
+        new GooglePublicKeysManager.Builder(new MockHttpTransport(), new GsonFactory()).build();
+    assertEquals(
+        12000,
+        certs.getCacheTimeInSec(
+            new HttpHeaders().setAge(345L).setCacheControl("max-age=" + MAX_AGE)));
     assertEquals(0, certs.getCacheTimeInSec(new HttpHeaders()));
     assertEquals(0, certs.getCacheTimeInSec(new HttpHeaders().setAge(345L)));
     assertEquals(
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestStressTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestStressTest.java
new file mode 100644
index 000000000..d1b316edc
--- /dev/null
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestStressTest.java
@@ -0,0 +1,121 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.api.client.googleapis.batch;
+
+import static org.junit.Assert.assertEquals;
+
+import com.google.api.client.http.ByteArrayContent;
+import com.google.api.client.http.GenericUrl;
+import com.google.api.client.http.HttpHeaders;
+import com.google.api.client.http.HttpMediaType;
+import com.google.api.client.http.HttpRequest;
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.http.LowLevelHttpRequest;
+import com.google.api.client.http.LowLevelHttpResponse;
+import com.google.api.client.testing.http.MockHttpTransport;
+import com.google.api.client.testing.http.MockLowLevelHttpRequest;
+import com.google.api.client.testing.http.MockLowLevelHttpResponse;
+import com.google.api.client.util.Charsets;
+import java.io.IOException;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
+import java.util.Arrays;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.zip.GZIPOutputStream;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+/** Tests {@link BatchRequest}. */
+public class BatchRequestStressTest {
+
+  private static final int BATCH_SIZE = 100;
+  public static BatchRequest batchRequest;
+  private static AtomicInteger parseCount = new AtomicInteger(0);
+  private static AtomicInteger errorCount = new AtomicInteger(0);
+
+  @BeforeClass
+  public static void setup() throws IOException {
+    HttpTransport transport =
+        new MockHttpTransport() {
+          @Override
+          public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+            return new MockLowLevelHttpRequest() {
+              @Override
+              public LowLevelHttpResponse execute() throws IOException {
+                MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
+                response.setStatusCode(200);
+                response.addHeader("Content-Type", "multipart/mixed; boundary=__END_OF_PART__");
+                response.setContentEncoding("gzip");
+                StringBuilder responseContent = new StringBuilder();
+                for (int i = 0; i < BATCH_SIZE; i++) {
+                  responseContent
+                      .append("--" + "__END_OF_PART__" + "\n")
+                      .append("Content-Type: application/http\n")
+                      .append("Content-ID: response-" + i + "\n\n")
+                      .append("HTTP/1.1 200 OK\n")
+                      .append("Content-Type: application/json\n\n")
+                      .append("{}\n\n");
+                }
+                responseContent.append("--" + "__END_OF_PART__--" + "\n\n");
+
+                // gzip this content
+                PipedInputStream is = new PipedInputStream();
+                PipedOutputStream os = new PipedOutputStream(is);
+                GZIPOutputStream gzip = new GZIPOutputStream(os);
+                gzip.write(responseContent.toString().getBytes("UTF-8"));
+                gzip.close();
+                response.setContent(is);
+                return response;
+              }
+            };
+          }
+        };
+
+    BatchCallback<Void, Void> callback =
+        new BatchCallback<Void, Void>() {
+          @Override
+          public void onSuccess(Void t, HttpHeaders responseHeaders) {
+            parseCount.incrementAndGet();
+          }
+
+          @Override
+          public void onFailure(Void e, HttpHeaders responseHeaders) {
+            errorCount.incrementAndGet();
+          }
+        };
+    batchRequest = new BatchRequest(transport, null);
+    byte[] content = new byte[300];
+    Arrays.fill(content, (byte) ' ');
+    HttpRequest request1 =
+        transport
+            .createRequestFactory()
+            .buildRequest(
+                "POST",
+                new GenericUrl("http://www.google.com/"),
+                new ByteArrayContent(
+                    new HttpMediaType("text/plain").setCharsetParameter(Charsets.UTF_8).build(),
+                    content));
+    for (int i = 0; i < BATCH_SIZE; i++) {
+      batchRequest.queue(request1, Void.class, Void.class, callback);
+    }
+  }
+
+  @Test(timeout = 4000)
+  public void testResponse() throws IOException {
+    batchRequest.execute();
+    assertEquals(BATCH_SIZE, parseCount.get());
+    assertEquals(0, errorCount.get());
+  }
+}
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestTest.java
index 8af46b269..1032d448d 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/batch/BatchRequestTest.java
@@ -11,7 +11,6 @@
 import com.google.api.client.googleapis.testing.services.MockGoogleClient;
 import com.google.api.client.googleapis.testing.services.MockGoogleClientRequest;
 import com.google.api.client.http.ByteArrayContent;
-import com.google.api.client.http.ExponentialBackOffPolicy;
 import com.google.api.client.http.GenericUrl;
 import com.google.api.client.http.HttpContent;
 import com.google.api.client.http.HttpExecuteInterceptor;
@@ -25,7 +24,7 @@
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.json.GenericJson;
 import com.google.api.client.json.JsonObjectParser;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.protobuf.ProtoObjectParser;
 import com.google.api.client.testing.http.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
@@ -48,7 +47,6 @@
  *
  * @author rmistry@google.com (Ravi Mistry)
  */
-@SuppressWarnings("deprecation")
 public class BatchRequestTest extends TestCase {
 
   private static final String ROOT_URL = "http://www.test.com/";
@@ -84,29 +82,23 @@ protected void setUp() {
   }
 
   public static class MockDataClass1 extends GenericJson {
-    @Key
-    String id;
+    @Key String id;
 
-    @Key
-    String kind;
+    @Key String kind;
   }
 
   public static class MockDataClass2 extends GenericJson {
-    @Key
-    String name;
+    @Key String name;
 
-    @Key
-    String number;
+    @Key String number;
   }
 
   private static class TestCallback1
-      implements
-        BatchCallback<MockDataClass1, GoogleJsonErrorContainer> {
+      implements BatchCallback<MockDataClass1, GoogleJsonErrorContainer> {
 
     int successCalls;
 
-    TestCallback1() {
-    }
+    TestCallback1() {}
 
     @Override
     public void onSuccess(MockDataClass1 dataClass, HttpHeaders responseHeaders) {
@@ -122,14 +114,12 @@ public void onFailure(GoogleJsonErrorContainer e, HttpHeaders responseHeaders) {
   }
 
   private static class TestCallback2
-      implements
-        BatchCallback<MockDataClass2, GoogleJsonErrorContainer> {
+      implements BatchCallback<MockDataClass2, GoogleJsonErrorContainer> {
 
     int successCalls;
     int failureCalls;
 
-    TestCallback2() {
-    }
+    TestCallback2() {}
 
     @Override
     public void onSuccess(MockDataClass2 dataClass, HttpHeaders responseHeaders) {
@@ -156,8 +146,7 @@ private static class TestCallback3 implements BatchCallback<Void, Void> {
     int successCalls;
     int failureCalls;
 
-    TestCallback3() {
-    }
+    TestCallback3() {}
 
     @Override
     public void onSuccess(Void dataClass, HttpHeaders responseHeaders) {
@@ -178,8 +167,8 @@ public void onFailure(Void e, HttpHeaders responseHeaders) {
    * @param <InputType> The input type
    * @param <OutputType> The output type
    */
-  private abstract static class TestCallbackBaseAdapter<InputType, OutputType> implements
-      BatchCallback<InputType, ErrorOutput.ErrorBody> {
+  private abstract static class TestCallbackBaseAdapter<InputType, OutputType>
+      implements BatchCallback<InputType, ErrorOutput.ErrorBody> {
 
     protected final BatchCallback<OutputType, GoogleJsonErrorContainer> callback;
 
@@ -224,8 +213,8 @@ public void onFailure(ErrorOutput.ErrorBody e, HttpHeaders responseHeaders) thro
     }
   }
 
-  private static class TestCallback1Adapter extends
-      TestCallbackBaseAdapter<MockData.Class1, MockDataClass1> {
+  private static class TestCallback1Adapter
+      extends TestCallbackBaseAdapter<MockData.Class1, MockDataClass1> {
 
     public TestCallback1Adapter(TestCallback1 callback) {
       super(callback);
@@ -240,8 +229,8 @@ public void onSuccess(MockData.Class1 message, HttpHeaders responseHeaders) thro
     }
   }
 
-  private static class TestCallback2Adapter extends
-      TestCallbackBaseAdapter<MockData.Class2, MockDataClass2> {
+  private static class TestCallback2Adapter
+      extends TestCallbackBaseAdapter<MockData.Class2, MockDataClass2> {
 
     public TestCallback2Adapter(TestCallback2 callback) {
       super(callback);
@@ -281,18 +270,6 @@ public boolean handleResponse(
       }
       return true;
     }
-
-  }
-
-  @Deprecated
-  private static class MockExponentialBackOffPolicy extends ExponentialBackOffPolicy {
-    public MockExponentialBackOffPolicy() {
-    }
-
-    @Override
-    public long getNextBackOffMillis() {
-      return 0;
-    }
   }
 
   private static class MockTransport extends MockHttpTransport {
@@ -301,19 +278,20 @@ private static class MockTransport extends MockHttpTransport {
     final boolean testAuthenticationError;
     boolean returnSuccessAuthenticatedContent;
     boolean returnErrorAuthenticatedContent;
-    final boolean testExponentialBackOff;
     final boolean testRedirect;
     final boolean testBinary;
     final boolean testMissingLength;
     int actualCalls;
     int callsBeforeSuccess;
 
-    MockTransport(boolean testServerError, boolean testAuthenticationError,
-        boolean testExponentialBackOff, boolean testRedirect, boolean testBinary,
+    MockTransport(
+        boolean testServerError,
+        boolean testAuthenticationError,
+        boolean testRedirect,
+        boolean testBinary,
         boolean testMissingLength) {
       this.testServerError = testServerError;
       this.testAuthenticationError = testAuthenticationError;
-      this.testExponentialBackOff = testExponentialBackOff;
       this.testRedirect = testRedirect;
       this.testBinary = testBinary;
       this.testMissingLength = testMissingLength;
@@ -323,45 +301,73 @@ private static class MockTransport extends MockHttpTransport {
     public LowLevelHttpRequest buildRequest(String name, String url) {
       actualCalls++;
       return new MockLowLevelHttpRequest() {
-          @Override
+        @Override
         public LowLevelHttpResponse execute() throws IOException {
           MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
           response.setStatusCode(200);
           response.addHeader("Content-Type", "multipart/mixed; boundary=" + RESPONSE_BOUNDARY);
           String contentType =
               testBinary ? "application/x-protobuf" : "application/json; charset=UTF-8";
-          byte[] content1 = testBinary ? MockData.Class1.newBuilder()
-              .setId(TEST_ID)
-              .setKind(TEST_KIND)
-              .build().toByteArray()
-              : utf8Encode("{\n \"id\": \"" + TEST_ID + "\",\n \"kind\": \""
-                  + TEST_KIND.replace("\n", "\\n") + "\"\n}");
-          byte[] content2 = testBinary ? MockData.Class2.newBuilder()
-              .setName(TEST_NAME)
-              .setNumber(TEST_NUM)
-              .build().toByteArray()
-              : utf8Encode("{\"name\": \"" + TEST_NAME + "\", \"number\": \"" + TEST_NUM + "\"}");
-          byte[] errorContent = testBinary ? ErrorOutput.ErrorBody.newBuilder()
-              .setError(ErrorOutput.ErrorProto.newBuilder()
-                  .setCode(ERROR_CODE)
-                  .setMessage(ERROR_MSG)
-                  .addErrors(ErrorOutput.IndividualError.newBuilder()
-                      .setDomain(ERROR_DOMAIN)
-                      .setReason(ERROR_REASON)
-                      .setMessage(ERROR_MSG))
-              ).build().toByteArray()
-              : utf8Encode("{\"error\": { \"errors\": [{\"domain\": \"" + ERROR_DOMAIN + "\","
-                  + "\"reason\": \"" + ERROR_REASON + "\", \"message\": \"" + ERROR_MSG + "\"}],"
-                  + "\"code\": " + ERROR_CODE + ", \"message\": \"" + ERROR_MSG + "\"}}");
+          byte[] content1 =
+              testBinary
+                  ? MockData.Class1.newBuilder()
+                      .setId(TEST_ID)
+                      .setKind(TEST_KIND)
+                      .build()
+                      .toByteArray()
+                  : utf8Encode(
+                      "{\n \"id\": \""
+                          + TEST_ID
+                          + "\",\n \"kind\": \""
+                          + TEST_KIND.replace("\n", "\\n")
+                          + "\"\n}");
+          byte[] content2 =
+              testBinary
+                  ? MockData.Class2.newBuilder()
+                      .setName(TEST_NAME)
+                      .setNumber(TEST_NUM)
+                      .build()
+                      .toByteArray()
+                  : utf8Encode(
+                      "{\"name\": \"" + TEST_NAME + "\", \"number\": \"" + TEST_NUM + "\"}");
+          byte[] errorContent =
+              testBinary
+                  ? ErrorOutput.ErrorBody.newBuilder()
+                      .setError(
+                          ErrorOutput.ErrorProto.newBuilder()
+                              .setCode(ERROR_CODE)
+                              .setMessage(ERROR_MSG)
+                              .addErrors(
+                                  ErrorOutput.IndividualError.newBuilder()
+                                      .setDomain(ERROR_DOMAIN)
+                                      .setReason(ERROR_REASON)
+                                      .setMessage(ERROR_MSG)))
+                      .build()
+                      .toByteArray()
+                  : utf8Encode(
+                      "{\"error\": { \"errors\": [{\"domain\": \""
+                          + ERROR_DOMAIN
+                          + "\","
+                          + "\"reason\": \""
+                          + ERROR_REASON
+                          + "\", \"message\": \""
+                          + ERROR_MSG
+                          + "\"}],"
+                          + "\"code\": "
+                          + ERROR_CODE
+                          + ", \"message\": \""
+                          + ERROR_MSG
+                          + "\"}}");
           ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
           Writer responseContent = new OutputStreamWriter(outputStream, "ISO-8859-1");
-          if (returnSuccessAuthenticatedContent || (testExponentialBackOff && actualCalls > 1)
-              || (testRedirect && actualCalls > 1)) {
+          if (returnSuccessAuthenticatedContent || (testRedirect && actualCalls > 1)) {
             if (returnSuccessAuthenticatedContent || actualCalls == callsBeforeSuccess) {
-              responseContent.append("--" + RESPONSE_BOUNDARY + "\n")
+              responseContent
+                  .append("--" + RESPONSE_BOUNDARY + "\n")
                   .append("Content-Type: application/http\n")
                   .append("Content-Transfer-Encoding: binary\n")
-                  .append("Content-ID: response-1\n\n").append("HTTP/1.1 200 OK\n")
+                  .append("Content-ID: response-1\n\n")
+                  .append("HTTP/1.1 200 OK\n")
                   .append("Content-Type: " + contentType + "\n");
               if (!testMissingLength) {
                 responseContent.append("Content-Length: " + content2.length + "\n");
@@ -371,24 +377,28 @@ public LowLevelHttpResponse execute() throws IOException {
               outputStream.write(content2);
               responseContent.append("\n--" + RESPONSE_BOUNDARY + "--\n\n");
             } else {
-              responseContent.append("--" + RESPONSE_BOUNDARY + "\n")
+              responseContent
+                  .append("--" + RESPONSE_BOUNDARY + "\n")
                   .append("Content-Type: application/http\n")
                   .append("Content-Transfer-Encoding: binary\n")
                   .append("Content-ID: response-1\n\n")
                   .append("HTTP/1.1 " + ERROR_CODE + " Not Found\n")
                   .append("Content-Type: " + contentType + "\n");
-                  if (!testMissingLength) {
-                    responseContent.append("Content-Length: " + errorContent.length + "\n");
-                  }
-                  responseContent.append("\n");
-                  responseContent.flush();
-                  outputStream.write(errorContent);
-                  responseContent.append("\n--" + RESPONSE_BOUNDARY + "--\n\n");
+              if (!testMissingLength) {
+                responseContent.append("Content-Length: " + errorContent.length + "\n");
+              }
+              responseContent.append("\n");
+              responseContent.flush();
+              outputStream.write(errorContent);
+              responseContent.append("\n--" + RESPONSE_BOUNDARY + "--\n\n");
             }
           } else if (returnErrorAuthenticatedContent) {
-            responseContent.append("Content-Type: application/http\n")
-                .append("Content-Transfer-Encoding: binary\n").append("Content-ID: response-1\n\n");
-            responseContent.append("HTTP/1.1 " + ERROR_CODE + " Not Found\n")
+            responseContent
+                .append("Content-Type: application/http\n")
+                .append("Content-Transfer-Encoding: binary\n")
+                .append("Content-ID: response-1\n\n");
+            responseContent
+                .append("HTTP/1.1 " + ERROR_CODE + " Not Found\n")
                 .append("Content-Type: " + contentType + "\n");
             if (!testMissingLength) {
               responseContent.append("Content-Length: " + errorContent.length + "\n");
@@ -398,9 +408,11 @@ public LowLevelHttpResponse execute() throws IOException {
             outputStream.write(errorContent);
             responseContent.append("\n--" + RESPONSE_BOUNDARY + "--\n\n");
           } else {
-            responseContent.append("--" + RESPONSE_BOUNDARY + "\n")
+            responseContent
+                .append("--" + RESPONSE_BOUNDARY + "\n")
                 .append("Content-Type: application/http\n")
-                .append("Content-Transfer-Encoding: binary\n").append("Content-ID: response-1\n\n")
+                .append("Content-Transfer-Encoding: binary\n")
+                .append("Content-ID: response-1\n\n")
                 .append("HTTP/1.1 200 OK\n")
                 .append("Content-Type: " + contentType + "\n");
             if (!testMissingLength) {
@@ -416,7 +428,8 @@ public LowLevelHttpResponse execute() throws IOException {
                 .append("Content-ID: response-2\n\n");
 
             if (testServerError) {
-              responseContent.append("HTTP/1.1 " + ERROR_CODE + " Not Found\n")
+              responseContent
+                  .append("HTTP/1.1 " + ERROR_CODE + " Not Found\n")
                   .append("Content-Type: " + contentType + "\n");
               if (!testMissingLength) {
                 responseContent.append("Content-Length: " + errorContent.length + "\n");
@@ -426,24 +439,27 @@ public LowLevelHttpResponse execute() throws IOException {
               outputStream.write(errorContent);
               responseContent.append("\n--" + RESPONSE_BOUNDARY + "--\n\n");
             } else if (testAuthenticationError) {
-              responseContent.append("HTTP/1.1 401 Unauthorized\n")
+              responseContent
+                  .append("HTTP/1.1 401 Unauthorized\n")
                   .append("Content-Type: application/json; charset=UTF-8\n\n")
                   .append("--" + RESPONSE_BOUNDARY + "--\n\n");
             } else if (testRedirect && actualCalls == 1) {
-              responseContent.append("HTTP/1.1 301 MovedPermanently\n")
+              responseContent
+                  .append("HTTP/1.1 301 MovedPermanently\n")
                   .append("Content-Type: " + contentType + "\n")
                   .append("Location: http://redirect/location\n\n")
                   .append("--" + RESPONSE_BOUNDARY + "--\n\n");
             } else {
-              responseContent.append("HTTP/1.1 200 OK\n")
+              responseContent
+                  .append("HTTP/1.1 200 OK\n")
                   .append("Content-Type: " + contentType + "\n");
-                  if (!testMissingLength) {
-                    responseContent.append("Content-Length: " + content2.length + "\n");
-                  }
-                  responseContent.append("\n");
-                  responseContent.flush();
-                  outputStream.write(content2);
-                  responseContent.append("\n--" + RESPONSE_BOUNDARY + "--\n\n");
+              if (!testMissingLength) {
+                responseContent.append("Content-Length: " + content2.length + "\n");
+              }
+              responseContent.append("\n");
+              responseContent.flush();
+              outputStream.write(content2);
+              responseContent.append("\n--" + RESPONSE_BOUNDARY + "--\n\n");
             }
           }
           responseContent.flush();
@@ -464,8 +480,7 @@ private static class MockCredential implements HttpRequestInitializer, HttpExecu
     boolean initializerCalled = false;
     boolean interceptorCalled = false;
 
-    MockCredential() {
-    }
+    MockCredential() {}
 
     @Override
     public void initialize(HttpRequest request) {
@@ -477,25 +492,23 @@ public void initialize(HttpRequest request) {
     public void intercept(HttpRequest request) {
       interceptorCalled = true;
     }
-
   }
 
-  private BatchRequest getBatchPopulatedWithRequests(boolean testServerError,
+  private BatchRequest getBatchPopulatedWithRequests(
+      boolean testServerError,
       boolean testAuthenticationError,
       boolean returnSuccessAuthenticatedContent,
-      boolean testExponentialBackOff,
       boolean testRedirect,
       boolean testBinary,
-      boolean testMissingLength) throws Exception {
-    transport = new MockTransport(testServerError,
-        testAuthenticationError,
-        testExponentialBackOff,
-        testRedirect,
-        testBinary,
-        testMissingLength);
-    MockGoogleClient client = new MockGoogleClient.Builder(
-        transport, ROOT_URL, SERVICE_PATH, null, null).setApplicationName("Test Application")
-        .build();
+      boolean testMissingLength)
+      throws IOException {
+    transport =
+        new MockTransport(
+            testServerError, testAuthenticationError, testRedirect, testBinary, testMissingLength);
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, null, null)
+            .setApplicationName("Test Application")
+            .build();
     MockGoogleClientRequest<String> jsonHttpRequest1 =
         new MockGoogleClientRequest<String>(client, METHOD1, URI_TEMPLATE1, null, String.class);
     MockGoogleClientRequest<String> jsonHttpRequest2 =
@@ -503,7 +516,7 @@ private BatchRequest getBatchPopulatedWithRequests(boolean testServerError,
     credential = new MockCredential();
 
     ObjectParser parser =
-        testBinary ? new ProtoObjectParser() : new JsonObjectParser(new JacksonFactory());
+        testBinary ? new ProtoObjectParser() : new JsonObjectParser(new GsonFactory());
     BatchRequest batchRequest =
         new BatchRequest(transport, credential).setBatchUrl(new GenericUrl(TEST_BATCH_URL));
     HttpRequest request1 = jsonHttpRequest1.buildHttpRequest();
@@ -514,14 +527,17 @@ private BatchRequest getBatchPopulatedWithRequests(boolean testServerError,
       request2.setUnsuccessfulResponseHandler(
           new MockUnsuccessfulResponseHandler(transport, returnSuccessAuthenticatedContent));
     }
-    if (testExponentialBackOff) {
-      request2.setBackOffPolicy(new MockExponentialBackOffPolicy());
-    }
 
     if (testBinary) {
-      batchRequest.queue(request1, MockData.Class1.class, ErrorOutput.ErrorBody.class,
+      batchRequest.queue(
+          request1,
+          MockData.Class1.class,
+          ErrorOutput.ErrorBody.class,
           new TestCallback1Adapter(callback1));
-      batchRequest.queue(request2, MockData.Class2.class, ErrorOutput.ErrorBody.class,
+      batchRequest.queue(
+          request2,
+          MockData.Class2.class,
+          ErrorOutput.ErrorBody.class,
           new TestCallback2Adapter(callback2));
     } else {
       batchRequest.queue(request1, MockDataClass1.class, GoogleJsonErrorContainer.class, callback1);
@@ -532,7 +548,7 @@ private BatchRequest getBatchPopulatedWithRequests(boolean testServerError,
 
   public void testQueueDatastructures() throws Exception {
     BatchRequest batchRequest =
-        getBatchPopulatedWithRequests(false, false, false, false, false, false, false);
+        getBatchPopulatedWithRequests(false, false, false, false, false, false);
     List<RequestInfo<?, ?>> requestInfos = batchRequest.requestInfos;
 
     // Assert that the expected objects are queued.
@@ -550,9 +566,9 @@ public void testQueueDatastructures() throws Exception {
     assertEquals(METHOD2, requestInfos.get(1).request.getRequestMethod());
   }
 
-  public void testExecute() throws Exception {
+  public void testExecute() throws IOException {
     BatchRequest batchRequest =
-        getBatchPopulatedWithRequests(false, false, false, false, false, false, false);
+        getBatchPopulatedWithRequests(false, false, false, false, false, false);
     batchRequest.execute();
     // Assert callbacks have been invoked.
     assertEquals(1, callback1.successCalls);
@@ -562,9 +578,9 @@ public void testExecute() throws Exception {
     assertTrue(batchRequest.requestInfos.isEmpty());
   }
 
-  public void testExecuteWithError() throws Exception {
+  public void testExecuteWithError() throws IOException {
     BatchRequest batchRequest =
-        getBatchPopulatedWithRequests(true, false, false, false, false, false, false);
+        getBatchPopulatedWithRequests(true, false, false, false, false, false);
     batchRequest.execute();
     // Assert callbacks have been invoked.
     assertEquals(1, callback1.successCalls);
@@ -592,16 +608,17 @@ public void testExecuteWithVoidCallbackError() throws Exception {
     assertEquals(1, callback3.failureCalls);
   }
 
-  public void subTestExecuteWithVoidCallback(boolean testServerError) throws Exception {
-    MockTransport transport = new MockTransport(testServerError, false, false, false, false, false);
-    MockGoogleClient client = new MockGoogleClient.Builder(
-        transport, ROOT_URL, SERVICE_PATH, null, null).setApplicationName("Test Application")
-        .build();
+  public void subTestExecuteWithVoidCallback(boolean testServerError) throws IOException {
+    MockTransport transport = new MockTransport(testServerError, false, false, false, false);
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, null, null)
+            .setApplicationName("Test Application")
+            .build();
     MockGoogleClientRequest<String> jsonHttpRequest1 =
         new MockGoogleClientRequest<String>(client, METHOD1, URI_TEMPLATE1, null, String.class);
     MockGoogleClientRequest<String> jsonHttpRequest2 =
         new MockGoogleClientRequest<String>(client, METHOD2, URI_TEMPLATE2, null, String.class);
-    ObjectParser parser = new JsonObjectParser(new JacksonFactory());
+    ObjectParser parser = new JsonObjectParser(new GsonFactory());
     BatchRequest batchRequest =
         new BatchRequest(transport, null).setBatchUrl(new GenericUrl(TEST_BATCH_URL));
     HttpRequest request1 = jsonHttpRequest1.buildHttpRequest();
@@ -617,7 +634,7 @@ public void subTestExecuteWithVoidCallback(boolean testServerError) throws Excep
 
   public void testExecuteWithAuthenticationErrorThenSuccessCallback() throws Exception {
     BatchRequest batchRequest =
-        getBatchPopulatedWithRequests(false, true, true, false, false, false, false);
+        getBatchPopulatedWithRequests(false, true, true, false, false, false);
     batchRequest.execute();
     // Assert callbacks have been invoked.
     assertEquals(1, callback1.successCalls);
@@ -631,7 +648,7 @@ public void testExecuteWithAuthenticationErrorThenSuccessCallback() throws Excep
 
   public void testExecuteWithAuthenticationErrorThenErrorCallback() throws Exception {
     BatchRequest batchRequest =
-        getBatchPopulatedWithRequests(false, true, false, false, false, false, false);
+        getBatchPopulatedWithRequests(false, true, false, false, false, false);
     batchRequest.execute();
     // Assert callbacks have been invoked.
     assertEquals(1, callback1.successCalls);
@@ -643,38 +660,9 @@ public void testExecuteWithAuthenticationErrorThenErrorCallback() throws Excepti
     assertTrue(batchRequest.requestInfos.isEmpty());
   }
 
-  public void testExecuteWithExponentialBackoffThenSuccessCallback() throws Exception {
-    BatchRequest batchRequest =
-        getBatchPopulatedWithRequests(true, false, false, true, false, false, false);
-    transport.callsBeforeSuccess = 2;
-    batchRequest.execute();
-    // Assert callbacks have been invoked.
-    assertEquals(1, callback1.successCalls);
-    assertEquals(1, callback2.successCalls);
-    // Assert transport called expected number of times.
-    assertEquals(2, transport.actualCalls);
-    // Assert requestInfos is empty after execute.
-    assertTrue(batchRequest.requestInfos.isEmpty());
-  }
-
-  public void testExecuteWithExponentialBackoffThenErrorCallback() throws Exception {
-    BatchRequest batchRequest =
-        getBatchPopulatedWithRequests(true, false, false, true, false, false, false);
-    transport.callsBeforeSuccess = 20;
-    batchRequest.execute();
-    // Assert callbacks have been invoked.
-    assertEquals(1, callback1.successCalls);
-    assertEquals(0, callback2.successCalls);
-    assertEquals(1, callback2.failureCalls);
-    // Assert transport called expected number of times.
-    assertEquals(11, transport.actualCalls);
-    // Assert requestInfos is empty after execute.
-    assertTrue(batchRequest.requestInfos.isEmpty());
-  }
-
   public void testInterceptor() throws Exception {
     BatchRequest batchRequest =
-        getBatchPopulatedWithRequests(true, false, false, true, false, false, false);
+        getBatchPopulatedWithRequests(true, false, false, false, false, false);
     batchRequest.execute();
     // Assert the top-level request initializer is called.
     assertTrue(credential.initializerCalled);
@@ -683,7 +671,7 @@ public void testInterceptor() throws Exception {
 
   public void testRedirect() throws Exception {
     BatchRequest batchRequest =
-        getBatchPopulatedWithRequests(false, false, false, false, true, false, false);
+        getBatchPopulatedWithRequests(false, false, false, true, false, false);
     transport.callsBeforeSuccess = 2;
     batchRequest.execute();
     // Assert transport called expected number of times.
@@ -701,28 +689,33 @@ public void testExecute_checkWriteTo() throws Exception {
     String request2Method = HttpMethods.GET;
     String request2Url = "http://test/dummy/url2";
 
-    final StringBuilder expectedOutput = new StringBuilder();
-    expectedOutput.append("--__END_OF_PART__\r\n");
-    expectedOutput.append("Content-Length: 118\r\n");
-    expectedOutput.append("Content-Type: application/http\r\n");
-    expectedOutput.append("content-id: 1\r\n");
-    expectedOutput.append("content-transfer-encoding: binary\r\n");
-    expectedOutput.append("\r\n");
-    expectedOutput.append("POST http://test/dummy/url1 HTTP/1.1\r\n");
-    expectedOutput.append("Content-Length: 26\r\n");
-    expectedOutput.append("Content-Type: " + request1ContentType + "\r\n");
-    expectedOutput.append("\r\n");
-    expectedOutput.append(request1Content + "\r\n");
-    expectedOutput.append("--__END_OF_PART__\r\n");
-    expectedOutput.append("Content-Length: 39\r\n");
-    expectedOutput.append("Content-Type: application/http\r\n");
-    expectedOutput.append("content-id: 2\r\n");
-    expectedOutput.append("content-transfer-encoding: binary\r\n");
-    expectedOutput.append("\r\n");
-    expectedOutput.append("GET http://test/dummy/url2 HTTP/1.1\r\n");
-    expectedOutput.append("\r\n");
-    expectedOutput.append("\r\n");
-    expectedOutput.append("--__END_OF_PART__--\r\n");
+    // MIME content boundaries are not reproducible.
+    StringBuilder part1 = new StringBuilder();
+    part1.append("Content-Length: 118\r\n");
+    part1.append("Content-Type: application/http\r\n");
+    part1.append("content-id: 1\r\n");
+    part1.append("content-transfer-encoding: binary\r\n");
+    part1.append("\r\n");
+    part1.append("POST http://test/dummy/url1 HTTP/1.1\r\n");
+    part1.append("Content-Length: 26\r\n");
+    part1.append("Content-Type: " + request1ContentType + "\r\n");
+    part1.append("\r\n");
+    part1.append(request1Content + "\r\n");
+    part1.append("--__END_OF_PART__");
+    String expected1 = part1.toString();
+
+    StringBuilder part2 = new StringBuilder();
+    part2.append("Content-Length: 39\r\n");
+    part2.append("Content-Type: application/http\r\n");
+    part2.append("content-id: 2\r\n");
+    part2.append("content-transfer-encoding: binary\r\n");
+    part2.append("\r\n");
+    part2.append("GET http://test/dummy/url2 HTTP/1.1\r\n");
+    part2.append("\r\n");
+    part2.append("\r\n");
+    part2.append("--__END_OF_PART__");
+    String expected2 = part2.toString();
+
     MockHttpTransport transport = new MockHttpTransport();
     HttpRequest request1 =
         transport
@@ -731,96 +724,117 @@ public void testExecute_checkWriteTo() throws Exception {
                 request1Method,
                 new GenericUrl(request1Url),
                 new ByteArrayContent(request1ContentType, request1Content.getBytes(UTF_8)));
-    HttpRequest request2 = transport.createRequestFactory()
-        .buildRequest(request2Method, new GenericUrl(request2Url), null);
-    subtestExecute_checkWriteTo(expectedOutput.toString(), request1, request2);
+    HttpRequest request2 =
+        transport
+            .createRequestFactory()
+            .buildRequest(request2Method, new GenericUrl(request2Url), null);
+    subtestExecute_checkWriteTo(expected1, expected2, request1, request2);
   }
 
-  private void subtestExecute_checkWriteTo(final String expectedOutput, HttpRequest... requests)
-      throws IOException {
-
-    MockHttpTransport transport = new MockHttpTransport() {
+  private void subtestExecute_checkWriteTo(
+      final String part1, final String part2, HttpRequest... requests) throws IOException {
 
-      @Override
-      public LowLevelHttpRequest buildRequest(String method, String url) {
-        return new MockLowLevelHttpRequest(url) {
+    MockHttpTransport transport =
+        new MockHttpTransport() {
 
           @Override
-          public LowLevelHttpResponse execute() throws IOException {
-            assertEquals("multipart/mixed; boundary=__END_OF_PART__", getContentType());
-            ByteArrayOutputStream out = new ByteArrayOutputStream();
-            getStreamingContent().writeTo(out);
-            assertEquals(expectedOutput, out.toString("UTF-8"));
-            MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
-            response.setStatusCode(200);
-            response.addHeader("Content-Type", "multipart/mixed; boundary=" + RESPONSE_BOUNDARY);
-            String content2 = "{\"name\": \"" + TEST_NAME + "\", \"number\": \"" + TEST_NUM + "\"}";
-            StringBuilder responseContent = new StringBuilder();
-            responseContent.append("--" + RESPONSE_BOUNDARY + "\n")
-                .append("Content-Type: application/http\n")
-                .append("Content-Transfer-Encoding: binary\n").append("Content-ID: response-1\n\n")
-                .append("HTTP/1.1 200 OK\n")
-                .append("Content-Type: application/json; charset=UTF-8\n")
-                .append("Content-Length: " + content2.length() + "\n\n").append(content2 + "\n\n")
-                .append("--" + RESPONSE_BOUNDARY + "--\n\n");
-            response.setContent(responseContent.toString());
-            return response;
+          public LowLevelHttpRequest buildRequest(String method, String url) {
+            return new MockLowLevelHttpRequest(url) {
+
+              @Override
+              public LowLevelHttpResponse execute() throws IOException {
+                assertTrue(
+                    getContentType().startsWith("multipart/mixed; boundary=__END_OF_PART__"));
+                ByteArrayOutputStream out = new ByteArrayOutputStream();
+                getStreamingContent().writeTo(out);
+                String actual = out.toString("UTF-8");
+                assertTrue(actual + "\n does not contain \n" + part1, actual.contains(part1));
+                assertTrue(actual.contains(part2));
+                MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
+                response.setStatusCode(200);
+                response.addHeader(
+                    "Content-Type", "multipart/mixed; boundary=" + RESPONSE_BOUNDARY);
+                String content2 =
+                    "{\"name\": \"" + TEST_NAME + "\", \"number\": \"" + TEST_NUM + "\"}";
+                StringBuilder responseContent = new StringBuilder();
+                responseContent
+                    .append("--" + RESPONSE_BOUNDARY + "\n")
+                    .append("Content-Type: application/http\n")
+                    .append("Content-Transfer-Encoding: binary\n")
+                    .append("Content-ID: response-1\n\n")
+                    .append("HTTP/1.1 200 OK\n")
+                    .append("Content-Type: application/json; charset=UTF-8\n")
+                    .append("Content-Length: " + content2.length() + "\n\n")
+                    .append(content2 + "\n\n")
+                    .append("--" + RESPONSE_BOUNDARY + "--\n\n");
+                response.setContent(responseContent.toString());
+                return response;
+              }
+            };
           }
         };
-      }
-    };
 
     BatchRequest batchRequest = new BatchRequest(transport, null);
-    BatchCallback<Void, Void> callback = new BatchCallback<Void, Void>() {
+    BatchCallback<Void, Void> callback =
+        new BatchCallback<Void, Void>() {
 
-      @Override
-      public void onSuccess(Void t, HttpHeaders responseHeaders) {
-      }
+          @Override
+          public void onSuccess(Void t, HttpHeaders responseHeaders) {}
 
-      @Override
-      public void onFailure(Void e, HttpHeaders responseHeaders) {
-      }
-    };
+          @Override
+          public void onFailure(Void e, HttpHeaders responseHeaders) {}
+        };
     for (HttpRequest request : requests) {
       batchRequest.queue(request, Void.class, Void.class, callback);
     }
     batchRequest.execute();
   }
 
-  public void testExecute_checkWriteToNoHeaders() throws Exception {
+  public void testExecute_checkWriteToNoHeaders() throws IOException {
     MockHttpTransport transport = new MockHttpTransport();
-    HttpRequest request1 = transport.createRequestFactory()
-        .buildPostRequest(HttpTesting.SIMPLE_GENERIC_URL, new HttpContent() {
-
-          @Override
-          public long getLength() {
-            return -1;
-          }
+    HttpRequest request =
+        transport
+            .createRequestFactory()
+            .buildPostRequest(
+                HttpTesting.SIMPLE_GENERIC_URL,
+                new HttpContent() {
 
-          @Override
-          public String getType() {
-            return null;
-          }
+                  @Override
+                  public long getLength() {
+                    return -1;
+                  }
 
-          @Override
-          public void writeTo(OutputStream out) {
-          }
+                  @Override
+                  public String getType() {
+                    return null;
+                  }
 
-          @Override
-          public boolean retrySupported() {
-            return true;
-          }
-        });
-    subtestExecute_checkWriteTo(new StringBuilder().append("--__END_OF_PART__\r\n")
-        .append("Content-Length: 36\r\n").append("Content-Type: application/http\r\n")
-        .append("content-id: 1\r\n").append("content-transfer-encoding: binary\r\n").append("\r\n")
-        .append("POST http://google.com/ HTTP/1.1\r\n").append("\r\n").append("\r\n")
-        .append("--__END_OF_PART__--\r\n").toString(), request1);
-  }
+                  @Override
+                  public void writeTo(OutputStream out) {}
 
-  public void testProtoExecute() throws Exception {
+                  @Override
+                  public boolean retrySupported() {
+                    return true;
+                  }
+                });
+    String expected =
+        new StringBuilder()
+            .append("Content-Length: 36\r\n")
+            .append("Content-Type: application/http\r\n")
+            .append("content-id: 1\r\n")
+            .append("content-transfer-encoding: binary\r\n")
+            .append("\r\n")
+            .append("POST http://google.com/ HTTP/1.1\r\n")
+            .append("\r\n")
+            .append("\r\n")
+            .append("--__END_OF_PART__")
+            .toString();
+    subtestExecute_checkWriteTo(expected, expected, request);
+  }
+
+  public void testProtoExecute() throws IOException {
     BatchRequest batchRequest =
-        getBatchPopulatedWithRequests(false, false, false, false, false, true, false);
+        getBatchPopulatedWithRequests(false, false, false, false, true, false);
     batchRequest.execute();
     // Assert callbacks have been invoked.
     assertEquals(1, callback1.successCalls);
@@ -830,9 +844,9 @@ public void testProtoExecute() throws Exception {
     assertTrue(batchRequest.requestInfos.isEmpty());
   }
 
-  public void testProtoExecuteWithError() throws Exception {
+  public void testProtoExecuteWithError() throws IOException {
     BatchRequest batchRequest =
-        getBatchPopulatedWithRequests(true, false, false, false, false, true, false);
+        getBatchPopulatedWithRequests(true, false, false, false, true, false);
     batchRequest.execute();
     // Assert callbacks have been invoked.
     assertEquals(1, callback1.successCalls);
@@ -844,9 +858,9 @@ public void testProtoExecuteWithError() throws Exception {
     assertEquals(1, transport.actualCalls);
   }
 
-  public void testProtoExecuteWithoutLength() throws Exception {
+  public void testProtoExecuteWithoutLength() throws IOException {
     BatchRequest batchRequest =
-        getBatchPopulatedWithRequests(false, false, false, false, false, true, true);
+        getBatchPopulatedWithRequests(false, false, false, false, true, true);
     batchRequest.execute();
     // Assert callbacks have been invoked.
     assertEquals(1, callback1.successCalls);
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/compute/ComputeCredentialTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/compute/ComputeCredentialTest.java
index 14a575563..88fddd12b 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/compute/ComputeCredentialTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/compute/ComputeCredentialTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -14,11 +14,9 @@
 
 package com.google.api.client.googleapis.compute;
 
-
 import com.google.api.client.googleapis.testing.compute.MockMetadataServerTransport;
 import com.google.api.client.http.HttpTransport;
-import com.google.api.client.json.jackson2.JacksonFactory;
-
+import com.google.api.client.json.gson.GsonFactory;
 import junit.framework.TestCase;
 
 /**
@@ -34,7 +32,7 @@ public void testExecuteRefreshToken() throws Exception {
 
     HttpTransport transport = new MockMetadataServerTransport(ACCESS_TOKEN);
 
-    ComputeCredential credential = new ComputeCredential(transport, new JacksonFactory());
+    ComputeCredential credential = new ComputeCredential(transport, new GsonFactory());
 
     assertTrue(credential.refreshToken());
     assertEquals(ACCESS_TOKEN, credential.getAccessToken());
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransportTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransportTest.java
new file mode 100644
index 000000000..f7843d05a
--- /dev/null
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/javanet/GoogleNetHttpTransportTest.java
@@ -0,0 +1,29 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.api.client.googleapis.javanet;
+
+import com.google.api.client.googleapis.mtls.MtlsProvider;
+import com.google.api.client.googleapis.mtls.MtlsTransportBaseTest;
+import com.google.api.client.http.HttpTransport;
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+
+public class GoogleNetHttpTransportTest extends MtlsTransportBaseTest {
+  @Override
+  protected HttpTransport buildTrustedTransport(MtlsProvider mtlsProvider)
+      throws GeneralSecurityException, IOException {
+    return GoogleNetHttpTransport.newTrustedTransport(mtlsProvider);
+  }
+}
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainerTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainerTest.java
index 1a2717640..9db097428 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainerTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorContainerTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -16,8 +16,7 @@
 
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonParser;
-import com.google.api.client.json.jackson2.JacksonFactory;
-
+import com.google.api.client.json.gson.GsonFactory;
 import junit.framework.TestCase;
 
 /**
@@ -27,10 +26,17 @@
  */
 public class GoogleJsonErrorContainerTest extends TestCase {
 
-  static final JsonFactory FACTORY = new JacksonFactory();
-  static final String ERROR = "{" + "\"error\":{" + "\"code\":403," + "\"errors\":[{"
-      + "\"domain\":\"usageLimits\"," + "\"message\":\"Access Not Configured\","
-      + "\"reason\":\"accessNotConfigured\"" + "}]," + "\"message\":\"Access Not Configured\"}}";
+  static final JsonFactory FACTORY = new GsonFactory();
+  static final String ERROR =
+      "{"
+          + "\"error\":{"
+          + "\"code\":403,"
+          + "\"errors\":[{"
+          + "\"domain\":\"usageLimits\","
+          + "\"message\":\"Access Not Configured\","
+          + "\"reason\":\"accessNotConfigured\""
+          + "}],"
+          + "\"message\":\"Access Not Configured\"}}";
 
   public void test_json() throws Exception {
     JsonParser parser = FACTORY.createJsonParser(ERROR);
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorTest.java
index 8c2ff1af5..c988804a6 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonErrorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -22,32 +22,38 @@
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonParser;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
-
+import java.io.InputStream;
 import junit.framework.TestCase;
 
-
 /**
- * Tests {@link GoogleJsonError}.
+ * Tests {@link com.google.api.client.googleapis.json.GoogleJsonError}.
  *
  * @author Yaniv Inbar
  */
 public class GoogleJsonErrorTest extends TestCase {
 
-  static final JsonFactory FACTORY = new JacksonFactory();
-  static final String ERROR = "{" + "\"code\":403," + "\"errors\":[{"
-      + "\"domain\":\"usageLimits\"," + "\"message\":\"Access Not Configured\","
-      + "\"reason\":\"accessNotConfigured\"" + "}]," + "\"message\":\"Access Not Configured\"}";
+  static final JsonFactory FACTORY = new GsonFactory();
+  static final String ERROR =
+      "{"
+          + "\"code\":403,"
+          + "\"errors\":[{"
+          + "\"domain\":\"usageLimits\","
+          + "\"message\":\"Access Not Configured\","
+          + "\"reason\":\"accessNotConfigured\""
+          + "}],"
+          + "\"message\":\"Access Not Configured\"}";
   static final String ERROR_RESPONSE = "{\"error\":" + ERROR + "}";
 
   public void test_json() throws Exception {
     JsonParser parser = FACTORY.createJsonParser(ERROR);
     parser.nextToken();
-    GoogleJsonError e = parser.parse(GoogleJsonError.class);
+    com.google.api.client.googleapis.json.GoogleJsonError e =
+        parser.parse(com.google.api.client.googleapis.json.GoogleJsonError.class);
     assertEquals(ERROR, FACTORY.toString(e));
   }
 
@@ -59,8 +65,15 @@ static class ErrorTransport extends MockHttpTransport {
     }
 
     ErrorTransport(String content, String contentType) {
-      response = new MockLowLevelHttpResponse().setContent(content)
-          .setContentType(contentType).setStatusCode(HttpStatusCodes.STATUS_CODE_FORBIDDEN);
+      response =
+          new MockLowLevelHttpResponse()
+              .setContent(content)
+              .setContentType(contentType)
+              .setStatusCode(HttpStatusCodes.STATUS_CODE_FORBIDDEN);
+    }
+
+    ErrorTransport(MockLowLevelHttpResponse mockLowLevelHttpResponse) {
+      response = mockLowLevelHttpResponse;
     }
 
     @Override
@@ -75,7 +88,85 @@ public void testParse() throws Exception {
         transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
     request.setThrowExceptionOnExecuteError(false);
     HttpResponse response = request.execute();
-    GoogleJsonError errorResponse = GoogleJsonError.parse(FACTORY, response);
+    com.google.api.client.googleapis.json.GoogleJsonError errorResponse =
+        com.google.api.client.googleapis.json.GoogleJsonError.parse(FACTORY, response);
     assertEquals(ERROR, FACTORY.toString(errorResponse));
   }
+
+  public void testParse_withDetails() throws Exception {
+    String DETAILS_ERROR =
+        "{"
+            + "\"code\":400,"
+            + "\"details\":[{"
+            + "\"@type\":\"type.googleapis.com/google.dataflow.v1beta3.InvalidTemplateParameters\","
+            + "\"parameterViolations\":[{"
+            + "\"description\":\"Parameter didn't match regex '^[0-9a-zA-Z_]+$'\","
+            + "\"parameter\":\"safeBrowsingApiKey\""
+            + "}]},{"
+            + "\"@type\":\"type.googleapis.com/google.rpc.DebugInfo\","
+            + "\"detail\":\"test detail\"}],"
+            + "\"message\":\"The template parameters are invalid.\","
+            + "\"status\":\"INVALID_ARGUMENT\""
+            + "}";
+    InputStream errorContent = GoogleJsonErrorTest.class.getResourceAsStream("error.json");
+    HttpTransport transport =
+        new ErrorTransport(
+            new MockLowLevelHttpResponse()
+                .setContent(errorContent)
+                .setContentType(Json.MEDIA_TYPE)
+                .setStatusCode(HttpStatusCodes.STATUS_CODE_FORBIDDEN));
+    HttpRequest request =
+        transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
+    request.setThrowExceptionOnExecuteError(false);
+    HttpResponse response = request.execute();
+    com.google.api.client.googleapis.json.GoogleJsonError errorResponse =
+        com.google.api.client.googleapis.json.GoogleJsonError.parse(FACTORY, response);
+
+    assertEquals(DETAILS_ERROR, FACTORY.toString(errorResponse));
+    assertNotNull(errorResponse.getDetails());
+  }
+
+  public void testParse_withReasonInDetails() throws Exception {
+    String DETAILS_ERROR =
+        "{"
+            + "\"code\":400,"
+            + "\"details\":"
+            + "[{"
+            + "\"@type\":\"type.googleapis.com/google.dataflow.v1beta3.InvalidTemplateParameters\","
+            + "\"parameterViolations\":[{"
+            + "\"description\":\"Parameter didn't match regex '^[0-9a-zA-Z_]+$'\","
+            + "\"parameter\":\"safeBrowsingApiKey\""
+            + "}],"
+            + "\"reason\":\"TEST REASON 1\""
+            + "},{"
+            + "\"@type\":\"type.googleapis.com/google.rpc.DebugInfo\","
+            + "\"detail\":\"test detail\""
+            + "},{"
+            + "\"@type\":\"type.googleapis.com/google.rpc.DebugInfo\","
+            + "\"reason\":\"test reason 2\""
+            + "},{"
+            + "\"@type\":\"type.googleapis.com/google.rpc.DebugInfo\""
+            + "}],"
+            + "\"message\":\"The template parameters are invalid.\","
+            + "\"status\":\"INVALID_ARGUMENT\""
+            + "}";
+    InputStream errorContent =
+        GoogleJsonErrorTest.class.getResourceAsStream("errorWithReasonInDetails.json");
+
+    HttpTransport transport =
+        new ErrorTransport(
+            new MockLowLevelHttpResponse()
+                .setContent(errorContent)
+                .setContentType(Json.MEDIA_TYPE)
+                .setStatusCode(HttpStatusCodes.STATUS_CODE_FORBIDDEN));
+    HttpRequest request =
+        transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
+    request.setThrowExceptionOnExecuteError(false);
+    HttpResponse response = request.execute();
+    com.google.api.client.googleapis.json.GoogleJsonError errorResponse =
+        com.google.api.client.googleapis.json.GoogleJsonError.parse(FACTORY, response);
+
+    assertEquals(DETAILS_ERROR, FACTORY.toString(errorResponse));
+    assertNotNull(errorResponse.getDetails().get(2).getReason());
+  }
 }
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonResponseExceptionTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonResponseExceptionTest.java
index 3f9670cdb..ad28bd0ca 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonResponseExceptionTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/json/GoogleJsonResponseExceptionTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -17,15 +17,15 @@
 import com.google.api.client.googleapis.json.GoogleJsonErrorTest.ErrorTransport;
 import com.google.api.client.http.HttpRequest;
 import com.google.api.client.http.HttpResponse;
+import com.google.api.client.http.HttpStatusCodes;
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.json.Json;
 import com.google.api.client.testing.http.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
-import com.google.api.client.util.StringUtils;
-
+import com.google.api.client.testing.http.MockLowLevelHttpResponse;
+import java.io.InputStream;
 import junit.framework.TestCase;
 
-
 /**
  * Tests {@link GoogleJsonResponseException}.
  *
@@ -40,9 +40,10 @@ public void testFrom_noDetails() throws Exception {
     request.setThrowExceptionOnExecuteError(false);
     HttpResponse response = request.execute();
     GoogleJsonResponseException ge =
-        GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
+        GoogleJsonResponseException.from(
+            com.google.api.client.googleapis.json.GoogleJsonErrorTest.FACTORY, response);
     assertNull(ge.getDetails());
-    assertEquals("200", ge.getMessage());
+    assertTrue(ge.getMessage().startsWith("200"));
   }
 
   public void testFrom_withDetails() throws Exception {
@@ -52,10 +53,13 @@ public void testFrom_withDetails() throws Exception {
     request.setThrowExceptionOnExecuteError(false);
     HttpResponse response = request.execute();
     GoogleJsonResponseException ge =
-        GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
-    assertEquals(GoogleJsonErrorTest.ERROR, GoogleJsonErrorTest.FACTORY.toString(ge.getDetails()));
-    assertTrue(
-        ge.getMessage(), ge.getMessage().startsWith("403" + StringUtils.LINE_SEPARATOR + "{"));
+        GoogleJsonResponseException.from(
+            com.google.api.client.googleapis.json.GoogleJsonErrorTest.FACTORY, response);
+    assertEquals(
+        com.google.api.client.googleapis.json.GoogleJsonErrorTest.ERROR,
+        com.google.api.client.googleapis.json.GoogleJsonErrorTest.FACTORY.toString(
+            ge.getDetails()));
+    assertTrue(ge.getMessage().startsWith("403"));
   }
 
   public void testFrom_detailsMissingContent() throws Exception {
@@ -65,9 +69,10 @@ public void testFrom_detailsMissingContent() throws Exception {
     request.setThrowExceptionOnExecuteError(false);
     HttpResponse response = request.execute();
     GoogleJsonResponseException ge =
-        GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
+        GoogleJsonResponseException.from(
+            com.google.api.client.googleapis.json.GoogleJsonErrorTest.FACTORY, response);
     assertNull(ge.getDetails());
-    assertEquals("403", ge.getMessage());
+    assertTrue(ge.getMessage().startsWith("403"));
   }
 
   public void testFrom_detailsArbitraryJsonContent() throws Exception {
@@ -77,9 +82,10 @@ public void testFrom_detailsArbitraryJsonContent() throws Exception {
     request.setThrowExceptionOnExecuteError(false);
     HttpResponse response = request.execute();
     GoogleJsonResponseException ge =
-        GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
+        GoogleJsonResponseException.from(
+            com.google.api.client.googleapis.json.GoogleJsonErrorTest.FACTORY, response);
     assertNull(ge.getDetails());
-    assertEquals("403", ge.getMessage());
+    assertTrue(ge.getMessage().startsWith("403"));
   }
 
   public void testFrom_detailsArbitraryXmlContent() throws Exception {
@@ -89,71 +95,118 @@ public void testFrom_detailsArbitraryXmlContent() throws Exception {
     request.setThrowExceptionOnExecuteError(false);
     HttpResponse response = request.execute();
     GoogleJsonResponseException ge =
-        GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
+        GoogleJsonResponseException.from(
+            com.google.api.client.googleapis.json.GoogleJsonErrorTest.FACTORY, response);
     assertNull(ge.getDetails());
-    assertTrue(
-        ge.getMessage(), ge.getMessage().startsWith("403" + StringUtils.LINE_SEPARATOR + "<"));
+    assertTrue(ge.getMessage().startsWith("403"));
+    assertTrue(ge.getMessage().contains("<foo>"));
   }
 
   public void testFrom_errorNoContentButWithJsonContentType() throws Exception {
     HttpTransport transport = new ErrorTransport("", Json.MEDIA_TYPE);
-      HttpRequest request =
+    HttpRequest request =
         transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
     request.setThrowExceptionOnExecuteError(false);
     HttpResponse response = request.execute();
     GoogleJsonResponseException ge =
-        GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
+        GoogleJsonResponseException.from(
+            com.google.api.client.googleapis.json.GoogleJsonErrorTest.FACTORY, response);
     assertNull(ge.getDetails());
-    assertEquals("403", ge.getMessage());
+    assertTrue(ge.getMessage().startsWith("403"));
   }
 
   public void testFrom_errorEmptyContentButWithJsonContentType() throws Exception {
     HttpTransport transport = new ErrorTransport(null, Json.MEDIA_TYPE);
-      HttpRequest request =
+    HttpRequest request =
         transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
     request.setThrowExceptionOnExecuteError(false);
     HttpResponse response = request.execute();
     GoogleJsonResponseException ge =
-        GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
+        GoogleJsonResponseException.from(
+            com.google.api.client.googleapis.json.GoogleJsonErrorTest.FACTORY, response);
     assertNull(ge.getDetails());
-    assertEquals("403", ge.getMessage());
+    assertTrue(ge.getMessage().startsWith("403"));
   }
 
   public void testFrom_detailsErrorObject() throws Exception {
-    HttpTransport transport = new ErrorTransport("{\"error\": {\"message\": \"invalid_token\"}, \"error_description\": \"Invalid value\"}", Json.MEDIA_TYPE);
+    HttpTransport transport =
+        new ErrorTransport(
+            "{\"error\": {\"message\": \"invalid_token\"}, \"error_description\": \"Invalid value\"}",
+            Json.MEDIA_TYPE);
     HttpRequest request =
         transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
     request.setThrowExceptionOnExecuteError(false);
     HttpResponse response = request.execute();
     GoogleJsonResponseException ge =
-        GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
+        GoogleJsonResponseException.from(
+            com.google.api.client.googleapis.json.GoogleJsonErrorTest.FACTORY, response);
     assertNotNull(ge.getDetails());
     assertEquals("invalid_token", ge.getDetails().getMessage());
     assertTrue(ge.getMessage().contains("403"));
   }
 
   public void testFrom_detailsErrorString() throws Exception {
-    HttpTransport transport = new ErrorTransport("{\"error\": \"invalid_token\", \"error_description\": \"Invalid value\"}", Json.MEDIA_TYPE);
+    HttpTransport transport =
+        new ErrorTransport(
+            "{\"error\": \"invalid_token\", \"error_description\": \"Invalid value\"}",
+            Json.MEDIA_TYPE);
     HttpRequest request =
         transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
     request.setThrowExceptionOnExecuteError(false);
     HttpResponse response = request.execute();
     GoogleJsonResponseException ge =
-        GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
+        GoogleJsonResponseException.from(
+            com.google.api.client.googleapis.json.GoogleJsonErrorTest.FACTORY, response);
     assertNull(ge.getDetails());
     assertTrue(ge.getMessage().contains("403"));
     assertTrue(ge.getMessage().contains("invalid_token"));
   }
 
   public void testFrom_detailsNoErrorField() throws Exception {
-    HttpTransport transport = new ErrorTransport("{\"error_description\": \"Invalid value\"}", Json.MEDIA_TYPE);
+    HttpTransport transport =
+        new ErrorTransport("{\"error_description\": \"Invalid value\"}", Json.MEDIA_TYPE);
     HttpRequest request =
         transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
     request.setThrowExceptionOnExecuteError(false);
     HttpResponse response = request.execute();
     GoogleJsonResponseException ge =
-        GoogleJsonResponseException.from(GoogleJsonErrorTest.FACTORY, response);
+        GoogleJsonResponseException.from(
+            com.google.api.client.googleapis.json.GoogleJsonErrorTest.FACTORY, response);
     assertNull(ge.getDetails());
-    assertEquals("403", ge.getMessage());
+    assertTrue(ge.getMessage().startsWith("403"));
+  }
+
+  public void testFrom_detailsWithInvalidParameter() throws Exception {
+    String DETAILS_ERROR =
+        "{"
+            + "\"code\":400,"
+            + "\"details\":[{"
+            + "\"@type\":\"type.googleapis.com/google.dataflow.v1beta3.InvalidTemplateParameters\","
+            + "\"parameterViolations\":[{"
+            + "\"description\":\"Parameter didn't match regex '^[0-9a-zA-Z_]+$'\","
+            + "\"parameter\":\"safeBrowsingApiKey\""
+            + "}]},{"
+            + "\"@type\":\"type.googleapis.com/google.rpc.DebugInfo\","
+            + "\"detail\":\"test detail\"}],"
+            + "\"message\":\"The template parameters are invalid.\","
+            + "\"status\":\"INVALID_ARGUMENT\""
+            + "}";
+    InputStream errorContent =
+        com.google.api.client.googleapis.json.GoogleJsonErrorTest.class.getResourceAsStream(
+            "error.json");
+    HttpTransport transport =
+        new ErrorTransport(
+            new MockLowLevelHttpResponse()
+                .setContent(errorContent)
+                .setContentType(Json.MEDIA_TYPE)
+                .setStatusCode(HttpStatusCodes.STATUS_CODE_FORBIDDEN));
+    HttpRequest request =
+        transport.createRequestFactory().buildGetRequest(HttpTesting.SIMPLE_GENERIC_URL);
+    request.setThrowExceptionOnExecuteError(false);
+    HttpResponse response = request.execute();
+    GoogleJsonResponseException ge =
+        GoogleJsonResponseException.from(
+            com.google.api.client.googleapis.json.GoogleJsonErrorTest.FACTORY, response);
+    assertNotNull(ge.getDetails().getDetails());
   }
 }
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpDownloaderTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpDownloaderTest.java
index cf4861d52..643dd5dac 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpDownloaderTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpDownloaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012 Google Inc.
+ * Copyright 2012 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
@@ -44,9 +44,16 @@ private static class MediaTransport extends MockHttpTransport {
     boolean testServerError;
     boolean testClientError;
     boolean directDownloadEnabled;
+    boolean contentLengthIncluded;
 
     protected MediaTransport(int contentLength) {
       this.contentLength = contentLength;
+      this.contentLengthIncluded = true;
+    }
+
+    protected MediaTransport(int contentLength, boolean contentLengthIncluded) {
+      this.contentLength = contentLength;
+      this.contentLengthIncluded = contentLengthIncluded;
     }
 
     @Override
@@ -54,7 +61,7 @@ public LowLevelHttpRequest buildRequest(String name, String url) {
       assertEquals(TEST_REQUEST_URL, url);
 
       return new MockLowLevelHttpRequest() {
-          @Override
+        @Override
         public LowLevelHttpResponse execute() {
           lowLevelExecCalls++;
           MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
@@ -74,7 +81,9 @@ public LowLevelHttpResponse execute() {
               return response;
             }
             response.setStatusCode(200);
-            response.addHeader("Content-Length", String.valueOf(contentLength));
+            if (contentLengthIncluded) {
+              response.addHeader("Content-Length", String.valueOf(contentLength));
+            }
             response.setContent(
                 new ByteArrayInputStream(new byte[contentLength - bytesDownloaded]));
             return response;
@@ -85,7 +94,8 @@ public LowLevelHttpResponse execute() {
           if (lastBytePos != -1) {
             currentRequestLastBytePos = Math.min(lastBytePos, currentRequestLastBytePos);
           }
-          assertEquals("bytes=" + bytesDownloaded + "-" + currentRequestLastBytePos,
+          assertEquals(
+              "bytes=" + bytesDownloaded + "-" + currentRequestLastBytePos,
               getFirstHeaderValue("Range"));
 
           if (testServerError && lowLevelExecCalls == 2) {
@@ -100,7 +110,12 @@ public LowLevelHttpResponse execute() {
           }
 
           response.setStatusCode(206);
-          int upper = Math.min(bytesDownloaded + TEST_CHUNK_SIZE, contentLength) - 1;
+          int upper;
+          if (lastBytePos != -1) {
+            upper = Math.min(lastBytePos, contentLength) - 1;
+          } else {
+            upper = Math.min(bytesDownloaded + TEST_CHUNK_SIZE, contentLength) - 1;
+          }
           response.addHeader(
               "Content-Range", "bytes " + bytesDownloaded + "-" + upper + "/" + contentLength);
           int bytesDownloadedCur = upper - bytesDownloaded + 1;
@@ -113,13 +128,11 @@ public LowLevelHttpResponse execute() {
   }
 
   private static class ProgressListenerWithTwoDownloadCalls
-      implements
-        MediaHttpDownloaderProgressListener {
+      implements MediaHttpDownloaderProgressListener {
 
     int progressListenerCalls;
 
-    public ProgressListenerWithTwoDownloadCalls() {
-    }
+    public ProgressListenerWithTwoDownloadCalls() {}
 
     public void progressChanged(MediaHttpDownloader downloader) {
       progressListenerCalls++;
@@ -211,8 +224,9 @@ public void testDownloadServerErrorWithBackOffEnabled() throws Exception {
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
     MediaTransport fakeTransport = new MediaTransport(contentLength);
     fakeTransport.testServerError = true;
-    MediaHttpDownloader downloader = new MediaHttpDownloader(
-        fakeTransport, new MediaHttpUploaderTest.ZeroBackOffRequestInitializer());
+    MediaHttpDownloader downloader =
+        new MediaHttpDownloader(
+            fakeTransport, new MediaHttpUploaderTest.ZeroBackOffRequestInitializer());
     downloader.download(new GenericUrl(TEST_REQUEST_URL), outputStream);
 
     // There should be 3 calls made: 1 download request with server error and 2 successful download
@@ -327,7 +341,22 @@ public void testSetBytesDownloadedWithDirectDownload() throws Exception {
     MediaHttpDownloader downloader = new MediaHttpDownloader(fakeTransport, null);
     downloader.setDirectDownloadEnabled(true);
     downloader.setBytesDownloaded(contentLength - 10000);
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    downloader.download(new GenericUrl(TEST_REQUEST_URL), outputStream);
+    assertEquals(10000, outputStream.size());
 
+    // There should be 1 download call made.
+    assertEquals(1, fakeTransport.lowLevelExecCalls);
+  }
+
+  public void testSetBytesDownloadedWithDirectDownloadAndContentLengthNull() throws Exception {
+    int contentLength = MediaHttpDownloader.MAXIMUM_CHUNK_SIZE;
+    MediaTransport fakeTransport = new MediaTransport(contentLength, false);
+    fakeTransport.directDownloadEnabled = true;
+    fakeTransport.bytesDownloaded = contentLength - 10000;
+    MediaHttpDownloader downloader = new MediaHttpDownloader(fakeTransport, null);
+    downloader.setDirectDownloadEnabled(true);
+    downloader.setBytesDownloaded(contentLength - 10000);
     ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
     downloader.download(new GenericUrl(TEST_REQUEST_URL), outputStream);
     assertEquals(10000, outputStream.size());
@@ -353,6 +382,40 @@ public void testSetContentRangeWithResumableDownload() throws Exception {
     assertEquals(1, fakeTransport.lowLevelExecCalls);
   }
 
+  public void testSetContentRangeFromStartWithResumableDownload() throws Exception {
+    MediaTransport fakeTransport = new MediaTransport(MediaHttpDownloader.MAXIMUM_CHUNK_SIZE);
+    fakeTransport.bytesDownloaded = 0;
+    fakeTransport.lastBytePos = 1024;
+
+    MediaHttpDownloader downloader = new MediaHttpDownloader(fakeTransport, null);
+    downloader.setContentRange(0, 1024);
+
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    downloader.download(new GenericUrl(TEST_REQUEST_URL), outputStream);
+    assertEquals(1024, downloader.getLastBytePosition());
+    assertEquals(1024, outputStream.size());
+
+    // There should be 1 download call made.
+    assertEquals(1, fakeTransport.lowLevelExecCalls);
+  }
+
+  public void testSetContentRangeFromMiddletWithResumableDownload() throws Exception {
+    MediaTransport fakeTransport = new MediaTransport(MediaHttpDownloader.MAXIMUM_CHUNK_SIZE);
+    fakeTransport.bytesDownloaded = 512;
+    fakeTransport.lastBytePos = 1024;
+
+    MediaHttpDownloader downloader = new MediaHttpDownloader(fakeTransport, null);
+    downloader.setContentRange(512, 1024);
+
+    ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+    downloader.download(new GenericUrl(TEST_REQUEST_URL), outputStream);
+    assertEquals(1024, downloader.getLastBytePosition());
+    assertEquals(512, outputStream.size());
+
+    // There should be 1 download call made.
+    assertEquals(1, fakeTransport.lowLevelExecCalls);
+  }
+
   public void testSetContentRangeWithDirectDownload() throws Exception {
     int contentLength = MediaHttpDownloader.MAXIMUM_CHUNK_SIZE;
     MediaTransport fakeTransport = new MediaTransport(contentLength);
@@ -378,8 +441,9 @@ public void testDirectDownloadServerErrorWithBackOffEnabled() throws Exception {
     MediaTransport fakeTransport = new MediaTransport(contentLength);
     fakeTransport.directDownloadEnabled = true;
     fakeTransport.testServerError = true;
-    MediaHttpDownloader downloader = new MediaHttpDownloader(
-        fakeTransport, new MediaHttpUploaderTest.ZeroBackOffRequestInitializer());
+    MediaHttpDownloader downloader =
+        new MediaHttpDownloader(
+            fakeTransport, new MediaHttpUploaderTest.ZeroBackOffRequestInitializer());
     downloader.download(new GenericUrl(TEST_REQUEST_URL), outputStream);
 
     // should be 2 calls made: 1 download request w/server error and 1 successful download request
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpUploaderTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpUploaderTest.java
index 134685283..c27323101 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpUploaderTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/media/MediaHttpUploaderTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 Google Inc.
+ * Copyright 2011 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
@@ -39,6 +39,8 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.io.PipedInputStream;
+import java.io.PipedOutputStream;
 import java.util.Arrays;
 import java.util.Random;
 import java.util.logging.Level;
@@ -83,8 +85,7 @@ public MockHttpContent() {
       super("mock/type");
     }
 
-    public void writeTo(OutputStream out) {
-    }
+    public void writeTo(OutputStream out) {}
   }
 
   static class MediaTransport extends MockHttpTransport {
@@ -124,8 +125,8 @@ static class MediaTransport extends MockHttpTransport {
     @Override
     public boolean supportsMethod(String method) throws IOException {
       return method.equals(HttpMethods.POST)
-        || method.equals(HttpMethods.PUT)
-        || method.equals(HttpMethods.GET);
+          || method.equals(HttpMethods.PUT)
+          || method.equals(HttpMethods.GET);
     }
 
     @Override
@@ -142,13 +143,14 @@ public LowLevelHttpRequest buildRequest(final String name, String url) {
         }
 
         return new MockLowLevelHttpRequest() {
-            @Override
+          @Override
           public LowLevelHttpResponse execute() {
             lowLevelExecCalls++;
             if (!directUploadEnabled) {
               // Assert that the required headers are set.
               if (!contentLengthNotSpecified) {
-                assertEquals(Integer.toString(contentLength),
+                assertEquals(
+                    Integer.toString(contentLength),
                     getFirstHeaderValue("x-upload-content-length"));
               }
               assertEquals(TEST_CONTENT_TYPE, getFirstHeaderValue("x-upload-content-type"));
@@ -182,7 +184,7 @@ public LowLevelHttpResponse execute() {
       assertEquals(TEST_UPLOAD_URL, url);
       assertEquals("PUT", name);
       return new MockLowLevelHttpRequest() {
-          @Override
+        @Override
         public LowLevelHttpResponse execute() throws IOException {
           lowLevelExecCalls++;
           MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
@@ -285,7 +287,11 @@ void copyBytesToBytesReceivedArray(int length) throws IOException {
           ByteArrayOutputStream stream = new ByteArrayOutputStream();
           this.getStreamingContent().writeTo(stream);
           byte[] currentRequest = stream.toByteArray();
-          System.arraycopy(currentRequest, 0, bytesReceived, bytesUploaded,
+          System.arraycopy(
+              currentRequest,
+              0,
+              bytesReceived,
+              bytesUploaded,
               length == -1 ? currentRequest.length : length);
         }
       };
@@ -293,14 +299,12 @@ void copyBytesToBytesReceivedArray(int length) throws IOException {
   }
 
   private static class ResumableProgressListenerWithTwoUploadCalls
-      implements
-        MediaHttpUploaderProgressListener {
+      implements MediaHttpUploaderProgressListener {
 
     int progressListenerCalls;
     boolean contentLengthNotSpecified;
 
-    public ResumableProgressListenerWithTwoUploadCalls() {
-    }
+    public ResumableProgressListenerWithTwoUploadCalls() {}
 
     public void progressChanged(MediaHttpUploader uploader) throws IOException {
       progressListenerCalls++;
@@ -353,8 +357,7 @@ private static class DirectProgressListener implements MediaHttpUploaderProgress
     int progressListenerCalls;
     boolean contentLengthNotSpecified;
 
-    public DirectProgressListener() {
-    }
+    public DirectProgressListener() {}
 
     public void progressChanged(MediaHttpUploader uploader) throws IOException {
       progressListenerCalls++;
@@ -416,7 +419,8 @@ public GZipCheckerInterceptor(boolean gzipDisabled) {
     }
 
     public void intercept(HttpRequest request) {
-      assertEquals(!gzipDisabled && !(request.getContent() instanceof EmptyContent),
+      assertEquals(
+          !gzipDisabled && !(request.getContent() instanceof EmptyContent),
           request.getEncoding() != null);
     }
   }
@@ -593,12 +597,13 @@ public void testUploadMultipleCalls_WithNoContentSizeProvidedChunkedInput() thro
     int contentLength = MediaHttpUploader.DEFAULT_CHUNK_SIZE * 5;
     MediaTransport fakeTransport = new MediaTransport(contentLength);
     fakeTransport.contentLengthNotSpecified = true;
-    InputStream is = new ByteArrayInputStream(new byte[contentLength]) {
-        @Override
-      public synchronized int read(byte[] b, int off, int len) {
-        return super.read(b, off, Math.min(len, MediaHttpUploader.DEFAULT_CHUNK_SIZE / 10));
-      }
-    };
+    InputStream is =
+        new ByteArrayInputStream(new byte[contentLength]) {
+          @Override
+          public synchronized int read(byte[] b, int off, int len) {
+            return super.read(b, off, Math.min(len, MediaHttpUploader.DEFAULT_CHUNK_SIZE / 10));
+          }
+        };
     InputStreamContent mediaContent = new InputStreamContent(TEST_CONTENT_TYPE, is);
     MediaHttpUploader uploader = new MediaHttpUploader(mediaContent, fakeTransport, null);
     uploader.upload(new GenericUrl(TEST_RESUMABLE_REQUEST_URL));
@@ -673,70 +678,160 @@ public void testUpload_ResumableServerError_WithoutUnsuccessfulHandler() throws
   private void subtestUpload_ResumableWithError(ErrorType error) throws Exception {
     // no bytes were uploaded on the 2nd chunk. Client sends the following 3 media chunks:
     // 0-[DEFAULT-1], DEFAULT-[2*DEFAULT-1], DEFAULT-[2*DEFAULT-1]
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2, false,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE - 1, 3, false);
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2, true,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE - 1, 3, false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2,
+        false,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE - 1,
+        3,
+        false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2,
+        true,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE - 1,
+        3,
+        false);
 
     // no bytes were uploaded on the 2nd chunk. Client sends the following 4 media chunks:
     // 0-[DEFAULT-1], DEFAULT-[2*DEFAULT-1], DEFAULT-[2*DEFAULT-1], 2*DEFAULT-[3*DEFAULT-1]
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 3, false,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE - 1, 4, false);
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 3, true,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE - 1, 4, false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 3,
+        false,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE - 1,
+        4,
+        false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 3,
+        true,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE - 1,
+        4,
+        false);
 
     // all bytes were uploaded in the 2nd chunk, and the server sends a 200 on the client's resume.
     // Client sends the following 2 media chunks:
     //    0-[DEFAULT-1], DEFAULT-[2*DEFAULT-1]
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2, false,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 - 1, 2, false);
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2, true,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 - 1, 2, false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2,
+        false,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 - 1,
+        2,
+        false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2,
+        true,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 - 1,
+        2,
+        false);
 
     // all bytes were uploaded in the 2nd chunk, and we force the server to send a 308 on the
     // client's Range query of '*/<LENGTH>' instead of sending a 200 as in previous.
     // Client sends the following 3 media chunks:
     //    0-[DEFAULT-1], DEFAULT-[2*DEFAULT-1], empty (as */[2*DEFAULT])
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2, false,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 - 1, 3, true /* force 308 */);
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2, true,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 - 1, 3, true /* force 308 */);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2,
+        false,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 - 1,
+        3,
+        true /* force 308 */);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2,
+        true,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 - 1,
+        3,
+        true /* force 308 */);
 
     // all bytes were uploaded in the 2nd chunk. Client sends the following 3 media chunks:
     // 0-[DEFAULT-1], DEFAULT-[2*DEFAULT-1], 2*DEFAULT-[3*DEFAULT-1]
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 3, false,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 - 1, 3, false);
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 3, true,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 - 1, 3, false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 3,
+        false,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 - 1,
+        3,
+        false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 3,
+        true,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 - 1,
+        3,
+        false);
 
     // part of the bytes were uploaded in the 2nd chunk. Client sends the following 3 media chunks:
     // 0-[DEFAULT-1], DEFAULT-[2*DEFAULT-1], DEFAULT*4/3-[2*DEFAULT-1]
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2, false,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 4 / 3, 3, false);
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2, true,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 4 / 3, 3, false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2,
+        false,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 4 / 3,
+        3,
+        false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2,
+        true,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 4 / 3,
+        3,
+        false);
 
     // part of the bytes were uploaded in the 2nd chunk. Client sends the following 3 media chunks:
     // 0-[DEFAULT-1], DEFAULT-[2*DEFAULT-1], DEFAULT+5/[2*DEFAULT+2]
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 + 3, false,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE + 4, 3, false);
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 + 3, true,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE + 4, 3, false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 + 3,
+        false,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE + 4,
+        3,
+        false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2 + 3,
+        true,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE + 4,
+        3,
+        false);
 
     // only 1 byte were uploaded in the 2nd chunk. Client sends the following 3 media chunks:
     // 0-[DEFAULT-1], DEFAULT-[2*DEFAULT-1], [DEFAULT+1]-[2*DEFAULT-1]
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2, false,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE, 3, false);
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2, true,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE, 3, false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2,
+        false,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE,
+        3,
+        false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 2,
+        true,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE,
+        3,
+        false);
 
     // only 1 byte were uploaded in the 2nd chunk. Client sends the following 5 media chunks:
     // 0-[DEFAULT-1], DEFAULT-[2*DEFAULT-1], [DEFAULT+1]-[2*DEFAULT], [2*DEFAULT+1]-[3*DEFAULT],
     // [3*DEFAULT+1]-[3*DEFAULT+1]
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 3 + 2, false,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE, 5, false);
-    subtestUpload_ResumableWithError(error, MediaHttpUploader.DEFAULT_CHUNK_SIZE * 3 + 2, true,
-        MediaHttpUploader.DEFAULT_CHUNK_SIZE, 5, false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 3 + 2,
+        false,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE,
+        5,
+        false);
+    subtestUpload_ResumableWithError(
+        error,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE * 3 + 2,
+        true,
+        MediaHttpUploader.DEFAULT_CHUNK_SIZE,
+        5,
+        false);
   }
 
   /**
@@ -744,12 +839,18 @@ private void subtestUpload_ResumableWithError(ErrorType error) throws Exception
    * when uploading media to the server.
    */
   enum ErrorType {
-    IO_EXCEPTION, SERVER_UNAVAILABLE
+    IO_EXCEPTION,
+    SERVER_UNAVAILABLE
   }
 
-  public void subtestUpload_ResumableWithError(ErrorType error, int contentLength,
-      boolean contentLengthKnown, int maxByteIndexUploadedOnError, int chunks,
-      boolean force308OnRangeQueryResponse) throws Exception {
+  public void subtestUpload_ResumableWithError(
+      ErrorType error,
+      int contentLength,
+      boolean contentLengthKnown,
+      int maxByteIndexUploadedOnError,
+      int chunks,
+      boolean force308OnRangeQueryResponse)
+      throws Exception {
     MediaTransport fakeTransport = new MediaTransport(contentLength, true);
     if (error == ErrorType.IO_EXCEPTION) {
       fakeTransport.testIOException = true;
@@ -761,7 +862,7 @@ public void subtestUpload_ResumableWithError(ErrorType error, int contentLength,
     fakeTransport.force308OnRangeQueryResponse = force308OnRangeQueryResponse;
     byte[] testedData = new byte[contentLength];
     new Random().nextBytes(testedData);
-    InputStream is = new ByteArrayInputStream(testedData);
+    TestingInputStream is = new TestingInputStream(testedData);
     InputStreamContent mediaContent = new InputStreamContent(TEST_CONTENT_TYPE, is);
     if (contentLengthKnown) {
       mediaContent.setLength(contentLength);
@@ -780,6 +881,7 @@ public void subtestUpload_ResumableWithError(ErrorType error, int contentLength,
     assertEquals(calls, fakeTransport.lowLevelExecCalls);
 
     assertTrue(Arrays.equals(testedData, fakeTransport.bytesReceived));
+    assertTrue(is.isClosed);
   }
 
   public void testUploadIOException_WithoutIOExceptionHandler() throws Exception {
@@ -1097,10 +1199,151 @@ public void testResumableMediaUploadWithoutContentClose() throws Exception {
     MediaTransport fakeTransport = new MediaTransport(contentLength);
     TestableByteArrayInputStream inputStream =
         new TestableByteArrayInputStream(new byte[contentLength]);
-    InputStreamContent mediaContent = new InputStreamContent(
-        TEST_CONTENT_TYPE, inputStream).setLength(contentLength).setCloseInputStream(false);
+    InputStreamContent mediaContent =
+        new InputStreamContent(TEST_CONTENT_TYPE, inputStream)
+            .setLength(contentLength)
+            .setCloseInputStream(false);
     MediaHttpUploader uploader = new MediaHttpUploader(mediaContent, fakeTransport, null);
     uploader.upload(new GenericUrl(TEST_RESUMABLE_REQUEST_URL));
     assertFalse(inputStream.isClosed());
   }
+
+  class SlowWriter implements Runnable {
+    private final OutputStream outputStream;
+    private final int contentLength;
+
+    SlowWriter(OutputStream outputStream, int contentLength) {
+      this.outputStream = outputStream;
+      this.contentLength = contentLength;
+    }
+
+    @Override
+    public void run() {
+      try {
+        for (int i = 0; i < contentLength; i++) {
+          outputStream.write(i);
+          Thread.sleep(1000);
+        }
+        outputStream.close();
+      } catch (IOException e) {
+        // ignore
+      } catch (InterruptedException e) {
+        // ignore
+      }
+    }
+  }
+
+  class TimeoutRequestInitializer implements HttpRequestInitializer {
+    class TimingInterceptor implements HttpExecuteInterceptor {
+      private long initTime;
+
+      TimingInterceptor() {
+        initTime = System.currentTimeMillis();
+      }
+
+      @Override
+      public void intercept(HttpRequest request) {
+        assertTrue(
+            "Request initialization to execute should be fast",
+            System.currentTimeMillis() - initTime < 100L);
+      }
+    }
+
+    @Override
+    public void initialize(HttpRequest request) {
+      request.setInterceptor(new TimingInterceptor());
+    }
+  }
+
+  public void testResumableSlowUpload() throws Exception {
+    int contentLength = 3;
+    MediaTransport fakeTransport = new MediaTransport(contentLength);
+    fakeTransport.contentLengthNotSpecified = true;
+    PipedOutputStream outputStream = new PipedOutputStream();
+    InputStream inputStream = new PipedInputStream(outputStream);
+
+    Thread thread = new Thread(new SlowWriter(outputStream, contentLength));
+    thread.start();
+
+    InputStreamContent mediaContent = new InputStreamContent(TEST_CONTENT_TYPE, inputStream);
+    MediaHttpUploader uploader =
+        new MediaHttpUploader(mediaContent, fakeTransport, new TimeoutRequestInitializer());
+    uploader.setDirectUploadEnabled(false);
+    uploader.upload(new GenericUrl(TEST_RESUMABLE_REQUEST_URL));
+  }
+
+  static class ResumableErrorMediaTransport extends MockHttpTransport {
+
+    ResumableErrorMediaTransport() {}
+
+    @Override
+    public boolean supportsMethod(String method) throws IOException {
+      return true;
+    }
+
+    @Override
+    public LowLevelHttpRequest buildRequest(final String method, String url) {
+      // First request should be to the resumable request url
+      if (method.equals("POST")) {
+        assertEquals(TEST_RESUMABLE_REQUEST_URL, url);
+
+        return new MockLowLevelHttpRequest() {
+          @Override
+          public LowLevelHttpResponse execute() {
+            assertEquals(TEST_CONTENT_TYPE, getFirstHeaderValue("x-upload-content-type"));
+
+            // This is the initiation call.
+            MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
+            // Return 200 with the upload URI.
+            response.setStatusCode(200);
+            response.addHeader("Location", TEST_UPLOAD_URL);
+            return response;
+          }
+        };
+      }
+
+      // Fake an error when uploading chunks
+      return new MockLowLevelHttpRequest() {
+        @Override
+        public LowLevelHttpResponse execute() throws IOException {
+          MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
+          response.setStatusCode(500);
+          return response;
+        }
+      };
+    }
+  }
+
+  class TestingInputStream extends ByteArrayInputStream {
+    boolean isClosed;
+
+    TestingInputStream(byte[] testData) {
+      super(testData);
+    }
+
+    @Override
+    public void close() throws IOException {
+      isClosed = true;
+      super.close();
+    }
+  }
+
+  public void testResumable_BadResponse() throws IOException {
+    int contentLength = 3;
+    ResumableErrorMediaTransport fakeTransport = new ResumableErrorMediaTransport();
+    byte[] testedData = new byte[contentLength];
+    new Random().nextBytes(testedData);
+    TestingInputStream is = new TestingInputStream(testedData);
+    InputStreamContent mediaContent = new InputStreamContent(TEST_CONTENT_TYPE, is);
+    mediaContent.setLength(contentLength);
+    MediaHttpUploader uploader =
+        new MediaHttpUploader(mediaContent, fakeTransport, new ZeroBackOffRequestInitializer());
+
+    // disable GZip - so we would be able to test byte received by server.
+    uploader.setDisableGZipContent(true);
+    HttpResponse response = uploader.upload(new GenericUrl(TEST_RESUMABLE_REQUEST_URL));
+    assertEquals(500, response.getStatusCode());
+
+    assertTrue("input stream should be closed", is.isClosed);
+  }
 }
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/mtls/MtlsTransportBaseTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/mtls/MtlsTransportBaseTest.java
new file mode 100644
index 000000000..096ff4abf
--- /dev/null
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/mtls/MtlsTransportBaseTest.java
@@ -0,0 +1,117 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.api.client.googleapis.mtls;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.util.SecurityUtils;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import org.junit.Test;
+
+public abstract class MtlsTransportBaseTest {
+  protected KeyStore createTestMtlsKeyStore() throws IOException, GeneralSecurityException {
+    InputStream certAndKey =
+        getClass()
+            .getClassLoader()
+            .getResourceAsStream("com/google/api/client/googleapis/util/mtlsCertAndKey.pem");
+    return SecurityUtils.createMtlsKeyStore(certAndKey);
+  }
+
+  protected static class TestMtlsProvider implements MtlsProvider {
+    private boolean useClientCertificate;
+    private KeyStore keyStore;
+    private String keyStorePassword;
+    private boolean throwExceptionForGetKeyStore;
+
+    public TestMtlsProvider(
+        boolean useClientCertificate,
+        KeyStore keystore,
+        String keyStorePassword,
+        boolean throwExceptionForGetKeyStore) {
+      this.useClientCertificate = useClientCertificate;
+      this.keyStore = keystore;
+      this.keyStorePassword = keyStorePassword;
+      this.throwExceptionForGetKeyStore = throwExceptionForGetKeyStore;
+    }
+
+    @Override
+    public boolean useMtlsClientCertificate() {
+      return useClientCertificate;
+    }
+
+    @Override
+    public String getKeyStorePassword() {
+      return keyStorePassword;
+    }
+
+    @Override
+    public KeyStore getKeyStore() throws IOException, GeneralSecurityException {
+      if (throwExceptionForGetKeyStore) {
+        throw new IOException("getKeyStore throws exception");
+      }
+      return keyStore;
+    }
+  }
+
+  protected abstract HttpTransport buildTrustedTransport(MtlsProvider mtlsProvider)
+      throws IOException, GeneralSecurityException;
+
+  // If client certificate shouldn't be used, then neither the provided mtlsKeyStore
+  // nor the default mtls key store should be used.
+  @Test
+  public void testNotUseCertificate() throws IOException, GeneralSecurityException {
+    MtlsProvider mtlsProvider = new TestMtlsProvider(false, createTestMtlsKeyStore(), "", false);
+    HttpTransport transport = buildTrustedTransport(mtlsProvider);
+    assertFalse(transport.isMtls());
+  }
+
+  // If client certificate should be used, and mtlsKeyStore is provided, then the
+  // provided key store should be used.
+  @Test
+  public void testUseProvidedCertificate() throws IOException, GeneralSecurityException {
+    MtlsProvider mtlsProvider = new TestMtlsProvider(true, createTestMtlsKeyStore(), "", false);
+    HttpTransport transport = buildTrustedTransport(mtlsProvider);
+    assertTrue(transport.isMtls());
+  }
+
+  // If client certificate should be used, but no mtls key store is available, then
+  // the transport created is not mtls.
+  @Test
+  public void testNoCertificate() throws IOException, GeneralSecurityException {
+    MtlsProvider mtlsProvider = new TestMtlsProvider(true, null, "", false);
+    HttpTransport transport = buildTrustedTransport(mtlsProvider);
+    assertFalse(transport.isMtls());
+  }
+
+  // Test the case where mtlsProvider.getKeyStore() throws.
+  @Test
+  public void testGetKeyStoreThrows() throws GeneralSecurityException {
+    MtlsProvider mtlsProvider = new TestMtlsProvider(true, null, "", true);
+    try {
+      buildTrustedTransport(mtlsProvider);
+      fail("should throw and exception");
+    } catch (IOException e) {
+      assertTrue(
+          "expected to fail with exception",
+          e.getMessage().contains("getKeyStore throws exception"));
+    }
+  }
+}
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/mtls/MtlsUtilsTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/mtls/MtlsUtilsTest.java
new file mode 100644
index 000000000..f3a78a253
--- /dev/null
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/mtls/MtlsUtilsTest.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright 2020 Google LLC
+ *
+ * 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
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+
+package com.google.api.client.googleapis.mtls;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.util.List;
+import org.junit.Test;
+
+public class MtlsUtilsTest {
+  static class TestEnvironmentProvider
+      implements MtlsUtils.DefaultMtlsProvider.EnvironmentProvider {
+    private final String value;
+
+    TestEnvironmentProvider(String value) {
+      this.value = value;
+    }
+
+    @Override
+    public String getenv(String name) {
+      return value;
+    }
+  }
+
+  @Test
+  public void testUseMtlsClientCertificateEmpty() {
+    MtlsProvider mtlsProvider =
+        new MtlsUtils.DefaultMtlsProvider(new TestEnvironmentProvider(""), "/path/to/missing/file");
+    assertFalse(mtlsProvider.useMtlsClientCertificate());
+  }
+
+  @Test
+  public void testUseMtlsClientCertificateNull() {
+    MtlsProvider mtlsProvider =
+        new MtlsUtils.DefaultMtlsProvider(
+            new TestEnvironmentProvider(null), "/path/to/missing/file");
+    assertFalse(mtlsProvider.useMtlsClientCertificate());
+  }
+
+  @Test
+  public void testUseMtlsClientCertificateTrue() {
+    MtlsProvider mtlsProvider =
+        new MtlsUtils.DefaultMtlsProvider(
+            new TestEnvironmentProvider("true"), "/path/to/missing/file");
+    assertTrue(mtlsProvider.useMtlsClientCertificate());
+  }
+
+  @Test
+  public void testLoadDefaultKeyStoreMissingFile()
+      throws InterruptedException, GeneralSecurityException, IOException {
+    MtlsProvider mtlsProvider =
+        new MtlsUtils.DefaultMtlsProvider(
+            new TestEnvironmentProvider("true"), "/path/to/missing/file");
+    KeyStore keyStore = mtlsProvider.getKeyStore();
+    assertNull(keyStore);
+  }
+
+  @Test
+  public void testLoadDefaultKeyStore()
+      throws InterruptedException, GeneralSecurityException, IOException {
+    MtlsProvider mtlsProvider =
+        new MtlsUtils.DefaultMtlsProvider(
+            new TestEnvironmentProvider("true"),
+            "src/test/resources/com/google/api/client/googleapis/util/mtls_context_aware_metadata.json");
+    KeyStore keyStore = mtlsProvider.getKeyStore();
+    assertNotNull(keyStore);
+  }
+
+  @Test
+  public void testLoadDefaultKeyStoreBadCertificate()
+      throws InterruptedException, GeneralSecurityException, IOException {
+    MtlsProvider mtlsProvider =
+        new MtlsUtils.DefaultMtlsProvider(
+            new TestEnvironmentProvider("true"),
+            "src/test/resources/com/google/api/client/googleapis/util/mtls_context_aware_metadata_bad_command.json");
+    try {
+      mtlsProvider.getKeyStore();
+      fail("should throw and exception");
+    } catch (IllegalArgumentException e) {
+      assertTrue(
+          "expected to fail with certificate is missing",
+          e.getMessage().contains("certificate is missing"));
+    }
+  }
+
+  @Test
+  public void testExtractCertificateProviderCommand() throws IOException {
+    InputStream inputStream =
+        this.getClass()
+            .getClassLoader()
+            .getResourceAsStream(
+                "com/google/api/client/googleapis/util/mtls_context_aware_metadata.json");
+    List<String> command =
+        MtlsUtils.DefaultMtlsProvider.extractCertificateProviderCommand(inputStream);
+    assertEquals(2, command.size());
+    assertEquals("cat", command.get(0));
+    assertEquals(
+        "src/test/resources/com/google/api/client/googleapis/util/mtlsCertAndKey.pem",
+        command.get(1));
+  }
+
+  static class TestCertProviderCommandProcess extends Process {
+    private boolean runForever;
+    private int exitValue;
+
+    public TestCertProviderCommandProcess(int exitValue, boolean runForever) {
+      this.runForever = runForever;
+      this.exitValue = exitValue;
+    }
+
+    @Override
+    public OutputStream getOutputStream() {
+      return null;
+    }
+
+    @Override
+    public InputStream getInputStream() {
+      return null;
+    }
+
+    @Override
+    public InputStream getErrorStream() {
+      return null;
+    }
+
+    @Override
+    public int waitFor() throws InterruptedException {
+      return 0;
+    }
+
+    @Override
+    public int exitValue() {
+      if (runForever) {
+        throw new IllegalThreadStateException();
+      }
+      return exitValue;
+    }
+
+    @Override
+    public void destroy() {}
+  }
+
+  @Test
+  public void testRunCertificateProviderCommandSuccess() throws IOException, InterruptedException {
+    Process certCommandProcess = new TestCertProviderCommandProcess(0, false);
+    int exitValue =
+        MtlsUtils.DefaultMtlsProvider.runCertificateProviderCommand(certCommandProcess, 100);
+    assertEquals(0, exitValue);
+  }
+
+  @Test
+  public void testRunCertificateProviderCommandTimeout() throws InterruptedException {
+    Process certCommandProcess = new TestCertProviderCommandProcess(0, true);
+    try {
+      MtlsUtils.DefaultMtlsProvider.runCertificateProviderCommand(certCommandProcess, 100);
+      fail("should throw and exception");
+    } catch (IOException e) {
+      assertTrue(
+          "expected to fail with timeout",
+          e.getMessage().contains("cert provider command timed out"));
+    }
+  }
+}
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java
index c7599a1b8..734e3900b 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientRequestTest.java
@@ -12,6 +12,8 @@
 
 package com.google.api.client.googleapis.services;
 
+import com.google.api.client.googleapis.GoogleUtils;
+import com.google.api.client.googleapis.services.AbstractGoogleClientRequest.ApiClientVersion;
 import com.google.api.client.googleapis.testing.services.MockGoogleClient;
 import com.google.api.client.googleapis.testing.services.MockGoogleClientRequest;
 import com.google.api.client.http.EmptyContent;
@@ -25,12 +27,14 @@
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
-import com.google.api.client.util.StringUtils;
+import com.google.common.io.BaseEncoding;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.Arrays;
 import junit.framework.TestCase;
 
@@ -44,65 +48,91 @@ public class AbstractGoogleClientRequestTest extends TestCase {
   private static final String ROOT_URL = "https://www.googleapis.com/test/";
   private static final String SERVICE_PATH = "path/v1/";
   private static final String URI_TEMPLATE = "tests/{testId}";
-  private static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  private static final JsonFactory JSON_FACTORY = new GsonFactory();
   private static final JsonObjectParser JSON_OBJECT_PARSER = new JsonObjectParser(JSON_FACTORY);
   private static final String ERROR_CONTENT =
       "{\"error\":{\"code\":401,\"errors\":[{\"domain\":\"global\","
-      + "\"location\":\"Authorization\",\"locationType\":\"header\","
-      + "\"message\":\"me\",\"reason\":\"authError\"}],\"message\":\"me\"}}";
+          + "\"location\":\"Authorization\",\"locationType\":\"header\","
+          + "\"message\":\"me\",\"reason\":\"authError\"}],\"message\":\"me\"}}";
+  private String originalOsName;
+  private String originalOsVersion;
+
+  @Override
+  protected void setUp() throws Exception {
+    super.setUp();
+
+    // save the original system properties so we can mock them out
+    this.originalOsName = System.getProperty("os.name");
+    this.originalOsVersion = System.getProperty("os.version");
+  }
+
+  @Override
+  protected void tearDown() throws Exception {
+    // restore the original system properties
+    System.setProperty("os.name", originalOsName);
+    System.setProperty("os.version", originalOsVersion);
+
+    super.tearDown();
+  }
 
   public void testExecuteUnparsed_error() throws Exception {
-    HttpTransport transport = new MockHttpTransport() {
-      @Override
-      public LowLevelHttpRequest buildRequest(final String method, final String url) {
-        return new MockLowLevelHttpRequest() {
+    HttpTransport transport =
+        new MockHttpTransport() {
           @Override
-          public LowLevelHttpResponse execute() {
-            assertEquals("GET", method);
-            assertEquals("https://www.googleapis.com/test/path/v1/tests/foo", url);
-            MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
-            result.setStatusCode(HttpStatusCodes.STATUS_CODE_UNAUTHORIZED);
-            result.setContentType(Json.MEDIA_TYPE);
-            result.setContent(ERROR_CONTENT);
-            return result;
+          public LowLevelHttpRequest buildRequest(final String method, final String url) {
+            return new MockLowLevelHttpRequest() {
+              @Override
+              public LowLevelHttpResponse execute() {
+                assertEquals("GET", method);
+                assertEquals("https://www.googleapis.com/test/path/v1/tests/foo", url);
+                MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+                result.setStatusCode(HttpStatusCodes.STATUS_CODE_UNAUTHORIZED);
+                result.setContentType(Json.MEDIA_TYPE);
+                result.setContent(ERROR_CONTENT);
+                return result;
+              }
+            };
           }
         };
-      }
-    };
-    MockGoogleClient client = new MockGoogleClient.Builder(
-        transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null).setApplicationName(
-        "Test Application").build();
-    MockGoogleClientRequest<String> request = new MockGoogleClientRequest<String>(
-        client, HttpMethods.GET, URI_TEMPLATE, null, String.class);
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null)
+            .setApplicationName("Test Application")
+            .build();
+    MockGoogleClientRequest<String> request =
+        new MockGoogleClientRequest<String>(
+            client, HttpMethods.GET, URI_TEMPLATE, null, String.class);
     try {
       request.put("testId", "foo");
       request.executeUnparsed();
       fail("expected " + HttpResponseException.class);
     } catch (HttpResponseException e) {
       // expected
-      assertEquals("401" + StringUtils.LINE_SEPARATOR + ERROR_CONTENT, e.getMessage());
+      assertTrue(e.getMessage().startsWith("401"));
     }
   }
 
   public void testExecuteUsingHead() throws Exception {
-    HttpTransport transport = new MockHttpTransport() {
-      @Override
-      public LowLevelHttpRequest buildRequest(final String method, final String url) {
-        return new MockLowLevelHttpRequest() {
+    HttpTransport transport =
+        new MockHttpTransport() {
           @Override
-          public LowLevelHttpResponse execute() {
-            assertEquals("HEAD", method);
-            assertEquals("https://www.googleapis.com/test/path/v1/tests/foo", url);
-            return new MockLowLevelHttpResponse();
+          public LowLevelHttpRequest buildRequest(final String method, final String url) {
+            return new MockLowLevelHttpRequest() {
+              @Override
+              public LowLevelHttpResponse execute() {
+                assertEquals("HEAD", method);
+                assertEquals("https://www.googleapis.com/test/path/v1/tests/foo", url);
+                return new MockLowLevelHttpResponse();
+              }
+            };
           }
         };
-      }
-    };
-    MockGoogleClient client = new MockGoogleClient.Builder(
-        transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null).setApplicationName(
-        "Test Application").build();
-    MockGoogleClientRequest<String> request = new MockGoogleClientRequest<String>(
-        client, HttpMethods.GET, URI_TEMPLATE, null, String.class);
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null)
+            .setApplicationName("Test Application")
+            .build();
+    MockGoogleClientRequest<String> request =
+        new MockGoogleClientRequest<String>(
+            client, HttpMethods.GET, URI_TEMPLATE, null, String.class);
     request.put("testId", "foo");
     request.executeUsingHead();
   }
@@ -119,9 +149,10 @@ public void testBuildHttpRequest_emptyContent() throws Exception {
   private void subtestBuildHttpRequest_emptyContent(String method, boolean expectEmptyContent)
       throws Exception {
     HttpTransport transport = new MockHttpTransport();
-    MockGoogleClient client = new MockGoogleClient.Builder(
-        transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null).setApplicationName(
-        "Test Application").build();
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null)
+            .setApplicationName("Test Application")
+            .build();
     MockGoogleClientRequest<String> request =
         new MockGoogleClientRequest<String>(client, method, URI_TEMPLATE, null, String.class);
     HttpRequest httpRequest = request.buildHttpRequest();
@@ -134,11 +165,13 @@ private void subtestBuildHttpRequest_emptyContent(String method, boolean expectE
 
   public void testCheckRequiredParameter() throws Exception {
     HttpTransport transport = new MockHttpTransport();
-    MockGoogleClient client = new MockGoogleClient.Builder(
-        transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null).setApplicationName(
-        "Test Application").build();
-    MockGoogleClientRequest<String> request = new MockGoogleClientRequest<String>(
-        client, HttpMethods.GET, URI_TEMPLATE, null, String.class);
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null)
+            .setApplicationName("Test Application")
+            .build();
+    MockGoogleClientRequest<String> request =
+        new MockGoogleClientRequest<String>(
+            client, HttpMethods.GET, URI_TEMPLATE, null, String.class);
 
     // Should not throw an Exception.
     request.checkRequiredParameter("Not Null", "notNull()");
@@ -152,21 +185,24 @@ public void testCheckRequiredParameter() throws Exception {
   }
 
   public void testExecute_void() throws Exception {
-    HttpTransport transport = new MockHttpTransport() {
-      @Override
-      public LowLevelHttpRequest buildRequest(final String method, final String url) {
-        return new MockLowLevelHttpRequest() {
+    HttpTransport transport =
+        new MockHttpTransport() {
           @Override
-          public LowLevelHttpResponse execute() {
-            return new MockLowLevelHttpResponse().setContent("{\"a\":\"ignored\"}")
-                .setContentType(Json.MEDIA_TYPE);
+          public LowLevelHttpRequest buildRequest(final String method, final String url) {
+            return new MockLowLevelHttpRequest() {
+              @Override
+              public LowLevelHttpResponse execute() {
+                return new MockLowLevelHttpResponse()
+                    .setContent("{\"a\":\"ignored\"}")
+                    .setContentType(Json.MEDIA_TYPE);
+              }
+            };
           }
         };
-      }
-    };
-    MockGoogleClient client = new MockGoogleClient.Builder(
-        transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null).setApplicationName(
-        "Test Application").build();
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null)
+            .setApplicationName("Test Application")
+            .build();
     MockGoogleClientRequest<Void> request =
         new MockGoogleClientRequest<Void>(client, HttpMethods.GET, URI_TEMPLATE, null, Void.class);
     Void v = request.execute();
@@ -175,29 +211,165 @@ public LowLevelHttpResponse execute() {
 
   public void testUserAgentSuffix() throws Exception {
     AssertUserAgentTransport transport = new AssertUserAgentTransport();
-
     // Specify an Application Name.
     String applicationName = "Test Application";
-    transport.expectedUserAgent = applicationName + " "
-        + AbstractGoogleClientRequest.USER_AGENT_SUFFIX + " "
-        + HttpRequest.USER_AGENT_SUFFIX;
-    MockGoogleClient client = new MockGoogleClient.Builder(
-        transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null).setApplicationName(
-            applicationName).build();
+    transport.expectedUserAgent =
+        applicationName
+            + " "
+            + "Google-API-Java-Client/"
+            + GoogleUtils.VERSION
+            + " "
+            + HttpRequest.USER_AGENT_SUFFIX;
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null)
+            .setApplicationName(applicationName)
+            .build();
     MockGoogleClientRequest<Void> request =
         new MockGoogleClientRequest<Void>(client, HttpMethods.GET, URI_TEMPLATE, null, Void.class);
     request.executeUnparsed();
+  }
 
+  public void testUserAgent() throws IOException {
+    AssertUserAgentTransport transport = new AssertUserAgentTransport();
+    transport.expectedUserAgent =
+        "Google-API-Java-Client/" + GoogleUtils.VERSION + " " + HttpRequest.USER_AGENT_SUFFIX;
     // Don't specify an Application Name.
-    transport.expectedUserAgent = AbstractGoogleClientRequest.USER_AGENT_SUFFIX + " "
-        + HttpRequest.USER_AGENT_SUFFIX;
-    client = new MockGoogleClient.Builder(
-        transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null).build();
-    request =
-        new MockGoogleClientRequest<Void>(client, HttpMethods.GET, URI_TEMPLATE, null, Void.class);
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null)
+            .build();
+    MockGoogleClientRequest<Void> request =
+        new MockGoogleClientRequest<>(client, HttpMethods.GET, URI_TEMPLATE, null, Void.class);
+    request.executeUnparsed();
+  }
+
+  public void testSetsApiClientHeader() throws IOException {
+    HttpTransport transport =
+        new AssertHeaderTransport("X-Goog-Api-Client", "gl-java/\\d+\\.\\d+\\.\\d+.*");
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null)
+            .build();
+    MockGoogleClientRequest<Void> request =
+        new MockGoogleClientRequest<>(client, HttpMethods.GET, URI_TEMPLATE, null, Void.class);
+    request.executeUnparsed();
+  }
+
+  public void testSetsApiClientHeaderWithOsVersion() {
+    System.setProperty("os.name", "My OS");
+    System.setProperty("os.version", "1.2.3");
+
+    String version = new ApiClientVersion().toString();
+    assertTrue("Api version should contain the os version", version.matches(".* my-os/1.2.3"));
+  }
+
+  public void testSetsApiClientHeaderWithoutOsVersion() {
+    System.setProperty("os.name", "My OS");
+    System.clearProperty("os.version");
+    assertNull(System.getProperty("os.version"));
+
+    String version = new ApiClientVersion().toString();
+    assertFalse("Api version should not contain the os version", version.matches(".*my-os.*"));
+  }
+
+  public void testSetsApiClientHeaderDiscoveryVersion() throws IOException {
+    HttpTransport transport =
+        new AssertHeaderTransport("X-Goog-Api-Client", ".*gdcl/\\d+\\.\\d+\\.\\d+.*");
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null)
+            .build();
+    MockGoogleClientRequest<Void> request =
+        new MockGoogleClientRequest<>(client, HttpMethods.GET, URI_TEMPLATE, null, Void.class);
     request.executeUnparsed();
   }
 
+  public void testReturnRawInputStream_defaultFalse() throws Exception {
+    HttpTransport transport =
+        new MockHttpTransport() {
+          @Override
+          public LowLevelHttpRequest buildRequest(final String method, final String url) {
+            return new MockLowLevelHttpRequest() {
+              @Override
+              public LowLevelHttpResponse execute() {
+                return new MockLowLevelHttpResponse()
+                    .setContentEncoding("gzip")
+                    .setContent(
+                        new ByteArrayInputStream(
+                            BaseEncoding.base64()
+                                .decode(
+                                    "H4sIAAAAAAAAAPNIzcnJV3DPz0/PSVVwzskvTVEILskvSkxPVQQA/LySchsAAAA=")));
+              }
+            };
+          }
+        };
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null)
+            .setApplicationName("Test Application")
+            .build();
+    MockGoogleClientRequest<String> request =
+        new MockGoogleClientRequest<String>(
+            client, HttpMethods.GET, URI_TEMPLATE, null, String.class);
+    InputStream inputStream = request.executeAsInputStream();
+    // The response will be wrapped because of gzip encoding
+    assertFalse(inputStream instanceof ByteArrayInputStream);
+  }
+
+  public void testReturnRawInputStream_True() throws Exception {
+    HttpTransport transport =
+        new MockHttpTransport() {
+          @Override
+          public LowLevelHttpRequest buildRequest(final String method, final String url) {
+            return new MockLowLevelHttpRequest() {
+              @Override
+              public LowLevelHttpResponse execute() {
+                return new MockLowLevelHttpResponse()
+                    .setContentEncoding("gzip")
+                    .setContent(
+                        new ByteArrayInputStream(
+                            BaseEncoding.base64()
+                                .decode(
+                                    "H4sIAAAAAAAAAPNIzcnJV3DPz0/PSVVwzskvTVEILskvSkxPVQQA/LySchsAAAA=")));
+              }
+            };
+          }
+        };
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(transport, ROOT_URL, SERVICE_PATH, JSON_OBJECT_PARSER, null)
+            .setApplicationName("Test Application")
+            .build();
+    MockGoogleClientRequest<String> request =
+        new MockGoogleClientRequest<String>(
+            client, HttpMethods.GET, URI_TEMPLATE, null, String.class);
+    request.setReturnRawInputStream(true);
+    InputStream inputStream = request.executeAsInputStream();
+    // The response will not be wrapped due to setReturnRawInputStream(true)
+    assertTrue(inputStream instanceof ByteArrayInputStream);
+  }
+
+  private class AssertHeaderTransport extends MockHttpTransport {
+    String expectedHeader;
+    String expectedHeaderValue;
+
+    AssertHeaderTransport(String header, String value) {
+      expectedHeader = header;
+      expectedHeaderValue = value;
+    }
+
+    @Override
+    public LowLevelHttpRequest buildRequest(String method, String url) throws IOException {
+      return new MockLowLevelHttpRequest() {
+        @Override
+        public LowLevelHttpResponse execute() throws IOException {
+          String firstHeader = getFirstHeaderValue(expectedHeader);
+          assertTrue(
+              String.format(
+                  "Expected header value to match %s, instead got %s.",
+                  expectedHeaderValue, firstHeader),
+              firstHeader.matches(expectedHeaderValue));
+          return new MockLowLevelHttpResponse();
+        }
+      };
+    }
+  }
+
   private class AssertUserAgentTransport extends MockHttpTransport {
     String expectedUserAgent;
 
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientTest.java
index a60ca2c71..2164af792 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/AbstractGoogleClientTest.java
@@ -26,7 +26,7 @@
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
 import com.google.api.client.json.JsonObjectParser;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
@@ -42,16 +42,15 @@
  */
 public class AbstractGoogleClientTest extends TestCase {
 
-  private static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  private static final JsonFactory JSON_FACTORY = new GsonFactory();
   private static final JsonObjectParser JSON_OBJECT_PARSER = new JsonObjectParser(JSON_FACTORY);
   private static final HttpTransport TRANSPORT = new MockHttpTransport();
 
-  static private class TestRemoteRequestInitializer implements GoogleClientRequestInitializer {
+  private static class TestRemoteRequestInitializer implements GoogleClientRequestInitializer {
 
     boolean isCalled;
 
-    TestRemoteRequestInitializer() {
-    }
+    TestRemoteRequestInitializer() {}
 
     public void initialize(AbstractGoogleClientRequest<?> request) {
       isCalled = true;
@@ -64,10 +63,11 @@ public void testGoogleClientBuilder() {
     GoogleClientRequestInitializer jsonHttpRequestInitializer = new TestRemoteRequestInitializer();
     String applicationName = "Test Application";
 
-    AbstractGoogleClient.Builder setApplicationName = new MockGoogleClient.Builder(
-        TRANSPORT, rootUrl, servicePath, JSON_OBJECT_PARSER, null).setApplicationName(
-        applicationName).setGoogleClientRequestInitializer(jsonHttpRequestInitializer)
-        .setSuppressAllChecks(true);
+    AbstractGoogleClient.Builder setApplicationName =
+        new MockGoogleClient.Builder(TRANSPORT, rootUrl, servicePath, JSON_OBJECT_PARSER, null)
+            .setApplicationName(applicationName)
+            .setGoogleClientRequestInitializer(jsonHttpRequestInitializer)
+            .setSuppressAllChecks(true);
     AbstractGoogleClient client = setApplicationName.build();
 
     assertEquals(rootUrl + servicePath, client.getBaseUrl());
@@ -84,8 +84,8 @@ public void testGoogleClientSuppressionDefaults() {
     String servicePath = "path/v1/";
 
     // Assert suppression defaults.
-    AbstractGoogleClient.Builder googleClientBuilder = new MockGoogleClient.Builder(
-        TRANSPORT, rootUrl, servicePath, JSON_OBJECT_PARSER, null);
+    AbstractGoogleClient.Builder googleClientBuilder =
+        new MockGoogleClient.Builder(TRANSPORT, rootUrl, servicePath, JSON_OBJECT_PARSER, null);
     assertFalse(googleClientBuilder.getSuppressPatternChecks());
     assertFalse(googleClientBuilder.getSuppressRequiredParameterChecks());
 
@@ -95,19 +95,29 @@ public void testGoogleClientSuppressionDefaults() {
   }
 
   public void testBaseServerAndBasePathBuilder() {
-    AbstractGoogleClient client = new MockGoogleClient.Builder(
-        TRANSPORT, "http://www.testgoogleapis.com/test/", "path/v1/", JSON_OBJECT_PARSER,
-        null).setApplicationName("Test Application")
-        .setRootUrl("http://www.googleapis.com/test/").setServicePath("path/v2/").build();
+    AbstractGoogleClient client =
+        new MockGoogleClient.Builder(
+                TRANSPORT,
+                "http://www.testgoogleapis.com/test/",
+                "path/v1/",
+                JSON_OBJECT_PARSER,
+                null)
+            .setApplicationName("Test Application")
+            .setRootUrl("http://www.googleapis.com/test/")
+            .setServicePath("path/v2/")
+            .build();
 
     assertEquals("http://www.googleapis.com/test/path/v2/", client.getBaseUrl());
   }
 
   public void testInitialize() throws Exception {
     TestRemoteRequestInitializer remoteRequestInitializer = new TestRemoteRequestInitializer();
-    AbstractGoogleClient client = new MockGoogleClient.Builder(
-        TRANSPORT, "http://www.test.com/", "", JSON_OBJECT_PARSER, null).setApplicationName(
-        "Test Application").setGoogleClientRequestInitializer(remoteRequestInitializer).build();
+    AbstractGoogleClient client =
+        new MockGoogleClient.Builder(
+                TRANSPORT, "http://www.test.com/", "", JSON_OBJECT_PARSER, null)
+            .setApplicationName("Test Application")
+            .setGoogleClientRequestInitializer(remoteRequestInitializer)
+            .build();
     client.initialize(null);
     assertTrue(remoteRequestInitializer.isCalled);
   }
@@ -123,8 +133,7 @@ private static class MediaTransport extends MockHttpTransport {
     int contentLength = MediaHttpUploader.DEFAULT_CHUNK_SIZE;
     boolean contentLengthNotSpecified;
 
-    protected MediaTransport() {
-    }
+    protected MediaTransport() {}
 
     @Override
     public LowLevelHttpRequest buildRequest(String name, String url) {
@@ -132,7 +141,7 @@ public LowLevelHttpRequest buildRequest(String name, String url) {
         assertEquals(TEST_RESUMABLE_REQUEST_URL, url);
 
         return new MockLowLevelHttpRequest() {
-            @Override
+          @Override
           public LowLevelHttpResponse execute() {
             // Assert that the required headers are set.
             if (!contentLengthNotSpecified) {
@@ -151,7 +160,7 @@ public LowLevelHttpResponse execute() {
       assertEquals(TEST_UPLOAD_URL, url);
 
       return new MockLowLevelHttpRequest() {
-          @Override
+        @Override
         public LowLevelHttpResponse execute() {
           MockLowLevelHttpResponse response = new MockLowLevelHttpResponse();
 
@@ -178,15 +187,16 @@ public LowLevelHttpResponse execute() {
   }
 
   public static class A {
-    @Key
-    String foo;
+    @Key String foo;
   }
 
   public void testMediaUpload() throws Exception {
     MediaTransport transport = new MediaTransport();
-    AbstractGoogleClient client = new MockGoogleClient.Builder(
-        transport, TEST_RESUMABLE_REQUEST_URL, "", JSON_OBJECT_PARSER, null).setApplicationName(
-        "Test Application").build();
+    AbstractGoogleClient client =
+        new MockGoogleClient.Builder(
+                transport, TEST_RESUMABLE_REQUEST_URL, "", JSON_OBJECT_PARSER, null)
+            .setApplicationName("Test Application")
+            .build();
     InputStream is = new ByteArrayInputStream(new byte[MediaHttpUploader.DEFAULT_CHUNK_SIZE]);
     InputStreamContent mediaContent = new InputStreamContent(TEST_CONTENT_TYPE, is);
     mediaContent.setLength(MediaHttpUploader.DEFAULT_CHUNK_SIZE);
@@ -219,7 +229,8 @@ public GZipCheckerInterceptor(boolean gzipDisabled) {
     }
 
     public void intercept(HttpRequest request) {
-      assertEquals(!gzipDisabled && !(request.getContent() instanceof EmptyContent),
+      assertEquals(
+          !gzipDisabled && !(request.getContent() instanceof EmptyContent),
           request.getEncoding() != null);
     }
   }
@@ -227,9 +238,15 @@ public void intercept(HttpRequest request) {
   public void testMediaUpload_disableGZip() throws Exception {
     MediaTransport transport = new MediaTransport();
     transport.contentLengthNotSpecified = true;
-    AbstractGoogleClient client = new MockGoogleClient.Builder(
-        transport, TEST_RESUMABLE_REQUEST_URL, "", JSON_OBJECT_PARSER,
-        new GZipCheckerInitializer(true)).setApplicationName("Test Application").build();
+    AbstractGoogleClient client =
+        new MockGoogleClient.Builder(
+                transport,
+                TEST_RESUMABLE_REQUEST_URL,
+                "",
+                JSON_OBJECT_PARSER,
+                new GZipCheckerInitializer(true))
+            .setApplicationName("Test Application")
+            .build();
     InputStream is = new ByteArrayInputStream(new byte[MediaHttpUploader.DEFAULT_CHUNK_SIZE]);
     InputStreamContent mediaContent = new InputStreamContent(TEST_CONTENT_TYPE, is);
     MockGoogleClientRequest<A> rq =
@@ -243,9 +260,15 @@ public void testMediaUpload_disableGZip() throws Exception {
   public void testMediaUpload_enableGZip() throws Exception {
     MediaTransport transport = new MediaTransport();
     transport.contentLengthNotSpecified = true;
-    AbstractGoogleClient client = new MockGoogleClient.Builder(
-        transport, TEST_RESUMABLE_REQUEST_URL, "", JSON_OBJECT_PARSER,
-        new GZipCheckerInitializer(false)).setApplicationName("Test Application").build();
+    AbstractGoogleClient client =
+        new MockGoogleClient.Builder(
+                transport,
+                TEST_RESUMABLE_REQUEST_URL,
+                "",
+                JSON_OBJECT_PARSER,
+                new GZipCheckerInitializer(false))
+            .setApplicationName("Test Application")
+            .build();
     InputStream is = new ByteArrayInputStream(new byte[MediaHttpUploader.DEFAULT_CHUNK_SIZE]);
     InputStreamContent mediaContent = new InputStreamContent(TEST_CONTENT_TYPE, is);
     MockGoogleClientRequest<A> rq =
@@ -259,9 +282,15 @@ public void testMediaUpload_enableGZip() throws Exception {
   public void testMediaUpload_defaultGZip() throws Exception {
     MediaTransport transport = new MediaTransport();
     transport.contentLengthNotSpecified = true;
-    AbstractGoogleClient client = new MockGoogleClient.Builder(
-        transport, TEST_RESUMABLE_REQUEST_URL, "", JSON_OBJECT_PARSER,
-        new GZipCheckerInitializer(false)).setApplicationName("Test Application").build();
+    AbstractGoogleClient client =
+        new MockGoogleClient.Builder(
+                transport,
+                TEST_RESUMABLE_REQUEST_URL,
+                "",
+                JSON_OBJECT_PARSER,
+                new GZipCheckerInitializer(false))
+            .setApplicationName("Test Application")
+            .build();
     InputStream is = new ByteArrayInputStream(new byte[MediaHttpUploader.DEFAULT_CHUNK_SIZE]);
     InputStreamContent mediaContent = new InputStreamContent(TEST_CONTENT_TYPE, is);
     MockGoogleClientRequest<A> rq =
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializerTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializerTest.java
index 8c73a0e3a..4e898dea2 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializerTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/CommonGoogleClientRequestInitializerTest.java
@@ -14,10 +14,11 @@
 
 import com.google.api.client.googleapis.testing.services.MockGoogleClient;
 import com.google.api.client.http.HttpContent;
+import com.google.api.client.http.HttpHeaders;
 import com.google.api.client.testing.http.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.util.Key;
-
+import java.io.IOException;
 import junit.framework.TestCase;
 
 /**
@@ -28,22 +29,77 @@
 public class CommonGoogleClientRequestInitializerTest extends TestCase {
 
   public static class MyRequest extends AbstractGoogleClientRequest<String> {
-    @Key
-    String key;
+    @Key String key;
 
-    protected MyRequest(MockGoogleClient client, String method, String uriTemplate,
-        HttpContent content, Class<String> responseClass) {
+    protected MyRequest(
+        MockGoogleClient client,
+        String method,
+        String uriTemplate,
+        HttpContent content,
+        Class<String> responseClass) {
       super(client, method, uriTemplate, content, responseClass);
     }
   }
 
   public void testInitialize() throws Exception {
     CommonGoogleClientRequestInitializer key = new CommonGoogleClientRequestInitializer("foo");
-    MockGoogleClient client = new MockGoogleClient.Builder(new MockHttpTransport(),
-        HttpTesting.SIMPLE_URL, "test/", null, null).setApplicationName("Test Application").build();
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(
+                new MockHttpTransport(), HttpTesting.SIMPLE_URL, "test/", null, null)
+            .setApplicationName("Test Application")
+            .build();
     MyRequest request = new MyRequest(client, "GET", "", null, String.class);
     assertNull(request.key);
     key.initialize(request);
     assertEquals("foo", request.key);
   }
+
+  public void testInitializeSetsUserAgent() throws IOException {
+    GoogleClientRequestInitializer requestInitializer =
+        CommonGoogleClientRequestInitializer.newBuilder().setUserAgent("test user agent").build();
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(
+                new MockHttpTransport(), HttpTesting.SIMPLE_URL, "test/", null, null)
+            .setGoogleClientRequestInitializer(requestInitializer)
+            .setApplicationName("My Application")
+            .build();
+    MyRequest request = new MyRequest(client, "GET", "", null, String.class);
+    requestInitializer.initialize(request);
+    HttpHeaders headers = request.getRequestHeaders();
+    assertEquals("test user agent", headers.getUserAgent());
+  }
+
+  public void testInitializeSetsUserProject() throws IOException {
+    GoogleClientRequestInitializer requestInitializer =
+        CommonGoogleClientRequestInitializer.newBuilder()
+            .setUserProject("my quota project")
+            .build();
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(
+                new MockHttpTransport(), HttpTesting.SIMPLE_URL, "test/", null, null)
+            .setGoogleClientRequestInitializer(requestInitializer)
+            .setApplicationName("My Application")
+            .build();
+    MyRequest request = new MyRequest(client, "GET", "", null, String.class);
+    requestInitializer.initialize(request);
+    HttpHeaders headers = request.getRequestHeaders();
+    assertEquals("my quota project", headers.get("X-Goog-User-Project"));
+  }
+
+  public void testInitializeSetsRequestReason() throws IOException {
+    GoogleClientRequestInitializer requestInitializer =
+        CommonGoogleClientRequestInitializer.newBuilder()
+            .setRequestReason("some request reason")
+            .build();
+    MockGoogleClient client =
+        new MockGoogleClient.Builder(
+                new MockHttpTransport(), HttpTesting.SIMPLE_URL, "test/", null, null)
+            .setGoogleClientRequestInitializer(requestInitializer)
+            .setApplicationName("My Application")
+            .build();
+    MyRequest request = new MyRequest(client, "GET", "", null, String.class);
+    requestInitializer.initialize(request);
+    HttpHeaders headers = request.getRequestHeaders();
+    assertEquals("some request reason", headers.get("X-Goog-Request-Reason"));
+  }
 }
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientTest.java
index 4ec6a856e..1efc2c1e9 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/AbstractGoogleJsonClientTest.java
@@ -22,12 +22,11 @@
 import com.google.api.client.http.LowLevelHttpResponse;
 import com.google.api.client.json.Json;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.testing.http.MockLowLevelHttpRequest;
 import com.google.api.client.testing.http.MockLowLevelHttpResponse;
-
 import junit.framework.TestCase;
 
 /**
@@ -38,27 +37,31 @@
 public class AbstractGoogleJsonClientTest extends TestCase {
 
   public void testExecuteUnparsed_error() throws Exception {
-    HttpTransport transport = new MockHttpTransport() {
-        @Override
-      public LowLevelHttpRequest buildRequest(String name, String url) {
-        return new MockLowLevelHttpRequest() {
-            @Override
-          public LowLevelHttpResponse execute() {
-            MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
-            result.setStatusCode(HttpStatusCodes.STATUS_CODE_UNAUTHORIZED);
-            result.setContentType(Json.MEDIA_TYPE);
-            result.setContent("{\"error\":{\"code\":401,\"errors\":[{\"domain\":\"global\","
-                + "\"location\":\"Authorization\",\"locationType\":\"header\","
-                + "\"message\":\"me\",\"reason\":\"authError\"}],\"message\":\"me\"}}");
-            return result;
+    HttpTransport transport =
+        new MockHttpTransport() {
+          @Override
+          public LowLevelHttpRequest buildRequest(String name, String url) {
+            return new MockLowLevelHttpRequest() {
+              @Override
+              public LowLevelHttpResponse execute() {
+                MockLowLevelHttpResponse result = new MockLowLevelHttpResponse();
+                result.setStatusCode(HttpStatusCodes.STATUS_CODE_UNAUTHORIZED);
+                result.setContentType(Json.MEDIA_TYPE);
+                result.setContent(
+                    "{\"error\":{\"code\":401,\"errors\":[{\"domain\":\"global\","
+                        + "\"location\":\"Authorization\",\"locationType\":\"header\","
+                        + "\"message\":\"me\",\"reason\":\"authError\"}],\"message\":\"me\"}}");
+                return result;
+              }
+            };
           }
         };
-      }
-    };
-    JsonFactory jsonFactory = new JacksonFactory();
-    MockGoogleJsonClient client = new MockGoogleJsonClient.Builder(
-        transport, jsonFactory, HttpTesting.SIMPLE_URL, "", null, false).setApplicationName(
-        "Test Application").build();
+    JsonFactory jsonFactory = new GsonFactory();
+    MockGoogleJsonClient client =
+        new MockGoogleJsonClient.Builder(
+                transport, jsonFactory, HttpTesting.SIMPLE_URL, "", null, false)
+            .setApplicationName("Test Application")
+            .build();
     MockGoogleJsonClientRequest<String> request =
         new MockGoogleJsonClientRequest<String>(client, "GET", "foo", null, String.class);
     try {
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializerTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializerTest.java
index ac7d31fa8..efa8a58ee 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializerTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/services/json/CommonGoogleJsonClientRequestInitializerTest.java
@@ -14,11 +14,10 @@
 
 import com.google.api.client.googleapis.testing.services.json.MockGoogleJsonClient;
 import com.google.api.client.http.HttpContent;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import com.google.api.client.testing.http.HttpTesting;
 import com.google.api.client.testing.http.MockHttpTransport;
 import com.google.api.client.util.Key;
-
 import junit.framework.TestCase;
 
 /**
@@ -29,11 +28,14 @@
 public class CommonGoogleJsonClientRequestInitializerTest extends TestCase {
 
   public static class MyRequest extends AbstractGoogleJsonClientRequest<String> {
-    @Key
-    String key;
+    @Key String key;
 
-    protected MyRequest(MockGoogleJsonClient client, String method, String uriTemplate,
-        HttpContent content, Class<String> responseClass) {
+    protected MyRequest(
+        MockGoogleJsonClient client,
+        String method,
+        String uriTemplate,
+        HttpContent content,
+        Class<String> responseClass) {
       super(client, method, uriTemplate, content, responseClass);
     }
   }
@@ -41,9 +43,16 @@ protected MyRequest(MockGoogleJsonClient client, String method, String uriTempla
   public void testInitialize() throws Exception {
     CommonGoogleJsonClientRequestInitializer key =
         new CommonGoogleJsonClientRequestInitializer("foo");
-    MockGoogleJsonClient client = new MockGoogleJsonClient.Builder(
-        new MockHttpTransport(), new JacksonFactory(), HttpTesting.SIMPLE_URL, "test/", null,
-        false).setApplicationName("Test Application").build();
+    MockGoogleJsonClient client =
+        new MockGoogleJsonClient.Builder(
+                new MockHttpTransport(),
+                new GsonFactory(),
+                HttpTesting.SIMPLE_URL,
+                "test/",
+                null,
+                false)
+            .setApplicationName("Test Application")
+            .build();
     MyRequest request = new MyRequest(client, "GET", "", null, String.class);
     assertNull(request.key);
     key.initialize(request);
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTestingTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTestingTest.java
index 5c44a9553..c4f41a1d3 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTestingTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/testing/json/GoogleJsonResponseExceptionFactoryTestingTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -16,7 +16,7 @@
 
 import com.google.api.client.googleapis.json.GoogleJsonResponseException;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.client.json.gson.GsonFactory;
 import java.io.IOException;
 import junit.framework.TestCase;
 
@@ -27,7 +27,7 @@
  */
 public class GoogleJsonResponseExceptionFactoryTestingTest extends TestCase {
 
-  private static final JsonFactory JSON_FACTORY = new JacksonFactory();
+  private static final JsonFactory JSON_FACTORY = new GsonFactory();
   private static final int HTTP_CODE_NOT_FOUND = 404;
   private static final String REASON_PHRASE_NOT_FOUND = "NOT FOUND";
 
diff --git a/google-api-client/src/test/java/com/google/api/client/googleapis/util/UtilsTest.java b/google-api-client/src/test/java/com/google/api/client/googleapis/util/UtilsTest.java
index 9ee8dbcfb..49bd02a74 100644
--- a/google-api-client/src/test/java/com/google/api/client/googleapis/util/UtilsTest.java
+++ b/google-api-client/src/test/java/com/google/api/client/googleapis/util/UtilsTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 Google Inc.
+ * Copyright 2013 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
@@ -17,11 +17,6 @@
 import com.google.api.client.http.HttpTransport;
 import com.google.api.client.http.javanet.NetHttpTransport;
 import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
-import java.io.IOException;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
 import junit.framework.TestCase;
 
 /**
@@ -34,7 +29,6 @@ public class UtilsTest extends TestCase {
   public void testGetDefaultJsonFactory() {
     JsonFactory jsonFactory = Utils.getDefaultJsonFactory();
     assertNotNull(jsonFactory);
-    assertTrue(jsonFactory instanceof JacksonFactory);
     JsonFactory secondCall = Utils.getDefaultJsonFactory();
     assertSame(jsonFactory, secondCall);
   }
@@ -46,19 +40,4 @@ public void testGetDefaultTransport() {
     HttpTransport secondCall = Utils.getDefaultTransport();
     assertSame(transport, secondCall);
   }
-
-  public static Map<String, String> parseQuery(String query) throws IOException {
-    Map<String, String> map = new HashMap<String, String>();
-    String[] entries = query.split("&");
-    for (String entry : entries) {
-      String[] sides = entry.split("=");
-      if (sides.length != 2) {
-        throw new IOException("Invalid Query String");
-      }
-      String key = URLDecoder.decode(sides[0], "UTF-8");
-      String value = URLDecoder.decode(sides[1], "UTF-8");
-      map.put(key, value);
-    }
-    return map;
-  }
 }
diff --git a/google-api-client/src/test/proto/error_output.proto b/google-api-client/src/test/proto/error_output.proto
index 7bd21393c..5a1de90fd 100644
--- a/google-api-client/src/test/proto/error_output.proto
+++ b/google-api-client/src/test/proto/error_output.proto
@@ -2,7 +2,6 @@
 
 syntax = "proto2";
 package api.client.googleapis.batch;
-option optimize_for = LITE_RUNTIME;
 option java_package = "com.google.api.client.googleapis.batch";
 
 // These messages are the protobuf version of the
diff --git a/google-api-client/src/test/proto/mock_data.proto b/google-api-client/src/test/proto/mock_data.proto
index 0b2b717f0..40b3fb472 100644
--- a/google-api-client/src/test/proto/mock_data.proto
+++ b/google-api-client/src/test/proto/mock_data.proto
@@ -1,6 +1,5 @@
 syntax = "proto2";
 package api.client.googleapis.batch;
-option optimize_for = LITE_RUNTIME;
 option java_package = "com.google.api.client.googleapis.batch";
 
 message Class1 {
diff --git a/google-api-client/src/test/resources/com/google/api/client/googleapis/json/error.json b/google-api-client/src/test/resources/com/google/api/client/googleapis/json/error.json
new file mode 100644
index 000000000..578abec20
--- /dev/null
+++ b/google-api-client/src/test/resources/com/google/api/client/googleapis/json/error.json
@@ -0,0 +1,23 @@
+{
+  "error": {
+    "code": 400,
+    "message": "The template parameters are invalid.",
+    "status": "INVALID_ARGUMENT",
+    "details": [
+      {
+        "@type": "type.googleapis.com/google.dataflow.v1beta3.InvalidTemplateParameters",
+        "parameterViolations": [
+          {
+            "parameter": "safeBrowsingApiKey",
+            "description": "Parameter didn't match regex '^[0-9a-zA-Z_]+$'"
+          }
+        ]
+      },
+      {
+        "@type": "type.googleapis.com/google.rpc.DebugInfo",
+        "detail": "test detail"
+      }
+    ]
+  }
+}
+
diff --git a/google-api-client/src/test/resources/com/google/api/client/googleapis/json/errorWithReasonInDetails.json b/google-api-client/src/test/resources/com/google/api/client/googleapis/json/errorWithReasonInDetails.json
new file mode 100644
index 000000000..cd1b85ad5
--- /dev/null
+++ b/google-api-client/src/test/resources/com/google/api/client/googleapis/json/errorWithReasonInDetails.json
@@ -0,0 +1,31 @@
+{
+  "error": {
+    "code": 400,
+    "message": "The template parameters are invalid.",
+    "status": "INVALID_ARGUMENT",
+    "details": [
+      {
+        "@type": "type.googleapis.com/google.dataflow.v1beta3.InvalidTemplateParameters",
+        "reason": "TEST REASON 1",
+        "parameterViolations": [
+          {
+            "parameter": "safeBrowsingApiKey",
+            "description": "Parameter didn't match regex '^[0-9a-zA-Z_]+$'"
+          }
+        ]
+      },
+      {
+        "@type": "type.googleapis.com/google.rpc.DebugInfo",
+        "detail": "test detail"
+      },
+      {
+        "@type": "type.googleapis.com/google.rpc.DebugInfo",
+        "reason": "test reason 2"
+      },
+      {
+        "@type": "type.googleapis.com/google.rpc.DebugInfo"
+      }
+    ]
+  }
+}
+
diff --git a/google-api-client/src/test/resources/com/google/api/client/googleapis/util/mtlsCertAndKey.pem b/google-api-client/src/test/resources/com/google/api/client/googleapis/util/mtlsCertAndKey.pem
new file mode 100644
index 000000000..d6c045125
--- /dev/null
+++ b/google-api-client/src/test/resources/com/google/api/client/googleapis/util/mtlsCertAndKey.pem
@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIICGzCCAYSgAwIBAgIIWrt6xtmHPs4wDQYJKoZIhvcNAQEFBQAwMzExMC8GA1UE
+AxMoMTAwOTEyMDcyNjg3OC5hcHBzLmdvb2dsZXVzZXJjb250ZW50LmNvbTAeFw0x
+MjEyMDExNjEwNDRaFw0yMjExMjkxNjEwNDRaMDMxMTAvBgNVBAMTKDEwMDkxMjA3
+MjY4NzguYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20wgZ8wDQYJKoZIhvcNAQEB
+BQADgY0AMIGJAoGBAL1SdY8jTUVU7O4/XrZLYTw0ON1lV6MQRGajFDFCqD2Fd9tQ
+GLW8Iftx9wfXe1zuaehJSgLcyCxazfyJoN3RiONBihBqWY6d3lQKqkgsRTNZkdFJ
+Wdzl/6CxhK9sojh2p0r3tydtv9iwq5fuuWIvtODtT98EgphhncQAqkKoF3zVAgMB
+AAGjODA2MAwGA1UdEwEB/wQCMAAwDgYDVR0PAQH/BAQDAgeAMBYGA1UdJQEB/wQM
+MAoGCCsGAQUFBwMCMA0GCSqGSIb3DQEBBQUAA4GBAD8XQEqzGePa9VrvtEGpf+R4
+fkxKbcYAzqYq202nKu0kfjhIYkYSBj6gi348YaxE64yu60TVl42l5HThmswUheW4
+uQIaq36JvwvsDP5Zoj5BgiNSnDAFQp+jJFBRUA5vooJKgKgMDf/r/DCOsbO6VJF1
+kWwa9n19NFiV0z3m6isj
+-----END CERTIFICATE-----
+-----BEGIN PRIVATE KEY-----
+MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAL1SdY8jTUVU7O4/
+XrZLYTw0ON1lV6MQRGajFDFCqD2Fd9tQGLW8Iftx9wfXe1zuaehJSgLcyCxazfyJ
+oN3RiONBihBqWY6d3lQKqkgsRTNZkdFJWdzl/6CxhK9sojh2p0r3tydtv9iwq5fu
+uWIvtODtT98EgphhncQAqkKoF3zVAgMBAAECgYB51B9cXe4yiGTzJ4pOKpHGySAy
+sC1F/IjXt2eeD3PuKv4m/hL4l7kScpLx0+NJuQ4j8U2UK/kQOdrGANapB1ZbMZAK
+/q0xmIUzdNIDiGSoTXGN2mEfdsEpQ/Xiv0lyhYBBPC/K4sYIpHccnhSRQUZlWLLY
+lE5cFNKC9b7226mNvQJBAPt0hfCNIN0kUYOA9jdLtx7CE4ySGMPf5KPBuzPd8ty1
+fxaFm9PB7B76VZQYmHcWy8rT5XjoLJHrmGW1ZvP+iDsCQQDAvnKoarPOGb5iJfkq
+RrA4flf1TOlf+1+uqIOJ94959jkkJeb0gv/TshDnm6/bWn+1kJylQaKygCizwPwB
+Z84vAkA0Duur4YvsPJijoQ9YY1SGCagCcjyuUKwFOxaGpmyhRPIKt56LOJqpzyno
+fy8ReKa4VyYq4eZYT249oFCwMwIBAkAROPNF2UL3x5UbcAkznd1hLujtIlI4IV4L
+XUNjsJtBap7we/KHJq11XRPlniO4lf2TW7iji5neGVWJulTKS1xBAkAerktk4Hsw
+ErUaUG1s/d+Sgc8e/KMeBElV+NxGhcWEeZtfHMn/6VOlbzY82JyvC9OKC80A5CAE
+VUV6b25kqrcu
+-----END PRIVATE KEY-----
\ No newline at end of file
diff --git a/google-api-client/src/test/resources/com/google/api/client/googleapis/util/mtls_context_aware_metadata.json b/google-api-client/src/test/resources/com/google/api/client/googleapis/util/mtls_context_aware_metadata.json
new file mode 100644
index 000000000..c7729cf1b
--- /dev/null
+++ b/google-api-client/src/test/resources/com/google/api/client/googleapis/util/mtls_context_aware_metadata.json
@@ -0,0 +1,9 @@
+{
+  "cert_provider_command": [
+    "cat",
+    "src/test/resources/com/google/api/client/googleapis/util/mtlsCertAndKey.pem"
+  ],
+  "device_resource_ids": [
+    "123"
+  ]
+}
\ No newline at end of file
diff --git a/google-api-client/src/test/resources/com/google/api/client/googleapis/util/mtls_context_aware_metadata_bad_command.json b/google-api-client/src/test/resources/com/google/api/client/googleapis/util/mtls_context_aware_metadata_bad_command.json
new file mode 100644
index 000000000..69367d719
--- /dev/null
+++ b/google-api-client/src/test/resources/com/google/api/client/googleapis/util/mtls_context_aware_metadata_bad_command.json
@@ -0,0 +1,9 @@
+{
+  "cert_provider_command": [
+    "echo",
+    "\"foo\""
+  ],
+  "device_resource_ids": [
+    "123"
+  ]
+}
\ No newline at end of file
diff --git a/instructions.html b/instructions.html
deleted file mode 100644
index 52a65eb12..000000000
--- a/instructions.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<html>
-<title>Setup Instructions for the Google API Client Library for Java</title>
-<body>
-<h2>Setup Instructions for the Google API Client Library for Java</h2>
-
-<h3>Browse Online</h3>
-
-<ul>
-  <li><a
-    href="http://code.google.com/p/google-api-java-client/source/browse/">Browse
-  Source</a></li>
-</ul>
-
-<h3>Checkout Instructions</h3>
-
-<p><b>Prerequisites:</b> install <a href="http://java.com">Java 6</a>, <a
-  href="http://mercurial.selenic.com/">Mercurial</a> and <a
-  href="http://maven.apache.org/download.html">Maven</a>. You may need to set
-your <code>JAVA_HOME</code>.</p>
-
-<pre><code>hg clone https://google-api-java-client.googlecode.com/hg/ google-api-java-client
-cd google-api-java-client
-mvn install</code></pre>
-
-There are two named branches:
-<ul>
-  <li>The "default" branch has the stable 1.4 library. This is the default
-  branch that is checked out with the instructions above.</li>
-  <li>The "dev" branch has the development 1.5 library. To switch to this
-  branch, run: <pre><code>hg update dev
-mvn clean install</code></pre></li>
-</ul>
-
-<h3>Setup Project in Eclipse 3.5</h3>
-
-<p><b>Prerequisites:</b> install <a href="http://www.eclipse.org/downloads/">Eclipse</a>,
-the <a href="http://javaforge.com/project/HGE">Mercurial plugin</a>, the <a
-  href="http://m2eclipse.sonatype.org/installing-m2eclipse.html">Maven
-plugin</a>, and the <a
-  href="http://developer.android.com/sdk/eclipse-adt.html#installing">Android
-plugin</a>.</p>
-
-<ul>
-  <li>Setup Eclipse Preferences
-  <ul>
-    <li>Window &gt; Preferences... (or on Mac, Eclipse &gt; Preferences...)</li>
-    <li>Select Maven
-    <ul>
-      <li>check on "Download Artifact Sources"</li>
-      <li>check on "Download Artifact JavaDoc"</li>
-    </ul>
-    </li>
-    <li>Select Android
-    <ul>
-      <li>setup SDK location</li>
-    </ul>
-    </li>
-  </ul>
-  </li>
-  <li>Import projects
-  <ul>
-    <li>File &gt; Import...</li>
-    <li>Select "General &gt; Existing Project into Workspace" and click
-    "Next"</li>
-    <li>Click "Browse" next to "Select root directory", find <code><i>[someDirectory]</i>/google-api-java-client</code>
-    and click OK</li>
-    <li>Click "Next" and "Finish"</li>
-  </ul>
-  </li>
-</ul>
-
-</body>
-</html>
diff --git a/overview.html b/overview.html
deleted file mode 100644
index a4274fa2b..000000000
--- a/overview.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<html>
-  <body>
-    Written by Google, the <a href="https://code.google.com/p/google-api-java-client/">
-    google-api-java-client</a> library is an easy-to-use and efficient Java client library for
-    accessing Google APIs using JSON and OAuth 2.0.
-
-    <p>
-      This library is built on top of two common libraries, also built by Google, but designed to
-      work with any HTTP service on the web: the Google HTTP Client Library for Java and the Google
-      OAuth Client Library for Java.
-      @see <a href="http://javadoc.google-http-java-client.googlecode.com/hg/index.html">
-      Google HTTP Java Client Library Javadoc</a>
-      @see <a href="http://javadoc.google-oauth-java-client.googlecode.com/hg/index.html">
-      Google OAuth Java Client Library Javadoc</a>
-    </p>
-  </body>
-</html>
diff --git a/pom.xml b/pom.xml
index 36f1971e7..3c5b84437 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,34 +2,47 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>org.sonatype.oss</groupId>
-    <artifactId>oss-parent</artifactId>
-    <version>7</version>
-  </parent>
   <groupId>com.google.api-client</groupId>
   <artifactId>google-api-client-parent</artifactId>
-  <version>1.25.0-SNAPSHOT</version>
+  <version>1.32.1</version><!-- {x-version-update:google-api-client:current} -->
   <packaging>pom</packaging>
   <name>Parent for the Google API Client Library for Java</name>
-
-  <url>https://github.com/google/google-api-java-client</url>
+  <description>The Google APIs Client Library for Java is a Java client library
+    for accessing any HTTP-based API on the web</description>
+  <url>https://github.com/googleapis/google-api-java-client</url>
 
   <issueManagement>
     <system>GitHub</system>
-    <url>https://github.com/google/google-api-java-client/issues</url>
+    <url>https://github.com/googleapis/google-api-java-client/issues</url>
   </issueManagement>
 
   <inceptionYear>2010</inceptionYear>
 
-  <prerequisites>
-    <maven>2.0.9</maven>
-  </prerequisites>
+  <developers>
+    <developer>
+      <id>chingor</id>
+      <name>Jeff Ching</name>
+      <email>chingor@google.com</email>
+      <organization>Google</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <id>neenushaji</id>
+      <name>Neenu Shaji</name>
+      <email>neenushaji@google.com</email>
+      <organization>Google</organization>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
+  </developers>
 
   <scm>
-    <connection>scm:git:https://github.com/google/google-api-java-client.git</connection>
-    <developerConnection>scm:git:ssh:git@github.com:google/google-api-java-client.git</developerConnection>
-    <url>https://github.com/google/google-api-java-client</url>
+    <connection>scm:git:https://github.com/googleapis/google-api-java-client.git</connection>
+    <developerConnection>scm:git:ssh:git@github.com:googleapis/google-api-java-client.git</developerConnection>
+    <url>https://github.com/googleapis/google-api-java-client</url>
   </scm>
 
   <organization>
@@ -62,6 +75,7 @@
     <module>google-api-client-android</module>
     <module>google-api-client-appengine</module>
     <module>google-api-client-assembly</module>
+    <module>google-api-client-bom</module>
     <module>google-api-client-gson</module>
     <module>google-api-client-jackson2</module>
     <module>google-api-client-java6</module>
@@ -81,10 +95,6 @@
       <name>Central Repository</name>
       <url>https://repo.maven.apache.org/maven2</url>
     </pluginRepository>
-    <pluginRepository>
-      <id>protoc-plugin</id>
-      <url>https://dl.bintray.com/sergei-ivanov/maven/</url>
-    </pluginRepository>
   </pluginRepositories>
 
   <dependencyManagement>
@@ -92,43 +102,18 @@
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
-        <version>4.8.2</version>
+        <version>4.13.2</version>
       </dependency>
       <dependency>
         <groupId>com.google.appengine</groupId>
         <artifactId>appengine-api-1.0-sdk</artifactId>
         <version>${project.appengine.version}</version>
       </dependency>
-      <dependency>
-        <groupId>com.google.appengine</groupId>
-        <artifactId>appengine-tools-sdk</artifactId>
-        <version>${project.appengine.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.appengine</groupId>
-        <artifactId>appengine-testing</artifactId>
-        <version>${project.appengine.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.appengine</groupId>
-        <artifactId>appengine-api-labs</artifactId>
-        <version>${project.appengine.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.appengine</groupId>
-        <artifactId>appengine-api-stubs</artifactId>
-        <version>${project.appengine.version}</version>
-      </dependency>
       <dependency>
         <groupId>xpp3</groupId>
         <artifactId>xpp3</artifactId>
         <version>${project.xpp3.version}</version>
       </dependency>
-      <dependency>
-        <groupId>org.apache.httpcomponents</groupId>
-        <artifactId>httpclient</artifactId>
-        <version>${project.httpclient.version}</version>
-      </dependency>
       <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
@@ -147,84 +132,31 @@
       <dependency>
         <groupId>javax.servlet</groupId>
         <artifactId>servlet-api</artifactId>
-        <version>2.5</version>
+        <version>${project.servlet-api.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client</artifactId>
-        <version>${project.http.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-assembly</artifactId>
-        <version>${project.http.version}</version>
-        <type>pom</type>
-      </dependency>
-      <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-android</artifactId>
-        <version>${project.http.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-appengine</artifactId>
-        <version>${project.http.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-gson</artifactId>
-        <version>${project.http.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-jackson2</artifactId>
-        <version>${project.http.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-protobuf</artifactId>
-        <version>${project.http.version}</version>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpcore</artifactId>
+        <version>${project.httpcore.version}</version>
       </dependency>
       <dependency>
-        <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-jackson</artifactId>
-        <version>${project.http.version}</version>
+        <groupId>org.apache.httpcomponents</groupId>
+        <artifactId>httpclient</artifactId>
+        <version>${project.httpclient.version}</version>
       </dependency>
       <dependency>
         <groupId>com.google.http-client</groupId>
-        <artifactId>google-http-client-xml</artifactId>
+        <artifactId>google-http-client-bom</artifactId>
         <version>${project.http.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.oauth-client</groupId>
-        <artifactId>google-oauth-client</artifactId>
-        <version>${project.oauth.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.oauth-client</groupId>
-        <artifactId>google-oauth-client-assembly</artifactId>
-        <version>${project.oauth.version}</version>
         <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.google.oauth-client</groupId>
-        <artifactId>google-oauth-client-appengine</artifactId>
-        <version>${project.oauth.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.oauth-client</groupId>
-        <artifactId>google-oauth-client-java6</artifactId>
-        <version>${project.oauth.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.oauth-client</groupId>
-        <artifactId>google-oauth-client-java7</artifactId>
-        <version>${project.oauth.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.oauth-client</groupId>
-        <artifactId>google-oauth-client-servlet</artifactId>
+        <artifactId>google-oauth-client-bom</artifactId>
         <version>${project.oauth.version}</version>
+        <type>pom</type>
+        <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>com.google.api-client</groupId>
@@ -278,6 +210,13 @@
         <artifactId>google-play-services</artifactId>
         <version>1</version>
       </dependency>
+
+      <dependency>
+        <groupId>com.google.protobuf</groupId>
+        <artifactId>protobuf-java</artifactId>
+        <version>${project.protobuf-java.version}</version>
+        <scope>test</scope>
+      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -286,120 +225,142 @@
     <pluginManagement>
       <plugins>
         <plugin>
-          <artifactId>maven-assembly-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-clean-plugin</artifactId>
-          <version>2.4.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-compiler-plugin</artifactId>
-          <version>2.3.2</version>
+          <groupId>org.sonatype.plugins</groupId>
+          <artifactId>nexus-staging-maven-plugin</artifactId>
+          <version>1.6.8</version>
+          <extensions>true</extensions>
           <configuration>
-            <source>1.6</source>
-            <target>1.6</target>
+            <serverId>ossrh</serverId>
+            <nexusUrl>https://google.oss.sonatype.org/</nexusUrl>
+            <autoReleaseAfterClose>${deploy.autorelease}</autoReleaseAfterClose>
           </configuration>
         </plugin>
         <plugin>
-          <artifactId>maven-dependency-plugin</artifactId>
-          <version>2.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-deploy-plugin</artifactId>
-          <version>2.5</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-ear-plugin</artifactId>
-          <version>2.4.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-ejb-plugin</artifactId>
-          <version>2.3</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-install-plugin</artifactId>
-          <version>2.3.1</version>
+          <artifactId>maven-assembly-plugin</artifactId>
+          <version>3.3.0</version>
         </plugin>
         <plugin>
-          <artifactId>maven-jar-plugin</artifactId>
-          <version>2.3.1</version>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <version>3.8.1</version>
           <configuration>
-            <archive>
-              <addMavenDescriptor>false</addMavenDescriptor>
-            </archive>
+            <source>1.7</source>
+            <target>1.7</target>
           </configuration>
         </plugin>
+
         <plugin>
-          <artifactId>maven-javadoc-plugin</artifactId>
-          <version>2.7</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-plugin-plugin</artifactId>
-          <version>2.6</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-rar-plugin</artifactId>
-          <version>2.2</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.1</version>
-        </plugin>
-        <plugin>
-          <artifactId>maven-resources-plugin</artifactId>
-          <version>2.4.3</version>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-source-plugin</artifactId>
+          <version>3.2.1</version>
+          <executions>
+            <execution>
+              <id>attach-sources</id>
+              <goals>
+                <goal>jar-no-fork</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
-          <artifactId>maven-site-plugin</artifactId>
-          <version>2.1.1</version>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-javadoc-plugin</artifactId>
+          <version>3.2.0</version>
+          <executions>
+            <execution>
+              <id>attach-javadocs</id>
+              <goals>
+                <goal>jar</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
-          <artifactId>maven-source-plugin</artifactId>
-          <version>2.1.2</version>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-jar-plugin</artifactId>
+          <version>3.2.0</version>
+          <executions>
+            <execution>
+              <goals>
+                <goal>test-jar</goal>
+              </goals>
+            </execution>
+          </executions>
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.12.4</version>
+          <version>3.0.0-M5</version>
           <configuration>
             <argLine>-Xmx1024m</argLine>
+            <reportNameSuffix>sponge_log</reportNameSuffix>
           </configuration>
         </plugin>
         <plugin>
-          <artifactId>maven-war-plugin</artifactId>
-          <version>2.1</version>
-        </plugin>
-        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-checkstyle-plugin</artifactId>
-          <version>2.6</version>
+          <version>3.1.2</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>findbugs-maven-plugin</artifactId>
-          <version>2.5.2</version>
+          <version>3.0.5</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>clirr-maven-plugin</artifactId>
-          <version>2.6</version>
+          <version>2.8</version>
         </plugin>
         <plugin>
           <groupId>org.codehaus.mojo</groupId>
           <artifactId>animal-sniffer-maven-plugin</artifactId>
-          <version>1.9</version>
+          <version>1.16</version>
         </plugin>
         <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-project-info-reports-plugin</artifactId>
-          <version>2.7</version>
+          <version>3.1.2</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-site-plugin</artifactId>
+          <version>3.9.1</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-resources-plugin</artifactId>
+          <version>3.2.0</version>
+        </plugin>
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-dependency-plugin</artifactId>
+          <version>3.1.2</version>
         </plugin>
       </plugins>
     </pluginManagement>
     <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>3.0.0-M3</version><executions>
+        <execution>
+          <id>enforce-maven</id>
+          <goals>
+            <goal>enforce</goal>
+          </goals>
+          <configuration>
+            <rules>
+              <requireMavenVersion>
+                <version>[3.5.4,4.0.0)</version>
+              </requireMavenVersion>
+            </rules>
+          </configuration>
+        </execution>
+      </executions>
+      </plugin>
       <plugin>
         <artifactId>maven-javadoc-plugin</artifactId>
         <configuration>
-          <additionalparam>-Xdoclint:none</additionalparam>
+          <doclint>none</doclint>
+          <source>7</source>
         </configuration>
         <executions>
           <execution>
@@ -410,10 +371,10 @@
             <phase>site</phase>
             <configuration>
               <links>
-                <link>http://download.oracle.com/javase/6/docs/api/</link>
+                <link>http://download.oracle.com/javase/7/docs/api/</link>
                 <link>http://cloud.google.com/appengine/docs/java/javadoc</link>
-                <link>https://developers.google.com/api-client-library/java/google-http-java-client/reference/${project.http.version}</link>
-                <link>https://developers.google.com/api-client-library/java/google-http-java-client/reference/${project.oauth.version}</link>
+                <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+                <link>https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/</link>
               </links>
               <doctitle>Google API Client Library for Java ${project.version}</doctitle>
               <overview>${basedir}/overview.html</overview>
@@ -460,21 +421,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <artifactId>maven-checkstyle-plugin</artifactId>
-        <configuration>
-          <configLocation>checkstyle.xml</configLocation>
-          <consoleOutput>true</consoleOutput>
-          <suppressionsLocation>${basedir}/../checkstyle-suppressions.xml</suppressionsLocation>
-        </configuration>
-        <executions>
-          <execution>
-            <goals>
-              <goal>check</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>findbugs-maven-plugin</artifactId>
@@ -493,7 +439,7 @@
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>clirr-maven-plugin</artifactId>
         <configuration>
-          <comparisonVersion>1.19.0</comparisonVersion>
+          <comparisonVersion>1.27.0</comparisonVersion>
           <ignoredDifferencesFile>${basedir}/../clirr-ignored-differences.xml</ignoredDifferencesFile>
           <logResults>true</logResults>
         </configuration>
@@ -511,7 +457,7 @@
         <configuration>
           <signature>
             <groupId>org.codehaus.mojo.signature</groupId>
-            <artifactId>java15</artifactId>
+            <artifactId>java17</artifactId>
             <version>1.0</version>
           </signature>
         </configuration>
@@ -523,33 +469,212 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+        <groupId>com.coveo</groupId>
+        <artifactId>fmt-maven-plugin</artifactId>
+        <version>2.11</version>
+        <configuration>
+          <style>google</style>
+          <verbose>true</verbose>
+        </configuration>
+        <dependencies>
+          <dependency>
+            <groupId>com.google.googlejavaformat</groupId>
+            <artifactId>google-java-format</artifactId>
+            <version>1.10.0</version>
+          </dependency>
+        </dependencies>
+      </plugin>
     </plugins>
   </build>
   <properties>
-    <!--
-      NOTE: if you make a change to these versions, you MUST make the same change to:
-      - google-api-client-assembly/android-properties (make the filenames match the version here)
-      - google-oauth-java-client/pom.xml (versions must match)
-      - google-oauth-java-client/google-oauth-client-assembly/android-properties (make the filenames match the version here)
-      - google-http-java-client/pom.xml (versions must match)
-      - google-http-java-client/google-http-client-assembly/android-properties (make the filenames match the version here)
-      - Internally, update the default features.json file
-    -->
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <project.http.version>1.25.0-SNAPSHOT</project.http.version>
-    <project.oauth.version>1.25.0-SNAPSHOT</project.oauth.version>
+    <project.http.version>1.39.2</project.http.version>
+    <project.httpcore.version>4.4.14</project.httpcore.version>
+    <project.httpclient.version>4.5.13</project.httpclient.version>
+    <project.oauth.version>1.31.5</project.oauth.version>
     <project.jsr305.version>3.0.2</project.jsr305.version>
-    <project.gson.version>2.1</project.gson.version>
-    <project.jackson-core-asl.version>1.9.13</project.jackson-core-asl.version>
-    <project.jackson-core2.version>2.9.6</project.jackson-core2.version>
-    <project.protobuf-java.version>2.6.1</project.protobuf-java.version>
-    <project.guava.version>20.0</project.guava.version>
-    <project.appengine.version>1.7.7</project.appengine.version>
+    <project.gson.version>2.8.6</project.gson.version>
+    <project.protobuf-java.version>3.17.3</project.protobuf-java.version>
+    <project.guava.version>30.1.1-android</project.guava.version>
+    <project.appengine.version>1.9.89</project.appengine.version>
     <project.xpp3.version>1.1.4c</project.xpp3.version>
-    <project.commons-logging.version>1.1.1</project.commons-logging.version>
-    <project.httpclient.version>4.5.5</project.httpclient.version>
-    <project.httpcore.version>4.4.10</project.httpcore.version>
     <project.jdo2-api.version>2.3-eb</project.jdo2-api.version>
-    <project.transaction-api.version>1.1</project.transaction-api.version>
+    <project.datanucleus-core.version>3.2.2</project.datanucleus-core.version>
+    <project.datanucleus-api-jdo.version>3.2.1</project.datanucleus-api-jdo.version>
+    <project.datanucleus-maven-plugin.version>4.0.3</project.datanucleus-maven-plugin.version>
+    <project.servlet-api.version>2.5</project.servlet-api.version>
+    <deploy.autorelease>false</deploy.autorelease>
   </properties>
+
+  <profiles>
+    <profile>
+      <id>release-sign-artifacts</id>
+      <activation>
+        <property>
+          <name>performRelease</name>
+          <value>true</value>
+        </property>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>3.0.1</version>
+            <executions>
+              <execution>
+                <id>sign-artifacts</id>
+                <phase>verify</phase>
+                <goals>
+                  <goal>sign</goal>
+                </goals>
+                <configuration>
+                  <gpgArguments>
+                    <arg>--pinentry-mode</arg>
+                    <arg>loopback</arg>
+                  </gpgArguments>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <!-- set project.root-directory property based on where we are -->
+    <profile>
+      <id>root-directory</id>
+      <activation>
+        <file>
+          <exists>checkstyle-suppressions.xml</exists>
+        </file>
+      </activation>
+      <properties>
+        <project.root-directory>.</project.root-directory>
+      </properties>
+    </profile>
+
+    <profile>
+      <!-- Only run checkstyle plugin on Java 8+ (checkstyle artifact only supports Java 8+) -->
+      <id>checkstyle-tests</id>
+      <activation>
+        <jdk>[1.8,)</jdk>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-checkstyle-plugin</artifactId>
+            <dependencies>
+              <dependency>
+                <groupId>com.puppycrawl.tools</groupId>
+                <artifactId>checkstyle</artifactId>
+                <version>8.39</version>
+              </dependency>
+            </dependencies>
+            <configuration>
+              <configLocation>checkstyle.xml</configLocation>
+              <consoleOutput>true</consoleOutput>
+              <suppressionsLocation>checkstyle-suppressions.xml</suppressionsLocation>
+            </configuration>
+            <executions>
+              <execution>
+                <goals>
+                  <goal>check</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+
+    <profile>
+      <id>docFX</id>
+      <activation>
+        <property>
+          <!-- Activate with -P docFX -->
+          <name>docFX</name>
+        </property>
+      </activation>
+      <reporting>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>3.2.0</version>
+            <reportSets>
+              <reportSet>
+                <id>docFX</id>
+                <reports>
+                  <report>javadoc</report>
+                  <report>aggregate</report>
+                  <report>aggregate-jar</report>
+                </reports>
+              </reportSet>
+            </reportSets>
+            <configuration>
+              <doclet>com.microsoft.doclet.DocFxDoclet</doclet>
+              <useStandardDocletOptions>false</useStandardDocletOptions>
+              <docletPath>${env.KOKORO_GFILE_DIR}/java-docfx-doclet-1.0.jar</docletPath>
+              <additionalOptions>-outputpath ${project.build.directory}/docfx-yml -projectname ${artifactId}</additionalOptions>
+              <doclint>none</doclint>
+              <show>protected</show>
+              <nohelp>true</nohelp>
+              <source>7</source>
+              <groups>
+                <group>
+                  <title>google-api-client</title>
+                  <packages>com.google.api.client.googleapis*</packages>
+                </group>
+                <group>
+                  <title>google-api-client-android</title>
+                  <packages>com.google.api.client.googleapis.extensions.android.*</packages>
+                </group>
+                <group>
+                  <title>google-api-client-appengine</title>
+                  <packages>com.google.api.client.googleapis.extensions.appengine*</packages>
+                </group>
+                <group>
+                  <title>google-api-client-gson</title>
+                  <packages>com.google.api.client.googleapis.notifications.json.gson.*</packages>
+                </group>
+                <group>
+                  <title>google-api-client-jackson2</title>
+                  <packages>com.google.api.client.googleapis.notifications.json.jackson2.*</packages>
+                </group>
+                <group>
+                  <title>google-api-client-java6</title>
+                  <packages>com.google.api.client.googleapis.extensions.java6.*</packages>
+                </group>
+                <group>
+                  <title>google-api-client-protobuf</title>
+                  <packages>com.google.api.client.googleapis.services.protobuf*:com.google.api.client.googleapis.testing.services.protobuf*</packages>
+                </group>
+                <group>
+                  <title>google-api-client-servlet</title>
+                  <packages>com.google.api.client.googleapis.extensions.servlet*</packages>
+                </group>
+                <group>
+                  <title>google-api-client-xml</title>
+                  <packages>com.google.api.client.googleapis.xml.*</packages>
+                </group>
+              </groups>
+              <links>
+                <link>http://download.oracle.com/javase/7/docs/api/</link>
+                <link>http://cloud.google.com/appengine/docs/java/javadoc</link>
+                <link>https://googleapis.dev/java/google-http-client/${project.http.version}/</link>
+                <link>https://googleapis.dev/java/google-oauth-client/${project.oauth.version}/</link>
+              </links>
+            </configuration>
+          </plugin>
+        </plugins>
+      </reporting>
+    </profile>
+  </profiles>
 </project>
diff --git a/renovate.json b/renovate.json
new file mode 100644
index 000000000..68e63ff15
--- /dev/null
+++ b/renovate.json
@@ -0,0 +1,11 @@
+{
+  "extends": [
+    "config:base"
+  ],
+  "packageRules": [
+    {
+      "packagePatterns": ["^com.google.appengine:appengine-"],
+      "groupName": "AppEngine packages"
+    }
+  ]
+}
diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml
new file mode 100644
index 000000000..e3dde2ad6
--- /dev/null
+++ b/samples/install-without-bom/pom.xml
@@ -0,0 +1,84 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.cloud</groupId>
+  <artifactId>google-api-client-install-without-bom</artifactId>
+  <packaging>jar</packaging>
+  <name>Google Google API Java Client Install Without Bom</name>
+  <url>https://github.com/googleapis/google-api-java-client</url>
+
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
+  <parent>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.23</version>
+  </parent>
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+
+  <dependencies>
+    <!-- [START google-api-client_install_without_bom] -->
+    <dependency>
+      <groupId>com.google.api-client</groupId>
+      <artifactId>google-api-client</artifactId>
+      <version>1.31.5</version>
+    </dependency>
+    <!-- [END google-api-client_install_without_bom] -->
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>1.1.3</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <!-- compile and run all snippet tests -->
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.2.0</version>
+        <executions>
+          <execution>
+            <id>add-snippets-source</id>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>../snippets/src/main/java</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-snippets-tests</id>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>../snippets/src/test/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/samples/pom.xml b/samples/pom.xml
new file mode 100644
index 000000000..27ea9d9cf
--- /dev/null
+++ b/samples/pom.xml
@@ -0,0 +1,56 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.cloud</groupId>
+  <artifactId>google-cloud-google-api-client-samples</artifactId>
+  <version>0.0.1-SNAPSHOT</version><!-- This artifact should not be released -->
+  <packaging>pom</packaging>
+  <name>Google Google API Java Client Samples Parent</name>
+  <url>https://github.com/googleapis/google-api-java-client</url>
+  <description>
+    Java idiomatic client for Google Cloud Platform services.
+  </description>
+
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
+  <parent>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.23</version>
+  </parent>
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <modules>
+    <module>install-without-bom</module>
+    <module>snapshot</module>
+    <module>snippets</module>
+  </modules>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.8.2</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.sonatype.plugins</groupId>
+        <artifactId>nexus-staging-maven-plugin</artifactId>
+        <version>1.6.8</version>
+        <configuration>
+          <skipNexusStagingDeployMojo>true</skipNexusStagingDeployMojo>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project> 
diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml
new file mode 100644
index 000000000..64890ba77
--- /dev/null
+++ b/samples/snapshot/pom.xml
@@ -0,0 +1,83 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.cloud</groupId>
+  <artifactId>google-api-client-snapshot</artifactId>
+  <packaging>jar</packaging>
+  <name>Google Google API Java Client Snapshot Samples</name>
+  <url>https://github.com/googleapis/google-api-java-client</url>
+
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
+  <parent>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.23</version>
+  </parent>
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+  <!-- {x-version-update-start::current} -->
+  <dependencies>
+    <dependency>
+      <groupId>com.google.api-client</groupId>
+      <artifactId>google-api-client</artifactId>
+      <version>1.31.5</version>
+    </dependency>
+  <!-- {x-version-update-end} -->
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>1.1.3</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <!-- compile and run all snippet tests -->
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>build-helper-maven-plugin</artifactId>
+        <version>3.2.0</version>
+        <executions>
+          <execution>
+            <id>add-snippets-source</id>
+            <goals>
+              <goal>add-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>../snippets/src/main/java</source>
+              </sources>
+            </configuration>
+          </execution>
+          <execution>
+            <id>add-snippets-tests</id>
+            <goals>
+              <goal>add-test-source</goal>
+            </goals>
+            <configuration>
+              <sources>
+                <source>../snippets/src/test/java</source>
+              </sources>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
\ No newline at end of file
diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml
new file mode 100644
index 000000000..66a09abce
--- /dev/null
+++ b/samples/snippets/pom.xml
@@ -0,0 +1,60 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.google.cloud</groupId>
+  <artifactId>google-api-client-snippets</artifactId>
+  <packaging>jar</packaging>
+  <name>Google Google API Java Client Snippets</name>
+  <url>https://github.com/googleapis/google-api-java-client</url>
+
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
+  <parent>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.23</version>
+  </parent>
+
+  <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+    <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+  </properties>
+
+
+  <!-- [START google-api-client_install_with_bom] -->
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>com.google.cloud</groupId>
+        <artifactId>libraries-bom</artifactId>
+        <version>20.7.0</version>
+        <type>pom</type>
+        <scope>import</scope>
+      </dependency>
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.api-client</groupId>
+      <artifactId>google-api-client</artifactId>
+    </dependency>
+    <!-- [END google-api-client_install_with_bom] -->
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13.2</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>1.1.3</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>
diff --git a/synth.metadata b/synth.metadata
new file mode 100644
index 000000000..d4287aee8
--- /dev/null
+++ b/synth.metadata
@@ -0,0 +1,90 @@
+{
+  "sources": [
+    {
+      "git": {
+        "name": ".",
+        "remote": "https://github.com/googleapis/google-api-java-client.git",
+        "sha": "d979c5bfdeaf8bd85cd7295abf5695dc6095bad6"
+      }
+    },
+    {
+      "git": {
+        "name": "synthtool",
+        "remote": "https://github.com/googleapis/synthtool.git",
+        "sha": "87254ac89a9559864c0a245d6b150406439ce3d8"
+      }
+    }
+  ],
+  "generatedFiles": [
+    ".github/CODEOWNERS",
+    ".github/ISSUE_TEMPLATE/bug_report.md",
+    ".github/ISSUE_TEMPLATE/feature_request.md",
+    ".github/ISSUE_TEMPLATE/support_request.md",
+    ".github/PULL_REQUEST_TEMPLATE.md",
+    ".github/blunderbuss.yml",
+    ".github/generated-files-bot.yml",
+    ".github/readme/synth.py",
+    ".github/release-please.yml",
+    ".github/snippet-bot.yml",
+    ".github/sync-repo-settings.yaml",
+    ".github/trusted-contribution.yml",
+    ".github/workflows/approve-readme.yaml",
+    ".github/workflows/auto-release.yaml",
+    ".kokoro/build.bat",
+    ".kokoro/build.sh",
+    ".kokoro/coerce_logs.sh",
+    ".kokoro/common.cfg",
+    ".kokoro/common.sh",
+    ".kokoro/continuous/common.cfg",
+    ".kokoro/continuous/java8.cfg",
+    ".kokoro/continuous/readme.cfg",
+    ".kokoro/dependencies.sh",
+    ".kokoro/nightly/common.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/samples.cfg",
+    ".kokoro/populate-secrets.sh",
+    ".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/readme.sh",
+    ".kokoro/release/bump_snapshot.cfg",
+    ".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/publish_javadoc11.cfg",
+    ".kokoro/release/publish_javadoc11.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",
+    "SECURITY.md",
+    "codecov.yaml",
+    "samples/install-without-bom/pom.xml",
+    "samples/pom.xml",
+    "samples/snapshot/pom.xml",
+    "samples/snippets/pom.xml"
+  ]
+}
\ No newline at end of file
diff --git a/synth.py b/synth.py
new file mode 100644
index 000000000..26c4d5bf3
--- /dev/null
+++ b/synth.py
@@ -0,0 +1,27 @@
+
+# Copyright 2019 Google LLC
+#
+# 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
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+"""This script is used to synthesize generated parts of this library."""
+
+import synthtool.languages.java as java
+
+java.common_templates(excludes=[
+    "README.md",
+    "java.header",
+    "checkstyle.xml",
+    "renovate.json",
+    "license-checks.xml",
+    ".github/workflows/ci.yaml",
+    ".github/workflows/samples.yaml",
+])
diff --git a/versions.txt b/versions.txt
new file mode 100644
index 000000000..708ae916c
--- /dev/null
+++ b/versions.txt
@@ -0,0 +1,4 @@
+# Format:
+# module:released-version:current-version
+
+google-api-client:1.32.1:1.32.1