From 1cada3906def14560593696030841c18c2e54970 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 15 Jan 2021 01:04:10 +0100 Subject: [PATCH 01/24] chore(deps): update dependency com.google.cloud:libraries-bom to v16.3.0 (#1668) --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index d2e1c569c..79ac23709 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 16.2.1 + 16.3.0 pom import From f864c6c4a7a2b9c11b719486c86d9c7c5f86389a Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 20 Jan 2021 21:17:30 +0100 Subject: [PATCH 02/24] chore(deps): update dependency com.google.api-client:google-api-client to v1.31.2 (#1670) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 3b6d8dd9d..af5ef6e35 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -29,7 +29,7 @@ com.google.api-client google-api-client - 1.31.1 + 1.31.2 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index a7355a678..0448d6484 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.api-client google-api-client - 1.31.1 + 1.31.2 From d3bad247060a09347bc6bd16a47d21bd92bdc837 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Tue, 26 Jan 2021 11:16:34 -0800 Subject: [PATCH 03/24] chore: adding docfx doclet resource (#1673) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/999a92c1-7031-4f0c-b90a-33f34b1907cf/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/3816b080296d4d52975079fd26c110dd26ba25af --- .kokoro/release/publish_javadoc.cfg | 3 +++ synth.metadata | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg index e116bedf0..f8d242111 100644 --- a/.kokoro/release/publish_javadoc.cfg +++ b/.kokoro/release/publish_javadoc.cfg @@ -27,3 +27,6 @@ before_action { } } } + +# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/ +gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx" \ No newline at end of file diff --git a/synth.metadata b/synth.metadata index 4605311af..30266efff 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/google-api-java-client.git", - "sha": "aabf57e534c852b1bb54545079e1eacfec38eb6c" + "sha": "f864c6c4a7a2b9c11b719486c86d9c7c5f86389a" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "6133907dbb3ddab204a17a15d5c53ec0aae9b033" + "sha": "3816b080296d4d52975079fd26c110dd26ba25af" } } ], From 61e17ce09b7f192f12d31ead64d961fa99119885 Mon Sep 17 00:00:00 2001 From: Justin Beckwith Date: Thu, 28 Jan 2021 22:14:25 -0800 Subject: [PATCH 04/24] build: migrate to flakybot (#1674) --- .kokoro/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.kokoro/build.sh b/.kokoro/build.sh index ec4082dc8..d4e582897 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -110,8 +110,8 @@ bash .kokoro/coerce_logs.sh if [[ "${ENABLE_BUILD_COP}" == "true" ]] then - chmod +x ${KOKORO_GFILE_DIR}/linux_amd64/buildcop - ${KOKORO_GFILE_DIR}/linux_amd64/buildcop -repo=googleapis/google-api-java-client + 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}" From 9e8699e72c5f5320ad7c4941dd12354f840de901 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 5 Feb 2021 14:57:07 +0100 Subject: [PATCH 05/24] chore(deps): update dependency org.apache.maven.plugins:maven-checkstyle-plugin to v3.1.2 (#1675) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 64243c20f..b6a0ce938 100644 --- a/pom.xml +++ b/pom.xml @@ -274,7 +274,7 @@ org.apache.maven.plugins maven-checkstyle-plugin - 3.1.1 + 3.1.2 org.codehaus.mojo From c310c1c61fba47dcb396a0e4ced2874f11c5a8af Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 5 Feb 2021 14:58:00 +0100 Subject: [PATCH 06/24] chore(deps): update dependency com.google.truth:truth to v1.1.2 (#1671) --- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index af5ef6e35..228b5ab9a 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -42,7 +42,7 @@ com.google.truth truth - 1.0.1 + 1.1.2 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index 0448d6484..c88ebb543 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -41,7 +41,7 @@ com.google.truth truth - 1.0.1 + 1.1.2 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 79ac23709..69e858a4a 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -53,7 +53,7 @@ com.google.truth truth - 1.0.1 + 1.1.2 test From 17207e39aaf9ab80ff876adf4b59fbf3b37e7386 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 10 Feb 2021 10:49:20 -0500 Subject: [PATCH 07/24] ci: fix the google style error in lint task in GitHub Actions (#1699) * ci: use Java 11 for lint * refactor: to pass Google style lint * ci: install dependencies before running GitHub Actions * ci: excluding ci.yaml from automatic sync * chore: removing ci.yaml from generated file list --- .github/workflows/ci.yaml | 7 ++++++- .../googleapis/auth/oauth2/GoogleIdTokenVerifierTest.java | 6 ++---- .../auth/oauth2/GooglePublicKeysManagerTest.java | 3 +-- .../api/client/googleapis/batch/BatchRequestTest.java | 1 - synth.metadata | 3 +-- synth.py | 1 + 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 683022075..e4dc62bfd 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,6 +16,7 @@ jobs: with: java-version: ${{matrix.java}} - run: java -version + - run: .kokoro/install_dependencies.sh - run: .kokoro/build.sh env: JOB_TYPE: test @@ -45,6 +46,7 @@ jobs: with: java-version: ${{matrix.java}} - run: java -version + - run: .kokoro/install_dependencies.sh - run: .kokoro/dependencies.sh linkage-monitor: runs-on: ubuntu-latest @@ -54,6 +56,7 @@ jobs: with: java-version: 8 - run: java -version + - run: .kokoro/install_dependencies.sh - run: .kokoro/linkage-monitor.sh lint: runs-on: ubuntu-latest @@ -61,8 +64,9 @@ jobs: - uses: actions/checkout@v2 - uses: actions/setup-java@v1 with: - java-version: 8 + java-version: 11 - run: java -version + - run: .kokoro/install_dependencies.sh - run: .kokoro/build.sh env: JOB_TYPE: lint @@ -74,6 +78,7 @@ jobs: 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/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 cd8d6cb76..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 @@ -51,8 +51,7 @@ private static Payload newPayload(String clientId) { public void testBuilder() throws Exception { GoogleIdTokenVerifier.Builder builder = new GoogleIdTokenVerifier.Builder( - new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(), - new GsonFactory()) + new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(), new GsonFactory()) .setIssuer(ISSUER) .setAudience(TRUSTED_CLIENT_IDS); assertEquals(Clock.SYSTEM, builder.getClock()); @@ -70,8 +69,7 @@ public void testBuilder() throws Exception { public void testVerify() throws Exception { GoogleIdTokenVerifier verifier = new GoogleIdTokenVerifier.Builder( - new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(), - new GsonFactory()) + new GooglePublicKeysManagerTest.PublicCertsMockHttpTransport(), new GsonFactory()) .build(); Header header = new Header(); header.setAlgorithm("RS25"); 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 af586708b..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 @@ -101,8 +101,7 @@ public LowLevelHttpResponse execute() { public void testRefresh() throws Exception { GooglePublicKeysManager certs = - new GooglePublicKeysManager.Builder( - new PublicCertsMockHttpTransport(), new GsonFactory()) + new GooglePublicKeysManager.Builder(new PublicCertsMockHttpTransport(), new GsonFactory()) .build(); certs.refresh(); assertEquals(2, certs.getPublicKeys().size()); 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 c10125e16..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; diff --git a/synth.metadata b/synth.metadata index 30266efff..be548841b 100644 --- a/synth.metadata +++ b/synth.metadata @@ -29,7 +29,6 @@ ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", - ".github/workflows/ci.yaml", ".github/workflows/samples.yaml", ".kokoro/build.bat", ".kokoro/build.sh", @@ -86,4 +85,4 @@ "samples/snapshot/pom.xml", "samples/snippets/pom.xml" ] -} \ No newline at end of file +} diff --git a/synth.py b/synth.py index 24ab1bcac..141919e36 100644 --- a/synth.py +++ b/synth.py @@ -22,4 +22,5 @@ "checkstyle.xml", "renovate.json", "license-checks.xml", + ".github/workflows/ci.yaml", ]) From 69fa89047e44dae9bd5a2f0579eb4257248e7c6c Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 10 Feb 2021 17:06:24 +0100 Subject: [PATCH 08/24] chore(deps): update dependency com.google.cloud:libraries-bom to v16.4.0 (#1696) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `16.3.0` -> `16.4.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/16.4.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/16.4.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/16.4.0/compatibility-slim/16.3.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/16.4.0/confidence-slim/16.3.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-api-java-client). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 69e858a4a..076ab4300 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 16.3.0 + 16.4.0 pom import From 173e0dd106ee40ce99138bdb435a845985a2ab17 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Wed, 10 Feb 2021 13:11:50 -0500 Subject: [PATCH 09/24] ci: removing style check for the empty sample project (#1701) --- .github/workflows/samples.yaml | 14 -------------- synth.metadata | 1 - synth.py | 1 + 3 files changed, 1 insertion(+), 15 deletions(-) delete mode 100644 .github/workflows/samples.yaml diff --git a/.github/workflows/samples.yaml b/.github/workflows/samples.yaml deleted file mode 100644 index c46230a78..000000000 --- a/.github/workflows/samples.yaml +++ /dev/null @@ -1,14 +0,0 @@ -on: - pull_request: -name: samples -jobs: - checkstyle: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - name: Run checkstyle - run: mvn -P lint --quiet --batch-mode checkstyle:check - working-directory: samples/snippets diff --git a/synth.metadata b/synth.metadata index be548841b..90999165f 100644 --- a/synth.metadata +++ b/synth.metadata @@ -29,7 +29,6 @@ ".github/trusted-contribution.yml", ".github/workflows/approve-readme.yaml", ".github/workflows/auto-release.yaml", - ".github/workflows/samples.yaml", ".kokoro/build.bat", ".kokoro/build.sh", ".kokoro/coerce_logs.sh", diff --git a/synth.py b/synth.py index 141919e36..26c4d5bf3 100644 --- a/synth.py +++ b/synth.py @@ -23,4 +23,5 @@ "renovate.json", "license-checks.xml", ".github/workflows/ci.yaml", + ".github/workflows/samples.yaml", ]) From 922af40e2b3226ad505374a64132e9c071c8a6ce Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Thu, 11 Feb 2021 11:24:14 -0500 Subject: [PATCH 10/24] ci: fix "ci / dependencies" GitHub checks (#1703) * chore(deps): used-but-undeclared dependencies at google-api-client * chore(deps): fixed dependency problem at google-api-client-servlet * chore(deps): fixed dependencies problem at google-api-client-android * chore(deps): fixed dependency problem at google-api-client-appengine * chore(deps): fixed dependency problem at google-api-client-jackson2 * chore(deps): fixed dependency problem at google-api-client-java6 * chore(deps): fixed dependency problem at google-api-client-gson * chore(deps): fixed dependency problem at google-api-client-protobuf * chore(deps): fixed dependency problem at google-api-client-xml * chore(deps): upgraded maven-dependency-plugin to avoid false positive The maven-dependency-plugin 2.8 would show google-api-client-java6 does not use google-api-client. However, the module does not compile without google-api-client: [ERROR] /Users/suztomo/google-api-java-client/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java:[34,12] cannot find symbol [ERROR] symbol: variable GoogleOAuthConstants [ERROR] location: class com.google.api.client.googleapis.extensions.java6.auth.oauth2.GooglePromptReceive Therefore, the version of the dependency plugin showing false positive. The newer version of maven-dependency-plugin shows the correct result. --- google-api-client-android/pom.xml | 6 +---- google-api-client-appengine/pom.xml | 25 ++++++++++--------- google-api-client-gson/pom.xml | 4 +++ google-api-client-jackson2/pom.xml | 6 ++++- google-api-client-java6/pom.xml | 5 ---- google-api-client-protobuf/pom.xml | 4 +++ google-api-client-servlet/pom.xml | 13 ++-------- google-api-client-xml/pom.xml | 8 ++++-- google-api-client/pom.xml | 38 +++++++++++++++++++---------- pom.xml | 17 +++++++++++++ 10 files changed, 78 insertions(+), 48 deletions(-) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index e44f94913..4a80e69c1 100644 --- a/google-api-client-android/pom.xml +++ b/google-api-client-android/pom.xml @@ -43,13 +43,9 @@ 4.1.1.4 provided - - com.google.api-client - google-api-client - com.google.http-client - google-http-client-android + google-http-client com.google.android.google-play-services diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index afa509049..4b1e6e792 100644 --- a/google-api-client-appengine/pom.xml +++ b/google-api-client-appengine/pom.xml @@ -91,9 +91,22 @@ appengine-api-1.0-sdk provided + + javax.servlet + servlet-api + provided + + + com.google.http-client + google-http-client + + + com.google.http-client + google-http-client-gson + com.google.oauth-client - google-oauth-client-appengine + google-oauth-client com.google.api-client @@ -113,15 +126,5 @@ junit test - - com.google.http-client - google-http-client-jackson2 - test - - - com.google.guava - guava - test - diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 76de1fbc1..a246aa911 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -76,6 +76,10 @@ com.google.api-client google-api-client + + com.google.http-client + google-http-client + com.google.http-client google-http-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 33564e73d..43cde1ae8 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -78,7 +78,11 @@ com.google.http-client - google-http-client-jackson2 + google-http-client-gson + + + com.google.http-client + google-http-client diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index 027654c64..7c2a623a1 100644 --- a/google-api-client-java6/pom.xml +++ b/google-api-client-java6/pom.xml @@ -92,10 +92,5 @@ com.google.oauth-client google-oauth-client-java6 - - junit - junit - test - diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index ae778fe10..c8163e623 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -98,6 +98,10 @@ com.google.http-client google-http-client-protobuf + + com.google.http-client + google-http-client + com.google.api-client google-api-client diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index 45c0c8b0a..9cd95999a 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -73,26 +73,17 @@ - - com.google.oauth-client - google-oauth-client-servlet - com.google.api-client google-api-client - junit - junit - test + com.google.http-client + google-http-client javax.servlet servlet-api - - javax.jdo - jdo2-api - diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index 62699c3f9..b91885a4f 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -73,8 +73,12 @@ - com.google.api-client - google-api-client + xpp3 + xpp3 + + + com.google.http-client + google-http-client com.google.http-client diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index ea94a8f6c..b36ca732c 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -125,29 +125,41 @@ com.google.http-client google-http-client-gson + + com.google.guava + guava + com.google.http-client - google-http-client-protobuf - test + google-http-client-apache-v2 - junit - junit - test + org.apache.httpcomponents + httpcore - commons-codec - commons-codec - provided - 1.15 - + org.apache.httpcomponents + httpclient + - com.google.guava - guava + com.google.http-client + google-http-client + + + com.google.protobuf + protobuf-java + test com.google.http-client - google-http-client-apache-v2 + google-http-client-protobuf + test + + junit + junit + test + + diff --git a/pom.xml b/pom.xml index b6a0ce938..c08b7c1da 100644 --- a/pom.xml +++ b/pom.xml @@ -121,6 +121,16 @@ servlet-api ${project.servlet-api.version} + + org.apache.httpcomponents + httpcore + ${project.httpcore.version} + + + org.apache.httpcomponents + httpclient + ${project.httpclient.version} + com.google.http-client google-http-client-bom @@ -306,6 +316,11 @@ maven-resources-plugin 3.2.0 + + org.apache.maven.plugins + maven-dependency-plugin + 3.1.2 + @@ -466,6 +481,8 @@ UTF-8 1.38.1 + 4.4.14 + 4.5.13 1.31.4 3.0.2 2.8.6 From 60cce2ad8ed156263835f6ad148d1dd2704c175d Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 12 Feb 2021 09:17:18 -0500 Subject: [PATCH 11/24] ci: installing google-play-services artifact for Windows (#1706) * ci: installing google-play-services artifact for Windows * ci: trying Invoke-WebRequest * ci: cont line characters * ci: make mvn command in one line * ci: using Windows bash * ci: trying multi-line and shell for build.sh * ci: upgrading checkstyle dependency * ci: updating checkstyle version * ci: upgraded checkstyle version * ci: turning off auto-crlf conversion for checkout action * ci: cleanup suppressions file filter * ci: specifying file path that works both windows and unix --- .github/workflows/ci.yaml | 20 +++++++++++++++++++- checkstyle-suppressions.xml | 9 ++------- checkstyle.xml | 36 ++++++++++++++++-------------------- pom.xml | 2 +- 4 files changed, 38 insertions(+), 29 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e4dc62bfd..1b268c3ee 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,12 +27,30 @@ jobs: 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 - - run: .kokoro/build.bat + - 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: 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"> - - - - - - - + + diff --git a/checkstyle.xml b/checkstyle.xml index fc5ea564d..2fcb7a388 100644 --- a/checkstyle.xml +++ b/checkstyle.xml @@ -72,12 +72,8 @@ page at http://checkstyle.sourceforge.net/config.html --> - - - - @@ -183,22 +179,6 @@ page at http://checkstyle.sourceforge.net/config.html --> --> - - - - - - - - - - @@ -316,7 +296,23 @@ page at http://checkstyle.sourceforge.net/config.html --> --> + + + + + + + + + + diff --git a/pom.xml b/pom.xml index c08b7c1da..60538c40b 100644 --- a/pom.xml +++ b/pom.xml @@ -561,7 +561,7 @@ com.puppycrawl.tools checkstyle - 8.23 + 8.39 From b28dcc804206ba201cf9c081cc226aff71846c0f Mon Sep 17 00:00:00 2001 From: Jeff Ching Date: Fri, 12 Feb 2021 07:56:26 -0800 Subject: [PATCH 12/24] chore(docs): update GoogleCredential samples to use google-auth-library (#1440) * chore(docs): update GoogleCredential samples to use google-auth-library * use gson * use trusted transport: * fix mismerge --- docs/oauth-2.0.md | 79 ++++++++++++++++++++++++++++++----------------- 1 file changed, 50 insertions(+), 29 deletions(-) diff --git a/docs/oauth-2.0.md b/docs/oauth-2.0.md index 6156d629d..56a72b165 100644 --- a/docs/oauth-2.0.md +++ b/docs/oauth-2.0.md @@ -38,23 +38,31 @@ that runs in browser. For instructions on setting up your credentials properly, see the [API Console Help][console-help]. -## Credential +## Credentials -### GoogleCredential +### GoogleCredentials -[`GoogleCredential`][google-credential] is a thread-safe helper class for OAuth +[`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 -HttpTransport httpTransport = GoogleNetHttpTransport.newTrustedTransport(); -JsonFactory jsonFactory = JacksonFactory.getDefaultInstance(); - -GoogleCredentials googleCredentials = GoogleCredentials.create(access_token); -HttpRequestInitializer requestInitializer = new HttpCredentialsAdapter(googleCredentials); - -Storage storage = new Storage.Builder(httpTransport, jsonFactory, requestInitializer) - .setApplicationName("MyProject-1234") +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(); ``` @@ -70,24 +78,38 @@ Use [`AppIdentityCredential`][app-identity-credential] (from App Engine takes care of all of the details. You only specify the OAuth 2.0 scope you need. -Example code taken from [urlshortener-robots-appengine-sample][urlshortener-sample]: - ```java -static Urlshortener newUrlshortener() { - AppIdentityCredential credential = - new AppIdentityCredential( - Collections.singletonList(UrlshortenerScopes.URLSHORTENER)); - return new Urlshortener.Builder(new UrlFetchTransport(), - JacksonFactory.getDefaultInstance(), - credential) - .build(); -} +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. [GoogleCredential][google-credential] takes +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 @@ -201,7 +223,7 @@ public class CalendarServletSample extends AbstractAuthorizationCodeServlet { @Override protected AuthorizationCodeFlow initializeFlow() throws IOException { return new GoogleAuthorizationCodeFlow.Builder( - new NetHttpTransport(), JacksonFactory.getDefaultInstance(), + new NetHttpTransport(), GsonFactory.getDefaultInstance(), "[[ENTER YOUR CLIENT ID]]", "[[ENTER YOUR CLIENT SECRET]]", Collections.singleton(CalendarScopes.CALENDAR)).setDataStoreFactory( DATA_STORE_FACTORY).setAccessType("offline").build(); @@ -238,7 +260,7 @@ public class CalendarServletCallbackSample extends AbstractAuthorizationCodeCall @Override protected AuthorizationCodeFlow initializeFlow() throws IOException { return new GoogleAuthorizationCodeFlow.Builder( - new NetHttpTransport(), JacksonFactory.getDefaultInstance() + new NetHttpTransport(), GsonFactory.getDefaultInstance() "[[ENTER YOUR CLIENT ID]]", "[[ENTER YOUR CLIENT SECRET]]", Collections.singleton(CalendarScopes.CALENDAR)).setDataStoreFactory( DATA_STORE_FACTORY).setAccessType("offline").build(); @@ -342,7 +364,7 @@ For an additional sample, see ### Service accounts -[GoogleCredential][google-credential] also supports [service accounts][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 @@ -352,7 +374,7 @@ For example, you can make a request in the following way: ```java HttpTransport httpTransport = GoogleNetHttpTransport.newTrustedTransport(); -JsonFactory jsonFactory = JacksonFactory.getDefaultInstance(); +JsonFactory jsonFactory = GsonFactory.getDefaultInstance(); //Build service account credential GoogleCredentials googleCredentials = GoogleCredentials. @@ -530,7 +552,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { } ``` -[google-credential]: https://googleapis.dev/java/google-auth-library/latest/com/google/auth/oauth2/GoogleCredentials.html +[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 @@ -539,7 +561,6 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) { [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 -[urlshortener-sample]: https://github.com/google/google-api-java-client-samples/tree/master/urlshortener-robots-appengine-sample [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 From 0b5202a9eaf489cd231a05f9bf651773f8de5957 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Sat, 13 Feb 2021 09:20:31 -0500 Subject: [PATCH 13/24] chore: declaring pom type for google-api-client-assembly (#1690) Fixes #1686 --- google-api-client-bom/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index c08b3d8b7..e875bd24e 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -79,6 +79,7 @@ com.google.api-client google-api-client-assembly 1.31.2 + pom com.google.api-client From 25bf3233d36d48e61facb8e2e5bdf5a85c65faf3 Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Tue, 16 Feb 2021 12:25:53 -0500 Subject: [PATCH 14/24] ci: required check to remove Kokoro Linkage Monitor (#1709) This adds other GitHub Actions in the repository --- .github/sync-repo-settings.yaml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index af5dd3bd5..5f013f14b 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -28,11 +28,19 @@ branchProtectionRules: requiresStrictStatusChecks: false # List of required status check contexts that must pass for commits to be accepted to matching branches. requiredStatusCheckContexts: + - "units (7)" + - "units (8)" + - "units (11)" + - "windows" + - "dependencies (8)" + - "dependencies (11)" + - "linkage-monitor" + - "lint" + - "clirr" - "Kokoro - Test: Binary Compatibility" - "Kokoro - Test: Java 11" - "Kokoro - Test: Java 7" - "Kokoro - Test: Java 8" - - "Kokoro - Test: Linkage Monitor" - "cla/google" # List of explicit permissions to add (additive only) From ab908343c43beb6bb9123402ec1b850407504fa9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 16 Feb 2021 17:32:03 +0000 Subject: [PATCH 15/24] chore(master): release 1.31.3-SNAPSHOT (#1681) :robot: I have created a release \*beep\* \*boop\* --- ### Updating meta-information for bleeding-edge SNAPSHOT release. --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- google-api-client-android/pom.xml | 2 +- google-api-client-appengine/pom.xml | 2 +- google-api-client-assembly/pom.xml | 2 +- google-api-client-bom/pom.xml | 20 ++++++++++---------- google-api-client-gson/pom.xml | 2 +- google-api-client-jackson2/pom.xml | 2 +- google-api-client-java6/pom.xml | 2 +- google-api-client-protobuf/pom.xml | 2 +- google-api-client-servlet/pom.xml | 2 +- google-api-client-xml/pom.xml | 2 +- google-api-client/pom.xml | 2 +- pom.xml | 2 +- versions.txt | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 4a80e69c1..4da8f8726 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.31.2 + 1.31.3-SNAPSHOT ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 4b1e6e792..1a5bd5bc5 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.31.2 + 1.31.3-SNAPSHOT ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 2571591c7..2c41b66ec 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.2 + 1.31.3-SNAPSHOT ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index e875bd24e..68adc09be 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api-client google-api-client-bom - 1.31.2 + 1.31.3-SNAPSHOT pom Google API Client Library for Java BOM @@ -63,17 +63,17 @@ com.google.api-client google-api-client - 1.31.2 + 1.31.3-SNAPSHOT com.google.api-client google-api-client-android - 1.31.2 + 1.31.3-SNAPSHOT com.google.api-client google-api-client-appengine - 1.31.2 + 1.31.3-SNAPSHOT com.google.api-client @@ -84,32 +84,32 @@ com.google.api-client google-api-client-gson - 1.31.2 + 1.31.3-SNAPSHOT com.google.api-client google-api-client-jackson2 - 1.31.2 + 1.31.3-SNAPSHOT com.google.api-client google-api-client-java6 - 1.31.2 + 1.31.3-SNAPSHOT com.google.api-client google-api-client-protobuf - 1.31.2 + 1.31.3-SNAPSHOT com.google.api-client google-api-client-servlet - 1.31.2 + 1.31.3-SNAPSHOT com.google.api-client google-api-client-xml - 1.31.2 + 1.31.3-SNAPSHOT diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index a246aa911..7d31bb765 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.2 + 1.31.3-SNAPSHOT ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 43cde1ae8..6cecd17e6 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.2 + 1.31.3-SNAPSHOT ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index 7c2a623a1..71f8e62e9 100644 --- a/google-api-client-java6/pom.xml +++ b/google-api-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.2 + 1.31.3-SNAPSHOT ../pom.xml google-api-client-java6 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index c8163e623..b1deaaf8e 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.2 + 1.31.3-SNAPSHOT ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index 9cd95999a..d08ee7890 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.2 + 1.31.3-SNAPSHOT ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index b91885a4f..8cbd7e72b 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.2 + 1.31.3-SNAPSHOT ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index b36ca732c..0803f83b7 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.2 + 1.31.3-SNAPSHOT ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index 60538c40b..3fa5dcef2 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.google.api-client google-api-client-parent - 1.31.2 + 1.31.3-SNAPSHOT pom Parent for the Google API Client Library for Java diff --git a/versions.txt b/versions.txt index 1a2f9545c..4a8b3aab8 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:1.31.2:1.31.2 +google-api-client:1.31.2:1.31.3-SNAPSHOT From 0b73f5f8001abf2ddb9d592360929310a4145ce6 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 17 Feb 2021 22:51:33 +0100 Subject: [PATCH 16/24] chore(deps): update dependency junit:junit to v4.13.2 (#1711) --- pom.xml | 2 +- samples/install-without-bom/pom.xml | 2 +- samples/snapshot/pom.xml | 2 +- samples/snippets/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 3fa5dcef2..632268939 100644 --- a/pom.xml +++ b/pom.xml @@ -89,7 +89,7 @@ junit junit - 4.13.1 + 4.13.2 com.google.appengine diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 228b5ab9a..c2c0d9844 100644 --- a/samples/install-without-bom/pom.xml +++ b/samples/install-without-bom/pom.xml @@ -36,7 +36,7 @@ junit junit - 4.13.1 + 4.13.2 test diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index c88ebb543..8ef2602dc 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -35,7 +35,7 @@ junit junit - 4.13.1 + 4.13.2 test diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 076ab4300..8765057b0 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -47,7 +47,7 @@ junit junit - 4.13.1 + 4.13.2 test From 9c1b449d369b4e09230ff459be42a9145901dcea Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Fri, 19 Feb 2021 10:35:42 -0500 Subject: [PATCH 17/24] ci: linkage monitor CI update to stop using .kokoro/linkage-monitor.sh (#1718) * ci: linkage monitor configuration to synthtool's change expects the ci.yaml to use the Linkage Monitor GitHub Actions. (It deletes .kokoro/linkage-monitor.sh) https://github.com/googleapis/google-api-java-client/pull/1717 However this repository excludes ci.yaml being managed by synthtool. Therefore we need to manually maintain ci.yaml to stop using linkage-monitor.sh. * ci: install dependencies for Linkage Monitor --- .github/workflows/ci.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 1b268c3ee..16e5abaa7 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -75,7 +75,11 @@ jobs: java-version: 8 - run: java -version - run: .kokoro/install_dependencies.sh - - run: .kokoro/linkage-monitor.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: From 3c6090e8d17338f4e1cc1e477e706b6c0f05dcca Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Fri, 19 Feb 2021 22:33:44 +0100 Subject: [PATCH 18/24] chore(deps): update dependency com.google.protobuf:protobuf-java to v3.15.0 (#1722) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 632268939..51b5655ac 100644 --- a/pom.xml +++ b/pom.xml @@ -486,7 +486,7 @@ 1.31.4 3.0.2 2.8.6 - 3.14.0 + 3.15.0 30.1-android 1.9.84 1.1.4c From ecfb1fb5ea2eff9903683130466027b5b96f46cf Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Tue, 23 Feb 2021 14:28:05 +0100 Subject: [PATCH 19/24] chore(deps): update dependency com.google.protobuf:protobuf-java to v3.15.1 (#1726) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 51b5655ac..413e3774a 100644 --- a/pom.xml +++ b/pom.xml @@ -486,7 +486,7 @@ 1.31.4 3.0.2 2.8.6 - 3.15.0 + 3.15.1 30.1-android 1.9.84 1.1.4c From 253ec2829147c0243182fe38a254c8ee797fc480 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Wed, 24 Feb 2021 20:36:30 +0100 Subject: [PATCH 20/24] chore(deps): update dependency com.google.cloud:libraries-bom to v17 (#1730) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `16.4.0` -> `17.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/17.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/17.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/17.0.0/compatibility-slim/16.4.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/17.0.0/confidence-slim/16.4.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-api-java-client). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 8765057b0..5e224bafc 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 16.4.0 + 17.0.0 pom import From cb1ab36b7253ff0e9eae9b44d460abb1c4d85f8f Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 25 Feb 2021 16:08:15 +0100 Subject: [PATCH 21/24] chore(deps): update dependency com.google.cloud:libraries-bom to v18 (#1732) [![WhiteSource Renovate](https://app.renovatebot.com/images/banner.svg)](https://renovatebot.com) This PR contains the following updates: | Package | Change | Age | Adoption | Passing | Confidence | |---|---|---|---|---|---| | [com.google.cloud:libraries-bom](https://togithub.com/GoogleCloudPlatform/cloud-opensource-java) | `17.0.0` -> `18.0.0` | [![age](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/18.0.0/age-slim)](https://docs.renovatebot.com/merge-confidence/) | [![adoption](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/18.0.0/adoption-slim)](https://docs.renovatebot.com/merge-confidence/) | [![passing](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/18.0.0/compatibility-slim/17.0.0)](https://docs.renovatebot.com/merge-confidence/) | [![confidence](https://badges.renovateapi.com/packages/maven/com.google.cloud:libraries-bom/18.0.0/confidence-slim/17.0.0)](https://docs.renovatebot.com/merge-confidence/) | --- ### Renovate configuration :date: **Schedule**: At any time (no schedule defined). :vertical_traffic_light: **Automerge**: Disabled by config. Please merge this manually once you are satisfied. :recycle: **Rebasing**: Whenever PR becomes conflicted, or you tick the rebase/retry checkbox. :no_bell: **Ignore**: Close this PR and you won't be reminded about this update again. --- - [ ] If you want to rebase/retry this PR, check this box --- This PR has been generated by [WhiteSource Renovate](https://renovate.whitesourcesoftware.com). View repository job log [here](https://app.renovatebot.com/dashboard#github/googleapis/google-api-java-client). --- samples/snippets/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 5e224bafc..d7ef7a853 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 17.0.0 + 18.0.0 pom import From 918fc3bc2eb45d704edad6c02ca811348c6df922 Mon Sep 17 00:00:00 2001 From: WhiteSource Renovate Date: Thu, 25 Feb 2021 18:19:55 +0100 Subject: [PATCH 22/24] deps: update google-http-client to v1.39.0 (#1731) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 413e3774a..ef210edb8 100644 --- a/pom.xml +++ b/pom.xml @@ -480,7 +480,7 @@ UTF-8 - 1.38.1 + 1.39.0 4.4.14 4.5.13 1.31.4 From 98bf6748940f831a81edf74632545986c9711e0c Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 1 Mar 2021 13:30:00 -0800 Subject: [PATCH 23/24] chore: Re-generated to pick up changes from synthtool (#1717) * changes without context autosynth cannot find the source of changes triggered by earlier changes in this repository, or by version upgrades to tools such as linters. * build: migrate to flakybot Source-Author: Justin Beckwith Source-Date: Thu Jan 28 22:22:38 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: d1bb9173100f62c0cfc8f3138b62241e7f47ca6a Source-Link: https://github.com/googleapis/synthtool/commit/d1bb9173100f62c0cfc8f3138b62241e7f47ca6a * build(java): generate docfx yml on release * feat: generate docfx yml on release * fix: updates name variable * fix: remove non needed resource * fix: update date Source-Author: Emily Ball Source-Date: Mon Feb 1 15:24:59 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: 5de29e9434b63ea6d7e46dc348521c62969af1a1 Source-Link: https://github.com/googleapis/synthtool/commit/5de29e9434b63ea6d7e46dc348521c62969af1a1 * build(java): run linkage monitor as GitHub action Source-Author: Tomo Suzuki Source-Date: Tue Feb 2 16:20:26 2021 -0500 Source-Repo: googleapis/synthtool Source-Sha: e935c9ecb47da0f2e054f5f1845f7cf7c95fa625 Source-Link: https://github.com/googleapis/synthtool/commit/e935c9ecb47da0f2e054f5f1845f7cf7c95fa625 * build(java): update autorelease branch name check In response to the new multi release branch changes. Source-Author: Stephanie Wang Source-Date: Wed Feb 3 15:06:07 2021 -0500 Source-Repo: googleapis/synthtool Source-Sha: 140ba24a136c63e7f10a998a63e7898aed63ea7d Source-Link: https://github.com/googleapis/synthtool/commit/140ba24a136c63e7f10a998a63e7898aed63ea7d * chore: remove leading newline from LICENSE Co-authored-by: Christopher Wilcox Source-Author: Justin Beckwith Source-Date: Wed Feb 3 15:37:31 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: 27b2d4f4674840628d0b75c5941e89c12af4764f Source-Link: https://github.com/googleapis/synthtool/commit/27b2d4f4674840628d0b75c5941e89c12af4764f * fix: update repo name java-memcache set for all accidentally Source-Author: Emily Ball Source-Date: Thu Feb 4 10:39:41 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: 692715c0f23a7bb3bfbbaa300f7620ddfa8c47e5 Source-Link: https://github.com/googleapis/synthtool/commit/692715c0f23a7bb3bfbbaa300f7620ddfa8c47e5 * build(java): update autorelease script Noticed the workflow was getting skipped on all the release PRs. Updating due to recent update in release-please branch name. Source-Author: Stephanie Wang Source-Date: Tue Feb 9 19:10:03 2021 -0500 Source-Repo: googleapis/synthtool Source-Sha: 2414b817065726eae0bc525346c7e874f969369d Source-Link: https://github.com/googleapis/synthtool/commit/2414b817065726eae0bc525346c7e874f969369d * chore: update cloud-rad buckets doclava v2 => staging docFX v3 => prod Source-Author: Emily Ball Source-Date: Tue Feb 16 17:02:08 2021 -0800 Source-Repo: googleapis/synthtool Source-Sha: b416a7befcdbc42de41cf387dcf428f894fb812b Source-Link: https://github.com/googleapis/synthtool/commit/b416a7befcdbc42de41cf387dcf428f894fb812b * fix: don't log downloads @chingor13 This change keeps Maven 3.6.1 and later from spamming our CI logs with page after page of lists of artifacts it's downloading that makes it much harder to find the actual test output. Source-Author: Elliotte Rusty Harold Source-Date: Thu Feb 18 19:58:59 2021 +0000 Source-Repo: googleapis/synthtool Source-Sha: 1aeca92e4a38f47134cb955f52ea76f84f09ff88 Source-Link: https://github.com/googleapis/synthtool/commit/1aeca92e4a38f47134cb955f52ea76f84f09ff88 * build: reduce download junk in log files * fix: less download junk log files * Update build.sh Source-Author: Elliotte Rusty Harold Source-Date: Fri Feb 19 01:42:29 2021 +0000 Source-Repo: googleapis/synthtool Source-Sha: 6946fd71ae9215b0e7ae188f5057df765ee6d7d2 Source-Link: https://github.com/googleapis/synthtool/commit/6946fd71ae9215b0e7ae188f5057df765ee6d7d2 --- .github/workflows/auto-release.yaml | 6 +-- .kokoro/build.sh | 4 +- .kokoro/dependencies.sh | 4 +- .kokoro/linkage-monitor.sh | 46 ---------------------- .kokoro/release/publish_javadoc.cfg | 9 ++--- .kokoro/release/publish_javadoc.sh | 2 +- .kokoro/release/publish_javadoc11.cfg | 30 +++++++++++++++ .kokoro/release/publish_javadoc11.sh | 55 +++++++++++++++++++++++++++ LICENSE | 1 - synth.metadata | 9 +++-- 10 files changed, 102 insertions(+), 64 deletions(-) delete mode 100755 .kokoro/linkage-monitor.sh create mode 100644 .kokoro/release/publish_javadoc11.cfg create mode 100755 .kokoro/release/publish_javadoc11.sh diff --git a/.github/workflows/auto-release.yaml b/.github/workflows/auto-release.yaml index 2b6cdbc97..7c8816a7d 100644 --- a/.github/workflows/auto-release.yaml +++ b/.github/workflows/auto-release.yaml @@ -4,7 +4,7 @@ name: auto-release jobs: approve: runs-on: ubuntu-latest - if: contains(github.head_ref, 'release-v') + if: contains(github.head_ref, 'release-please') steps: - uses: actions/github-script@v3 with: @@ -16,8 +16,8 @@ jobs: return; } - // only approve PRs like "chore: release " - if ( !context.payload.pull_request.title.startsWith("chore: release") ) { + // only approve PRs like "chore(master): release " + if ( !context.payload.pull_request.title.startsWith("chore(master): release") ) { return; } diff --git a/.kokoro/build.sh b/.kokoro/build.sh index d4e582897..144780874 100755 --- a/.kokoro/build.sh +++ b/.kokoro/build.sh @@ -29,7 +29,7 @@ echo ${JOB_TYPE} # attempt to install 3 times with exponential backoff (starting with 10 seconds) retry_with_backoff 3 10 \ - mvn install -B -V \ + mvn install -B -V -ntp \ -DskipTests=true \ -Dclirr.skip=true \ -Denforcer.skip=true \ @@ -60,6 +60,7 @@ javadoc) ;; integration) mvn -B ${INTEGRATION_TEST_ARGS} \ + -ntp \ -Penable-integration-tests \ -DtrimStackTrace=false \ -Dclirr.skip=true \ @@ -81,6 +82,7 @@ samples) pushd ${SAMPLES_DIR} mvn -B \ -Penable-samples \ + -ntp \ -DtrimStackTrace=false \ -Dclirr.skip=true \ -Denforcer.skip=true \ diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index c91e5a569..0fb8c8436 100755 --- a/.kokoro/dependencies.sh +++ b/.kokoro/dependencies.sh @@ -31,7 +31,7 @@ export MAVEN_OPTS="-Xmx1024m -XX:MaxPermSize=128m" # this should run maven enforcer retry_with_backoff 3 10 \ - mvn install -B -V \ + mvn install -B -V -ntp \ -DskipTests=true \ -Dclirr.skip=true @@ -86,4 +86,4 @@ then else msg "Errors found. See log statements above." exit 1 -fi \ No newline at end of file +fi diff --git a/.kokoro/linkage-monitor.sh b/.kokoro/linkage-monitor.sh deleted file mode 100755 index 759ab4e2c..000000000 --- a/.kokoro/linkage-monitor.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/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 -# Display commands being run. -set -x - -## 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 version -java -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 \ - -DskipTests=true \ - -Dclirr.skip=true \ - -Denforcer.skip=true \ - -Dmaven.javadoc.skip=true \ - -Dgcloud.download.skip=true - -# Kokoro job cloud-opensource-java/ubuntu/linkage-monitor-gcs creates this JAR -JAR=linkage-monitor-latest-all-deps.jar -curl -v -O "https://storage.googleapis.com/cloud-opensource-java-linkage-monitor/${JAR}" - -# Fails if there's new linkage errors compared with baseline -java -jar ${JAR} com.google.cloud:libraries-bom diff --git a/.kokoro/release/publish_javadoc.cfg b/.kokoro/release/publish_javadoc.cfg index f8d242111..b9d08f976 100644 --- a/.kokoro/release/publish_javadoc.cfg +++ b/.kokoro/release/publish_javadoc.cfg @@ -7,10 +7,10 @@ env_vars: { value: "docs-staging" } +# cloud-rad staging env_vars: { key: "STAGING_BUCKET_V2" - value: "docs-staging-v2" - # Production will be at: docs-staging-v2 + value: "docs-staging-v2-staging" } env_vars: { @@ -26,7 +26,4 @@ before_action { keyname: "docuploader_service_account" } } -} - -# Downloads docfx doclet resource. This will be in ${KOKORO_GFILE_DIR}/ -gfile_resources: "/bigstore/cloud-devrel-kokoro-resources/docfx" \ No newline at end of file +} \ No newline at end of file diff --git a/.kokoro/release/publish_javadoc.sh b/.kokoro/release/publish_javadoc.sh index 2e8da5c70..187fa02f9 100755 --- a/.kokoro/release/publish_javadoc.sh +++ b/.kokoro/release/publish_javadoc.sh @@ -71,7 +71,7 @@ python3 -m docuploader create-metadata \ --version ${VERSION} \ --language java -# upload docs +# upload docs to staging bucket python3 -m docuploader upload . \ --credentials ${CREDENTIALS} \ --staging-bucket ${STAGING_BUCKET_V2} 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}/ +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..06f80e9f2 --- /dev/null +++ b/.kokoro/release/publish_javadoc11.sh @@ -0,0 +1,55 @@ +#!/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 + +pushd target/docfx-yml + +# create metadata +python3 -m docuploader create-metadata \ + --name ${NAME} \ + --version ${VERSION} \ + --language java + +# upload yml to production bucket +python3 -m docuploader upload . \ + --credentials ${CREDENTIALS} \ + --staging-bucket ${STAGING_BUCKET_V2} \ + --destination-prefix docfx- diff --git a/LICENSE b/LICENSE index d64569567..261eeb9e9 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,3 @@ - Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/synth.metadata b/synth.metadata index 90999165f..413d8bdaf 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,14 +4,14 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/google-api-java-client.git", - "sha": "f864c6c4a7a2b9c11b719486c86d9c7c5f86389a" + "sha": "9c1b449d369b4e09230ff459be42a9145901dcea" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "3816b080296d4d52975079fd26c110dd26ba25af" + "sha": "6946fd71ae9215b0e7ae188f5057df765ee6d7d2" } } ], @@ -38,7 +38,6 @@ ".kokoro/continuous/java8.cfg", ".kokoro/continuous/readme.cfg", ".kokoro/dependencies.sh", - ".kokoro/linkage-monitor.sh", ".kokoro/nightly/common.cfg", ".kokoro/nightly/integration.cfg", ".kokoro/nightly/java11.cfg", @@ -70,6 +69,8 @@ ".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", @@ -84,4 +85,4 @@ "samples/snapshot/pom.xml", "samples/snippets/pom.xml" ] -} +} \ No newline at end of file From 180c37ae15a0ebcfd7dc798e0d74b3d334405bc9 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 1 Mar 2021 21:44:10 +0000 Subject: [PATCH 24/24] chore(master): release 1.31.3 (#1733) :robot: I have created a release \*beep\* \*boop\* --- ### [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)) --- This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please). --- CHANGELOG.md | 7 +++++++ README.md | 4 ++-- google-api-client-android/pom.xml | 2 +- google-api-client-appengine/pom.xml | 2 +- google-api-client-assembly/pom.xml | 2 +- google-api-client-bom/pom.xml | 22 +++++++++++----------- google-api-client-gson/pom.xml | 2 +- google-api-client-jackson2/pom.xml | 2 +- google-api-client-java6/pom.xml | 2 +- google-api-client-protobuf/pom.xml | 2 +- google-api-client-servlet/pom.xml | 2 +- google-api-client-xml/pom.xml | 2 +- google-api-client/pom.xml | 2 +- pom.xml | 2 +- versions.txt | 2 +- 15 files changed, 32 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b75eb499c..52c99ce44 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +### [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) diff --git a/README.md b/README.md index 07099f33f..51bfa4dee 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ To use Maven, add the following lines to your pom.xml file: com.google.api-client google-api-client - 1.31.2 + 1.31.3 @@ -48,7 +48,7 @@ repositories { google() } dependencies { - compile 'com.google.api-client:google-api-client:1.31.2' + compile 'com.google.api-client:google-api-client:1.31.3' } ``` [//]: # ({x-version-update-end}) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 4da8f8726..b3ec4bf4a 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.31.3-SNAPSHOT + 1.31.3 ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 1a5bd5bc5..6cd208dee 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.31.3-SNAPSHOT + 1.31.3 ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 2c41b66ec..99d34a56f 100644 --- a/google-api-client-assembly/pom.xml +++ b/google-api-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.3-SNAPSHOT + 1.31.3 ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 68adc09be..a5a33eb24 100644 --- a/google-api-client-bom/pom.xml +++ b/google-api-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.api-client google-api-client-bom - 1.31.3-SNAPSHOT + 1.31.3 pom Google API Client Library for Java BOM @@ -63,53 +63,53 @@ com.google.api-client google-api-client - 1.31.3-SNAPSHOT + 1.31.3 com.google.api-client google-api-client-android - 1.31.3-SNAPSHOT + 1.31.3 com.google.api-client google-api-client-appengine - 1.31.3-SNAPSHOT + 1.31.3 com.google.api-client google-api-client-assembly - 1.31.2 + 1.31.3 pom com.google.api-client google-api-client-gson - 1.31.3-SNAPSHOT + 1.31.3 com.google.api-client google-api-client-jackson2 - 1.31.3-SNAPSHOT + 1.31.3 com.google.api-client google-api-client-java6 - 1.31.3-SNAPSHOT + 1.31.3 com.google.api-client google-api-client-protobuf - 1.31.3-SNAPSHOT + 1.31.3 com.google.api-client google-api-client-servlet - 1.31.3-SNAPSHOT + 1.31.3 com.google.api-client google-api-client-xml - 1.31.3-SNAPSHOT + 1.31.3 diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 7d31bb765..0203dcd74 100644 --- a/google-api-client-gson/pom.xml +++ b/google-api-client-gson/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.3-SNAPSHOT + 1.31.3 ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 6cecd17e6..b56e9c80b 100644 --- a/google-api-client-jackson2/pom.xml +++ b/google-api-client-jackson2/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.3-SNAPSHOT + 1.31.3 ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index 71f8e62e9..ef4bfe924 100644 --- a/google-api-client-java6/pom.xml +++ b/google-api-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.3-SNAPSHOT + 1.31.3 ../pom.xml google-api-client-java6 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index b1deaaf8e..c933af29e 100644 --- a/google-api-client-protobuf/pom.xml +++ b/google-api-client-protobuf/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.3-SNAPSHOT + 1.31.3 ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index d08ee7890..b4f920751 100644 --- a/google-api-client-servlet/pom.xml +++ b/google-api-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.3-SNAPSHOT + 1.31.3 ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index 8cbd7e72b..5d326dcdb 100644 --- a/google-api-client-xml/pom.xml +++ b/google-api-client-xml/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.3-SNAPSHOT + 1.31.3 ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 0803f83b7..1beafce52 100644 --- a/google-api-client/pom.xml +++ b/google-api-client/pom.xml @@ -4,7 +4,7 @@ com.google.api-client google-api-client-parent - 1.31.3-SNAPSHOT + 1.31.3 ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index ef210edb8..2c80fa596 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ com.google.api-client google-api-client-parent - 1.31.3-SNAPSHOT + 1.31.3 pom Parent for the Google API Client Library for Java diff --git a/versions.txt b/versions.txt index 4a8b3aab8..8b61cc75f 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:1.31.2:1.31.3-SNAPSHOT +google-api-client:1.31.3:1.31.3