From 3138805ab3a203fe2c634d5b40dda896887318d3 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 10 Dec 2024 21:56:51 +0100 Subject: [PATCH 1/5] chore(config): migrate config renovate.json (#2538) --- renovate.json | 42 ++++++++++++++++++++++++------------------ 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/renovate.json b/renovate.json index f53a16edd..a9dbc8a02 100644 --- a/renovate.json +++ b/renovate.json @@ -1,38 +1,44 @@ { "extends": [ - "config:base" + "config:recommended" + ], + "ignorePaths": [ + ".kokoro/requirements.txt" ], - "ignorePaths": [".kokoro/requirements.txt"], "packageRules": [ { - "packagePatterns": ["^com.google.appengine:appengine-"], - "groupName": "AppEngine packages" + "groupName": "AppEngine packages", + "matchPackageNames": [ + "/^com.google.appengine:appengine-/" + ] }, { - "matchPackageNames": ["jakarta.servlet:jakarta.servlet-api"], + "matchPackageNames": [ + "jakarta.servlet:jakarta.servlet-api" + ], "groupName": "Jakarta servlet API", - "enabled": false, + "enabled": false }, { - "matchPackagePatterns": [ - "^com.google.guava:" - ], "versioning": "docker", - "enabled": false + "enabled": false, + "matchPackageNames": [ + "/^com.google.guava:/" + ] }, { - "matchPackagePatterns": [ - "^com.google.protobuf" - ], "groupName": "Protobuf dependencies", - "enabled": false + "enabled": false, + "matchPackageNames": [ + "/^com.google.protobuf/" + ] }, { - "matchPackagePatterns": [ - "^io.grpc" - ], "groupName": "gRPC dependencies", - "enabled": false + "enabled": false, + "matchPackageNames": [ + "/^io.grpc/" + ] } ] } From a819b2ba32767a862469ee326bdc99abb0fbce29 Mon Sep 17 00:00:00 2001 From: Mend Renovate Date: Tue, 10 Dec 2024 21:57:26 +0100 Subject: [PATCH 2/5] chore(deps): update dependency ubuntu to v24 (#2537) --- .github/workflows/renovate_config_check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/renovate_config_check.yaml b/.github/workflows/renovate_config_check.yaml index 7c5ec7865..36da117bc 100644 --- a/.github/workflows/renovate_config_check.yaml +++ b/.github/workflows/renovate_config_check.yaml @@ -7,7 +7,7 @@ on: jobs: renovate_bot_config_validation: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Checkout code From 8b46efb4532097fecff2591398dcf6667718e432 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Tue, 10 Dec 2024 16:02:25 -0500 Subject: [PATCH 3/5] chore(main): release 2.7.2-SNAPSHOT (#2539) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- google-api-client-android/pom.xml | 2 +- google-api-client-apache-v5/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-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 76829b3da..51ac570a8 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 - 2.7.1 + 2.7.2-SNAPSHOT ../pom.xml google-api-client-android diff --git a/google-api-client-apache-v5/pom.xml b/google-api-client-apache-v5/pom.xml index eb128c6ae..d540df7b6 100644 --- a/google-api-client-apache-v5/pom.xml +++ b/google-api-client-apache-v5/pom.xml @@ -6,7 +6,7 @@ com.google.api-client google-api-client-parent - 2.7.1 + 2.7.2-SNAPSHOT google-api-client-apache-v5 Apache extensions to the Google APIs Client Library for Java diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 06d736d52..47f76dbd3 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 - 2.7.1 + 2.7.2-SNAPSHOT ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 5a4ae9c71..0f8e621e7 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 - 2.7.1 + 2.7.2-SNAPSHOT ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 4132c3856..14f228998 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 - 2.7.1 + 2.7.2-SNAPSHOT pom Google API Client Library for Java BOM @@ -63,48 +63,48 @@ com.google.api-client google-api-client - 2.7.1 + 2.7.2-SNAPSHOT com.google.api-client google-api-client-android - 2.7.1 + 2.7.2-SNAPSHOT com.google.api-client google-api-client-appengine - 2.7.1 + 2.7.2-SNAPSHOT com.google.api-client google-api-client-assembly - 2.7.1 + 2.7.2-SNAPSHOT pom com.google.api-client google-api-client-gson - 2.7.1 + 2.7.2-SNAPSHOT com.google.api-client google-api-client-jackson2 - 2.7.1 + 2.7.2-SNAPSHOT com.google.api-client google-api-client-protobuf - 2.7.1 + 2.7.2-SNAPSHOT com.google.api-client google-api-client-servlet - 2.7.1 + 2.7.2-SNAPSHOT com.google.api-client google-api-client-xml - 2.7.1 + 2.7.2-SNAPSHOT diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 4e3a1905e..791c8030f 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 - 2.7.1 + 2.7.2-SNAPSHOT ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index b3c7fb777..4fe4710d5 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 - 2.7.1 + 2.7.2-SNAPSHOT ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index b30338277..6a88b45e2 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 - 2.7.1 + 2.7.2-SNAPSHOT ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index 711aa786b..0c9121f5d 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 - 2.7.1 + 2.7.2-SNAPSHOT ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index 21fb047a4..2a330af73 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 - 2.7.1 + 2.7.2-SNAPSHOT ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index c7ecf759b..329a06816 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 - 2.7.1 + 2.7.2-SNAPSHOT ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index 451d3d05a..b51033893 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 2.7.1 + 2.7.2-SNAPSHOT pom Parent for the Google API Client Library for Java The Google APIs Client Library for Java is a Java client library diff --git a/versions.txt b/versions.txt index 5c8ca4792..387d4002b 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:2.7.1:2.7.1 +google-api-client:2.7.1:2.7.2-SNAPSHOT From 3bb28796845a62b68a32a9cee7b4c6380b759cc1 Mon Sep 17 00:00:00 2001 From: Min Zhu Date: Wed, 22 Jan 2025 16:35:02 -0500 Subject: [PATCH 4/5] fix: Add warnings to users about using credentials from external sources (#2551) --- .../googleapis/auth/oauth2/GoogleCredential.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java index 632b495e6..590a422e2 100644 --- a/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java +++ b/google-api-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java @@ -199,6 +199,13 @@ public static GoogleCredential getApplicationDefault( * {@link Beta}
* Return a credential defined by a Json file. * + *

Important: If you accept a credential configuration (credential JSON/File/Stream) from an + * external source for authentication to Google Cloud Platform, you must validate it before + * providing it to any Google API or library. Providing an unvalidated credential configuration to + * Google APIs can compromise the security of your systems and data. For more information, refer + * to {@link documentation}. + * * @param credentialStream the stream with the credential definition. * @return the credential defined by the credentialStream. * @throws IOException if the credential cannot be created from the stream. @@ -212,6 +219,13 @@ public static GoogleCredential fromStream(InputStream credentialStream) throws I * {@link Beta}
* Return a credential defined by a Json file. * + *

Important: If you accept a credential configuration (credential JSON/File/Stream) from an + * external source for authentication to Google Cloud Platform, you must validate it before + * providing it to any Google API or library. Providing an unvalidated credential configuration to + * Google APIs can compromise the security of your systems and data. For more information, refer + * to {@link documentation}. + * * @param credentialStream the stream with the credential definition. * @param transport the transport for Http calls. * @param jsonFactory the factory for Json parsing and formatting. From 0ac86743b2d6381b9314e36fed9377f0e890cd46 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Wed, 22 Jan 2025 16:39:55 -0500 Subject: [PATCH 5/5] chore(main): release 2.7.2 (#2552) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 7 +++++++ google-api-client-android/pom.xml | 2 +- google-api-client-apache-v5/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-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 +- 14 files changed, 29 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 83d039b2f..8889dfbc4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.7.2](https://github.com/googleapis/google-api-java-client/compare/v2.7.1...v2.7.2) (2025-01-22) + + +### Bug Fixes + +* Add warnings to users about using credentials from external sources ([#2551](https://github.com/googleapis/google-api-java-client/issues/2551)) ([3bb2879](https://github.com/googleapis/google-api-java-client/commit/3bb28796845a62b68a32a9cee7b4c6380b759cc1)) + ## [2.7.1](https://github.com/googleapis/google-api-java-client/compare/v2.7.0...v2.7.1) (2024-12-10) diff --git a/google-api-client-android/pom.xml b/google-api-client-android/pom.xml index 51ac570a8..2bc3b11be 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 - 2.7.2-SNAPSHOT + 2.7.2 ../pom.xml google-api-client-android diff --git a/google-api-client-apache-v5/pom.xml b/google-api-client-apache-v5/pom.xml index d540df7b6..7c9f3c332 100644 --- a/google-api-client-apache-v5/pom.xml +++ b/google-api-client-apache-v5/pom.xml @@ -6,7 +6,7 @@ com.google.api-client google-api-client-parent - 2.7.2-SNAPSHOT + 2.7.2 google-api-client-apache-v5 Apache extensions to the Google APIs Client Library for Java diff --git a/google-api-client-appengine/pom.xml b/google-api-client-appengine/pom.xml index 47f76dbd3..3d07ad9c6 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 - 2.7.2-SNAPSHOT + 2.7.2 ../pom.xml google-api-client-appengine diff --git a/google-api-client-assembly/pom.xml b/google-api-client-assembly/pom.xml index 0f8e621e7..3abfb0459 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 - 2.7.2-SNAPSHOT + 2.7.2 ../pom.xml com.google.api-client diff --git a/google-api-client-bom/pom.xml b/google-api-client-bom/pom.xml index 14f228998..45ee975a4 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 - 2.7.2-SNAPSHOT + 2.7.2 pom Google API Client Library for Java BOM @@ -63,48 +63,48 @@ com.google.api-client google-api-client - 2.7.2-SNAPSHOT + 2.7.2 com.google.api-client google-api-client-android - 2.7.2-SNAPSHOT + 2.7.2 com.google.api-client google-api-client-appengine - 2.7.2-SNAPSHOT + 2.7.2 com.google.api-client google-api-client-assembly - 2.7.2-SNAPSHOT + 2.7.2 pom com.google.api-client google-api-client-gson - 2.7.2-SNAPSHOT + 2.7.2 com.google.api-client google-api-client-jackson2 - 2.7.2-SNAPSHOT + 2.7.2 com.google.api-client google-api-client-protobuf - 2.7.2-SNAPSHOT + 2.7.2 com.google.api-client google-api-client-servlet - 2.7.2-SNAPSHOT + 2.7.2 com.google.api-client google-api-client-xml - 2.7.2-SNAPSHOT + 2.7.2 diff --git a/google-api-client-gson/pom.xml b/google-api-client-gson/pom.xml index 791c8030f..6d2301fbc 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 - 2.7.2-SNAPSHOT + 2.7.2 ../pom.xml google-api-client-gson diff --git a/google-api-client-jackson2/pom.xml b/google-api-client-jackson2/pom.xml index 4fe4710d5..856277419 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 - 2.7.2-SNAPSHOT + 2.7.2 ../pom.xml google-api-client-jackson2 diff --git a/google-api-client-protobuf/pom.xml b/google-api-client-protobuf/pom.xml index 6a88b45e2..ada1611ba 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 - 2.7.2-SNAPSHOT + 2.7.2 ../pom.xml google-api-client-protobuf diff --git a/google-api-client-servlet/pom.xml b/google-api-client-servlet/pom.xml index 0c9121f5d..7107d672e 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 - 2.7.2-SNAPSHOT + 2.7.2 ../pom.xml google-api-client-servlet diff --git a/google-api-client-xml/pom.xml b/google-api-client-xml/pom.xml index 2a330af73..cf9165bb9 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 - 2.7.2-SNAPSHOT + 2.7.2 ../pom.xml google-api-client-xml diff --git a/google-api-client/pom.xml b/google-api-client/pom.xml index 329a06816..e63449d23 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 - 2.7.2-SNAPSHOT + 2.7.2 ../pom.xml google-api-client diff --git a/pom.xml b/pom.xml index b51033893..2b6d391f6 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 com.google.api-client google-api-client-parent - 2.7.2-SNAPSHOT + 2.7.2 pom Parent for the Google API Client Library for Java The Google APIs Client Library for Java is a Java client library diff --git a/versions.txt b/versions.txt index 387d4002b..6810843a5 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-api-client:2.7.1:2.7.2-SNAPSHOT +google-api-client:2.7.2:2.7.2