diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS new file mode 100644 index 000000000..54221045c --- /dev/null +++ b/.github/CODEOWNERS @@ -0,0 +1 @@ +* @googleapis/yoshi-java 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/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 000000000..3af206e9c --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,4 @@ +Fixes # (it's a good idea to open an issue first for discussion) + +- [ ] Tests pass +- [ ] Appropriate docs were updated (if necessary) diff --git a/.gitignore b/.gitignore index 5fc420eea..62b082961 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ bin/ .classpath .settings .project - +*.iml +.idea 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/continuous/common.cfg b/.kokoro/continuous/common.cfg new file mode 100644 index 000000000..7c562d48d --- /dev/null +++ b/.kokoro/continuous/common.cfg @@ -0,0 +1,24 @@ +# 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" + +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/java11.cfg b/.kokoro/continuous/java11.cfg new file mode 100644 index 000000000..709f2b4c7 --- /dev/null +++ b/.kokoro/continuous/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/continuous/java7.cfg b/.kokoro/continuous/java7.cfg new file mode 100644 index 000000000..cb24f44ee --- /dev/null +++ b/.kokoro/continuous/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/continuous/java8.cfg b/.kokoro/continuous/java8.cfg new file mode 100644 index 000000000..3b017fc80 --- /dev/null +++ b/.kokoro/continuous/java8.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/java8" +} 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/presubmit/common.cfg b/.kokoro/presubmit/common.cfg index ac47bad8b..7c562d48d 100644 --- a/.kokoro/presubmit/common.cfg +++ b/.kokoro/presubmit/common.cfg @@ -14,11 +14,11 @@ gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/trampoline" build_file: "google-api-java-client/.kokoro/trampoline.sh" env_vars: { - key: "TRAMPOLINE_BUILD_FILE" - value: "github/google-api-java-client/.kokoro/build.sh" + key: "TRAMPOLINE_BUILD_FILE" + value: "github/google-api-java-client/.kokoro/build.sh" } env_vars: { - key: "JOB_TYPE" - value: "test" + key: "JOB_TYPE" + value: "test" } diff --git a/.kokoro/presubmit/java10.cfg b/.kokoro/presubmit/java10.cfg index e560ae22f..6e2f1f5fa 100644 --- a/.kokoro/presubmit/java10.cfg +++ b/.kokoro/presubmit/java10.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java10" + 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 index 584e8ea60..cb24f44ee 100644 --- a/.kokoro/presubmit/java7.cfg +++ b/.kokoro/presubmit/java7.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java7" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java7" } diff --git a/.kokoro/presubmit/java8.cfg b/.kokoro/presubmit/java8.cfg index 34f6c33e5..3b017fc80 100644 --- a/.kokoro/presubmit/java8.cfg +++ b/.kokoro/presubmit/java8.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java8" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java8" } diff --git a/.kokoro/presubmit/java9.cfg b/.kokoro/presubmit/java9.cfg index 650dfc693..3b9c408d6 100644 --- a/.kokoro/presubmit/java9.cfg +++ b/.kokoro/presubmit/java9.cfg @@ -2,6 +2,6 @@ # Configure the docker image for kokoro-trampoline. env_vars: { - key: "TRAMPOLINE_IMAGE" - value: "gcr.io/cloud-devrel-kokoro-resources/java9" + key: "TRAMPOLINE_IMAGE" + value: "gcr.io/cloud-devrel-kokoro-resources/java9" } diff --git a/.kokoro/release/common.cfg b/.kokoro/release/common.cfg new file mode 100644 index 000000000..73e295f10 --- /dev/null +++ b/.kokoro/release/common.cfg @@ -0,0 +1,56 @@ +# 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/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 100644 index 000000000..f7d538b3a --- /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 " + + + ossrh + ${SONATYPE_USERNAME} + ${SONATYPE_PASSWORD} + + + sonatype-nexus-staging + ${SONATYPE_USERNAME} + ${SONATYPE_PASSWORD} + + + sonatype-nexus-snapshots + ${SONATYPE_USERNAME} + ${SONATYPE_PASSWORD} + + +" > $1 +} diff --git a/.kokoro/release/drop.cfg b/.kokoro/release/drop.cfg new file mode 100644 index 000000000..395a94c00 --- /dev/null +++ b/.kokoro/release/drop.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Tell the trampoline which build file to use. +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..8703880cd --- /dev/null +++ b/.kokoro/release/promote.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Tell the trampoline which build file to use. +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/stage.cfg b/.kokoro/release/stage.cfg new file mode 100644 index 000000000..dcf8f7364 --- /dev/null +++ b/.kokoro/release/stage.cfg @@ -0,0 +1,7 @@ +# Format: //devtools/kokoro/config/proto/build.proto + +# Tell the trampoline which build file to use. +env_vars: { + key: "TRAMPOLINE_BUILD_FILE" + value: "github/google-api-java-client/.kokoro/release/stage.sh" +} diff --git a/.kokoro/release/stage.sh b/.kokoro/release/stage.sh new file mode 100755 index 000000000..118c44ccd --- /dev/null +++ b/.kokoro/release/stage.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 + +source $(dirname "$0")/common.sh +source $(dirname "$0")/../install_dependencies.sh + +pushd $(dirname "$0")/../../ + +setup_environment_secrets +create_settings_xml_file "settings.xml" + +mvn clean install deploy \ + --settings settings.xml \ + -DperformRelease=true \ + -Dgpg.executable=gpg \ + -Dgpg.passphrase=${GPG_PASSPHRASE} \ + -Dgpg.homedir=${GPG_HOMEDIR} + + diff --git a/README.md b/README.md index 872b32bbd..f2d3ec80d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Google APIs Client Library for Java -- [Library maintenance](#maintenance) +- [Library Maintenance](#maintenance) - [Overview](#Overview) - [Highlighted Features](#Highlighted_Features) - [Dependencies](#Dependencies) @@ -10,8 +10,8 @@ - [Documentation](#Documentation) - [Links](#Links) -## Library maintenance -These client libraries are official supported by Google. However, these libraries are considered complete and are in maintenance mode. This means that we will address critical bugs and security issues but will not add any new features. If you're working with **Google Cloud Platform** APIs such as Datastore, Pub/Sub and many others, +## Library Maintenance +These client libraries are officially supported by Google. However, these libraries are considered complete and are in maintenance mode. This means that we will address critical bugs and security issues, but will not add any new features. 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. @@ -81,10 +81,9 @@ If you are using the old GData library, you need to ### 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. +[Google Play Services library](https://developer.android.com/google/play-services/index.html), 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 +To access other Google APIs, use the Google APIs Client Library for Java, which supports [Android 4.0 (Ice Cream Sandwich) (or higher)](https://developers.google.com/api-client-library/java/google-api-java-client/android). ### Other Java environments @@ -160,10 +159,10 @@ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws IO 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. +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 +To access other Google APIs, use the Google Client Library for Java's Android-specific +helper classes, which are well-integrated with [Android AccountManager](http://developer.android.com/reference/android/accounts/AccountManager.html). For example: @@ -190,6 +189,7 @@ directly from the [Downloads page](https://developers.google.com/api-client-libr or you can use Maven or Gradle. To use Maven, add the following lines to your pom.xml file: +[//]: # ({x-version-update-start:google-api-client:released}) ```maven @@ -197,7 +197,7 @@ To use Maven, add the following lines to your pom.xml file: com.google.api-client google-api-client - 1.25.0 + 1.28.0 @@ -210,9 +210,18 @@ repositories { mavenCentral() } dependencies { - compile 'com.google.api-client:google-api-client:1.25.0' + compile 'com.google.api-client:google-api-client:1.28.0' } ``` +[//]: # ({x-version-update-end}) + +## 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 @@ -245,6 +254,17 @@ might result, and you are not guaranteed a compilation error. ## Links -- [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) + +## Notice: Ending Java 6 Support + +Please note: since Java 6 extended support is being ended this December by Oracle, we will begin +ending Java 6 support in early 2019, with release 1.28.0 as a tentative goal. Users may still +use these libraries in Java 6 projects for some time, but going forward we will not ensure that +these libraries work in such an environment. After 1.28.0, our supported versions will include Java +7 and onward. + +For Android users, we will continue our 4.0 support. + +For questions or concerns, please file an issue in the GitHub repository. 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 @@ + + 8001 + com/google/api/client/googleapis/auth/clientlogin/** + 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 @@ - - - - - - - + + - + - + @@ -88,26 +83,26 @@ - - + + - - + + - - + + - - + + - - + + diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index ae08ec9ec..5a3ea51b9 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.28.1-SNAPSHOT ../pom.xml google-api-client-android @@ -16,7 +16,7 @@ maven-javadoc-plugin - http://download.oracle.com/javase/1.5.0/docs/api/ + http://download.oracle.com/javase/7/docs/api/ ${project.name} ${project.version} ${project.artifactId} ${project.version} 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..beacb23e0 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 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..15b986c69 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 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..74bec3625 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 @@ -301,12 +301,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-appengine/pom.xml b/google-api-client-appengine/pom.xml index d850f596d..f57ddbc56 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.26.0-SNAPSHOT + 1.28.1-SNAPSHOT ../pom.xml google-api-client-appengine @@ -15,10 +15,10 @@ maven-javadoc-plugin - http://download.oracle.com/javase/6/docs/api/ - http://code.google.com/appengine/docs/java/javadoc - http://javadoc.google-http-java-client.googlecode.com/hg/${project.http.version} - http://javadoc.google-oauth-java-client.googlecode.com/hg/${project.oauth.version} + http://download.oracle.com/javase/7/docs/api/ + https://cloud.google.com/appengine/docs/standard/java/javadoc/ + https://googleapis.github.io/google-http-java-client/releases/${project.http.version}/javadoc/ + https://googleapis.github.io/google-oauth-java-client/releases/${project.oauth.version}/javadoc/ ${project.name} ${project.version} ${project.artifactId} ${project.version} @@ -31,17 +31,11 @@ true + + google.api.client.appengine + - - - jar - compile - - jar - - - maven-source-plugin @@ -55,22 +49,6 @@ - - org.datanucleus - maven-datanucleus-plugin - 2.2.1 - - true - - - - process-classes - - enhance - - - - org.codehaus.mojo @@ -78,7 +56,7 @@ org.codehaus.mojo.signature - java16 + java17 1.0 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..20674ca8f 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 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..8a1ae2e61 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 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..a27c01188 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 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..0fabd69dd 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 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..0a640a811 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 @@ -89,4 +89,7 @@ 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..b06e3d8cf 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 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..7d90fafe7 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 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 @@ true google-api-java-client + + properties/google-api-client.jar.properties + google-api-client-${project.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-api-client-android.jar.properties + google-api-client-android-${project.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-api-client-gson.jar.properties + google-api-client-gson-${project.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-api-client-jackson2.jar.properties + google-api-client-jackson2-${project.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-api-client-protobuf.jar.properties + google-api-client-protobuf-${project.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-api-client-xml.jar.properties + google-api-client-xml-${project.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client.jar.properties + google-http-client-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-android.jar.properties + google-http-client-android-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-gson.jar.properties + google-http-client-gson-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-jackson.jar.properties + google-http-client-jackson-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-jackson2.jar.properties + google-http-client-jackson2-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-jdo.jar.properties + google-http-client-jdo-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-protobuf.jar.properties + google-http-client-protobuf-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-http-client-xml.jar.properties + google-http-client-xml-${project.http.version}.jar.properties + google-api-java-client/libs + true + + + properties/google-oauth-client.jar.properties + google-oauth-client-${project.oauth.version}.jar.properties + google-api-java-client/libs + true + dependencies google-api-java-client/dependencies + true target/libs 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 f42fd1aa9..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 @@ - - - - - - Project Dependencies - - - - - - - - - -
- -
-
-
+ + + + + + Project Dependencies + + + + + + + + + +
+ +
+
+

Project Dependencies

@@ -63,13 +63,13 @@

compile

com.google.api-client google-api-client -1.26.0-SNAPSHOT +${project.version} jar The Apache Software License, Version 2.0 com.google.http-client google-http-client-android -1.26.0-SNAPSHOT +${project.http.version} jar The Apache Software License, Version 2.0
@@ -122,19 +122,19 @@

compile

com.google.guava guava -20.0 +26.0-android jar The Apache Software License, Version 2.0 com.google.http-client google-http-client -1.26.0-SNAPSHOT +${project.http.version} jar The Apache Software License, Version 2.0 com.google.http-client google-http-client-jackson2 -1.26.0-SNAPSHOT +${project.http.version} jar The Apache Software License, Version 2.0 @@ -146,7 +146,7 @@

compile

com.google.oauth-client google-oauth-client -1.26.0-SNAPSHOT +${project.oauth.version} jar The Apache Software License, Version 2.0 @@ -229,7 +229,7 @@

Project Dependency Graph