diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 426cf83e2..f60d77493 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -13,4 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:b0b1c1c89570e229b1026372a2b8989ba31495007055b8d30178b7648503eefa + digest: sha256:fc52b202aa298a50a12c64efd04fea3884d867947effe2fa85382a246c09e813 +# created: 2022-04-06T16:30:03.627422514Z diff --git a/.github/auto-label.yaml b/.github/auto-label.yaml new file mode 100644 index 000000000..4caef688b --- /dev/null +++ b/.github/auto-label.yaml @@ -0,0 +1,15 @@ +# Copyright 2021 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +requestsize: + enabled: true diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index ab6ba39e6..2419b7cff 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -62,20 +62,6 @@ jobs: - run: java -version - run: .kokoro/install_dependencies.sh - run: .kokoro/dependencies.sh - linkage-monitor: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 - with: - java-version: 8 - - run: java -version - - run: .kokoro/install_dependencies.sh - - name: Install artifacts to local Maven repository - run: .kokoro/build.sh - shell: bash - - name: Validate dependencies with regard to com.google.cloud:libraries-bom (latest release) - uses: GoogleCloudPlatform/cloud-opensource-java/linkage-monitor@v1-linkagemonitor lint: runs-on: ubuntu-latest steps: diff --git a/.github/workflows/downstream.yaml b/.github/workflows/downstream.yaml index 4d38dbd5a..e9845f88e 100644 --- a/.github/workflows/downstream.yaml +++ b/.github/workflows/downstream.yaml @@ -133,9 +133,11 @@ jobs: - workflows steps: - uses: actions/checkout@v2 - - uses: actions/setup-java@v1 + - uses: actions/setup-java@v3 with: + distribution: zulu java-version: ${{matrix.java}} - run: java -version + - run: sudo apt-get update -y - run: sudo apt-get install libxml2-utils - - run: .kokoro/downstream-client-library-check.sh google-api-client-bom ${{matrix.repo}} \ No newline at end of file + - run: .kokoro/downstream-client-library-check.sh google-api-client-bom ${{matrix.repo}} diff --git a/CHANGELOG.md b/CHANGELOG.md index 268a57971..4e62a043c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,24 @@ # Changelog +## [1.34.0](https://github.com/googleapis/google-api-java-client/compare/v1.33.4...v1.34.0) (2022-04-12) + + +### Features + +* deprecate OOB auth flow in GooglePromptReceiver ([#2034](https://github.com/googleapis/google-api-java-client/issues/2034)) ([334d8d6](https://github.com/googleapis/google-api-java-client/commit/334d8d68a455e41be137ed27dab50df7915b3992)) + + +### Bug Fixes + +* **deps:** update dependency com.google.api-client:google-api-client to v1.33.4 ([#2022](https://github.com/googleapis/google-api-java-client/issues/2022)) ([582bde1](https://github.com/googleapis/google-api-java-client/commit/582bde1f48c892b5856d0c51d8e051be6d20321e)) +* **deps:** update dependency com.google.cloud:libraries-bom to v25.1.0 ([#2025](https://github.com/googleapis/google-api-java-client/issues/2025)) ([ba36a44](https://github.com/googleapis/google-api-java-client/commit/ba36a44e27f97edc5a6aa6921b43b753f51af569)) +* **deps:** update dependency com.google.oauth-client:google-oauth-client-bom to v1.33.2 ([#2033](https://github.com/googleapis/google-api-java-client/issues/2033)) ([fed93e3](https://github.com/googleapis/google-api-java-client/commit/fed93e3a3db2396d7a4bf4c565864ce1e39dc3ba)) + + +### Dependencies + +* revert protobuf to 3.19 ([#2035](https://github.com/googleapis/google-api-java-client/issues/2035)) ([00eabeb](https://github.com/googleapis/google-api-java-client/commit/00eabeb293fc6978a7667fbdc695b81add7d700a)) + ### [1.33.4](https://github.com/googleapis/google-api-java-client/compare/v1.33.3...v1.33.4) (2022-03-28) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 93ab13455..1a8bf6c61 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.33.4 + 1.34.0 ../pom.xml google-api-client-android diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 141d49eac..8e942e30f 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.33.4 + 1.34.0 ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 0d274c381..b23638331 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.33.4 + 1.34.0 ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 93a0c2f2a..5c859225b 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.33.4 + 1.34.0 pom Google API Client Library for Java BOM @@ -63,53 +63,53 @@ com.google.api-client google-api-client - 1.33.4 + 1.34.0 com.google.api-client google-api-client-android - 1.33.4 + 1.34.0 com.google.api-client google-api-client-appengine - 1.33.4 + 1.34.0 com.google.api-client google-api-client-assembly - 1.33.4 + 1.34.0 pom com.google.api-client google-api-client-gson - 1.33.4 + 1.34.0 com.google.api-client google-api-client-jackson2 - 1.33.4 + 1.34.0 com.google.api-client google-api-client-java6 - 1.33.4 + 1.34.0 com.google.api-client google-api-client-protobuf - 1.33.4 + 1.34.0 com.google.api-client google-api-client-servlet - 1.33.4 + 1.34.0 com.google.api-client google-api-client-xml - 1.33.4 + 1.34.0 diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 748513867..7feb78d1f 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.33.4 + 1.34.0 ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 9413b2b45..2f0de64bb 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.33.4 + 1.34.0 ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-java6/pom.xml b/google-api-client-java6/pom.xml index ce5ae164e..67f493345 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.33.4 + 1.34.0 ../pom.xml google-api-client-java6 diff --git a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java index 1a97fb27a..4e8e580c9 100644 --- a/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java +++ b/google-api-client-java6/src/main/java/com/google/api/client/googleapis/extensions/java6/auth/oauth2/GooglePromptReceiver.java @@ -27,6 +27,7 @@ * @since 1.11 * @author Yaniv Inbar */ +@Deprecated public class GooglePromptReceiver extends AbstractPromptReceiver { @Override diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index 2099ecac3..910424811 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.33.4 + 1.34.0 ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index c3c9e93a2..e9ba886d0 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.33.4 + 1.34.0 ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index 8fa2b1ab2..d69ebb605 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.33.4 + 1.34.0 ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 29067363b..be7d1e4f8 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.33.4 + 1.34.0 ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index c8e42b733..adb4d05b5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 1.33.4 + 1.34.0 pom Parent for the Google API Client Library for Java The Google APIs Client Library for Java is a Java client library @@ -288,7 +288,7 @@ maven-surefire-plugin - 3.0.0-M5 + 3.0.0-M6 -Xmx1024m sponge_log @@ -493,10 +493,10 @@ UTF-8 - 1.41.5 + 1.41.7 4.4.15 4.5.13 - 1.33.1 + 1.33.2 3.0.2 2.8.6 3.19.4 diff --git a/samples/install-without-bom/pom.xml b/samples/install-without-bom/pom.xml index 65eb8ab69..731a9df95 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.33.2 + 1.33.4 diff --git a/samples/snapshot/pom.xml b/samples/snapshot/pom.xml index e35bf3a11..9269ab5bb 100644 --- a/samples/snapshot/pom.xml +++ b/samples/snapshot/pom.xml @@ -28,7 +28,7 @@ com.google.api-client google-api-client - 1.33.2 + 1.33.4 diff --git a/samples/snippets/pom.xml b/samples/snippets/pom.xml index 71adef5fb..ee46ef086 100644 --- a/samples/snippets/pom.xml +++ b/samples/snippets/pom.xml @@ -30,7 +30,7 @@ com.google.cloud libraries-bom - 25.0.0 + 25.1.0 pom import diff --git a/versions.txt b/versions.txt index 69d29bae7..613bb6394 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:1.33.4:1.33.4 +google-api-client:1.34.0:1.34.0