From 389afaa270f2953a5afde593e4f04a245775cb63 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 13:29:15 +0000 Subject: [PATCH 1/6] feat: next release from main branch is 1.39.0 (#1151) --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index 2ae73c7d9..154b50d32 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -14,3 +14,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 1.33.x + - handleGHRelease: true + releaseType: java-backport + versioning: always-bump-minor + branch: 1.38.x-LTS8 diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index f379ec626..75068bed4 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -54,6 +54,19 @@ branchProtectionRules: - dependencies (11) - clirr - cla/google + - pattern: 1.38.x-LTS8 + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - checkstyle + - units (8) + - units (11) + - dependencies (8) + - dependencies (11) + - clirr + - cla/google permissionRules: - team: yoshi-admins permission: admin From f23786f72eb022653f90d5358397f8a6f727b640 Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 15:54:51 +0000 Subject: [PATCH 2/6] Revert "feat: next release from main branch is 1.39.0 (#1151)" (#1152) This reverts commit 389afaa270f2953a5afde593e4f04a245775cb63. --- .github/release-please.yml | 4 ---- .github/sync-repo-settings.yaml | 13 ------------- 2 files changed, 17 deletions(-) diff --git a/.github/release-please.yml b/.github/release-please.yml index 154b50d32..2ae73c7d9 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -14,7 +14,3 @@ branches: handleGHRelease: true releaseType: java-backport branch: 1.33.x - - handleGHRelease: true - releaseType: java-backport - versioning: always-bump-minor - branch: 1.38.x-LTS8 diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index 75068bed4..f379ec626 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -54,19 +54,6 @@ branchProtectionRules: - dependencies (11) - clirr - cla/google - - pattern: 1.38.x-LTS8 - isAdminEnforced: true - requiredApprovingReviewCount: 1 - requiresCodeOwnerReviews: true - requiresStrictStatusChecks: false - requiredStatusCheckContexts: - - checkstyle - - units (8) - - units (11) - - dependencies (8) - - dependencies (11) - - clirr - - cla/google permissionRules: - team: yoshi-admins permission: admin From 5d585670532e4207c6200fc82acbc2506b77792d Mon Sep 17 00:00:00 2001 From: ldetmer <1771267+ldetmer@users.noreply.github.com> Date: Fri, 28 Feb 2025 16:48:49 +0000 Subject: [PATCH 3/6] feat: next release from main branch is 1.39.0 (#1153) --- .github/release-please.yml | 4 ++++ .github/sync-repo-settings.yaml | 13 +++++++++++++ 2 files changed, 17 insertions(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index 2ae73c7d9..0f693f78c 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -14,3 +14,7 @@ branches: handleGHRelease: true releaseType: java-backport branch: 1.33.x + - handleGHRelease: true + releaseType: java-backport + versioning: always-bump-minor + branch: 1.38.x diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml index f379ec626..fdd609aef 100644 --- a/.github/sync-repo-settings.yaml +++ b/.github/sync-repo-settings.yaml @@ -54,6 +54,19 @@ branchProtectionRules: - dependencies (11) - clirr - cla/google + - pattern: 1.38.x + isAdminEnforced: true + requiredApprovingReviewCount: 1 + requiresCodeOwnerReviews: true + requiresStrictStatusChecks: false + requiredStatusCheckContexts: + - checkstyle + - units (8) + - units (11) + - dependencies (8) + - dependencies (11) + - clirr + - cla/google permissionRules: - team: yoshi-admins permission: admin From 382e8237cad0639d7e99c2e784b6be8375044aec Mon Sep 17 00:00:00 2001 From: Tomo Suzuki Date: Mon, 3 Mar 2025 15:45:58 -0500 Subject: [PATCH 4/6] fix: release-please's tagPullRequestNumber (#1155) With this `tagPullRequestNumber: true` configuration, the Release Please bot will tag the commit SHA with "release-please-`. This information is useful when we create an automation to report the release status back to the pull request. This configuration change is not exactly a bug fix but "fix:" prefix gives a new release. --- .github/release-please.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/release-please.yml b/.github/release-please.yml index 0f693f78c..f38b36f33 100644 --- a/.github/release-please.yml +++ b/.github/release-please.yml @@ -1,6 +1,7 @@ handleGHRelease: true releaseType: java-yoshi versioning: always-bump-minor +tagPullRequestNumber: true branches: - bumpMinorPreMajor: true handleGHRelease: true From 094faa6173037249f648be413717add110006ce7 Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 15:56:17 -0500 Subject: [PATCH 5/6] chore(main): release 1.39.0-SNAPSHOT (#1149) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- google-oauth-client-appengine/pom.xml | 2 +- google-oauth-client-assembly/pom.xml | 2 +- google-oauth-client-bom/pom.xml | 12 ++++++------ google-oauth-client-java6/pom.xml | 2 +- google-oauth-client-jetty/pom.xml | 2 +- google-oauth-client-servlet/pom.xml | 2 +- google-oauth-client/pom.xml | 2 +- pom.xml | 2 +- samples/dailymotion-cmdline-sample/pom.xml | 2 +- samples/keycloak-pkce-cmdline-sample/pom.xml | 2 +- versions.txt | 2 +- 11 files changed, 16 insertions(+), 16 deletions(-) diff --git a/google-oauth-client-appengine/pom.xml b/google-oauth-client-appengine/pom.xml index 8fa8914ea..4473bc26a 100644 --- a/google-oauth-client-appengine/pom.xml +++ b/google-oauth-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.38.0 + 1.39.0-SNAPSHOT ../pom.xml google-oauth-client-appengine diff --git a/google-oauth-client-assembly/pom.xml b/google-oauth-client-assembly/pom.xml index ad02b32b6..a6dabd512 100644 --- a/google-oauth-client-assembly/pom.xml +++ b/google-oauth-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.38.0 + 1.39.0-SNAPSHOT ../pom.xml com.google.oauth-client diff --git a/google-oauth-client-bom/pom.xml b/google-oauth-client-bom/pom.xml index 7e396e35f..bab3ec0fe 100644 --- a/google-oauth-client-bom/pom.xml +++ b/google-oauth-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.oauth-client google-oauth-client-bom - 1.38.0 + 1.39.0-SNAPSHOT pom Google OAuth Client Library for Java BOM @@ -63,27 +63,27 @@ com.google.oauth-client google-oauth-client - 1.38.0 + 1.39.0-SNAPSHOT com.google.oauth-client google-oauth-client-appengine - 1.38.0 + 1.39.0-SNAPSHOT com.google.oauth-client google-oauth-client-java6 - 1.38.0 + 1.39.0-SNAPSHOT com.google.oauth-client google-oauth-client-jetty - 1.38.0 + 1.39.0-SNAPSHOT com.google.oauth-client google-oauth-client-servlet - 1.38.0 + 1.39.0-SNAPSHOT diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml index 925a82dd1..e922fafb5 100644 --- a/google-oauth-client-java6/pom.xml +++ b/google-oauth-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.38.0 + 1.39.0-SNAPSHOT ../pom.xml google-oauth-client-java6 diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml index 5b22ac456..5799cc6bd 100644 --- a/google-oauth-client-jetty/pom.xml +++ b/google-oauth-client-jetty/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.38.0 + 1.39.0-SNAPSHOT ../pom.xml google-oauth-client-jetty diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml index 75be51b5f..b1d488904 100644 --- a/google-oauth-client-servlet/pom.xml +++ b/google-oauth-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.38.0 + 1.39.0-SNAPSHOT ../pom.xml google-oauth-client-servlet diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml index e17fd7c2d..0759e425e 100644 --- a/google-oauth-client/pom.xml +++ b/google-oauth-client/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.38.0 + 1.39.0-SNAPSHOT ../pom.xml google-oauth-client diff --git a/pom.xml b/pom.xml index 6e6c0ab2e..5d9f52c19 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.google.oauth-client google-oauth-client-parent - 1.38.0 + 1.39.0-SNAPSHOT pom Parent for the Google OAuth Client Library for Java Google OAuth Client Library for Java diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml index ca377a3b9..cbcec1b6e 100644 --- a/samples/dailymotion-cmdline-sample/pom.xml +++ b/samples/dailymotion-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.38.0 + 1.39.0-SNAPSHOT ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml index 2308b530a..310337795 100644 --- a/samples/keycloak-pkce-cmdline-sample/pom.xml +++ b/samples/keycloak-pkce-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.38.0 + 1.39.0-SNAPSHOT ../../pom.xml keycloak-pkce-cmdline-sample diff --git a/versions.txt b/versions.txt index 057190025..d75e8d532 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-oauth-client:1.38.0:1.38.0 +google-oauth-client:1.38.0:1.39.0-SNAPSHOT From 132a8e43ae0bae6d660dd145cf108031acf4793f Mon Sep 17 00:00:00 2001 From: "release-please[bot]" <55107282+release-please[bot]@users.noreply.github.com> Date: Mon, 3 Mar 2025 17:59:25 -0500 Subject: [PATCH 6/6] chore(main): release 1.39.0 (#1156) Co-authored-by: release-please[bot] <55107282+release-please[bot]@users.noreply.github.com> --- CHANGELOG.md | 13 +++++++++++++ google-oauth-client-appengine/pom.xml | 2 +- google-oauth-client-assembly/pom.xml | 2 +- google-oauth-client-bom/pom.xml | 12 ++++++------ google-oauth-client-java6/pom.xml | 2 +- google-oauth-client-jetty/pom.xml | 2 +- google-oauth-client-servlet/pom.xml | 2 +- google-oauth-client/pom.xml | 2 +- pom.xml | 2 +- samples/dailymotion-cmdline-sample/pom.xml | 2 +- samples/keycloak-pkce-cmdline-sample/pom.xml | 2 +- versions.txt | 2 +- 12 files changed, 29 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f1e90108c..afa860554 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,18 @@ # Changelog +## [1.39.0](https://github.com/googleapis/google-oauth-java-client/compare/v1.38.0...v1.39.0) (2025-03-03) + + +### Features + +* Next release from main branch is 1.39.0 ([#1151](https://github.com/googleapis/google-oauth-java-client/issues/1151)) ([389afaa](https://github.com/googleapis/google-oauth-java-client/commit/389afaa270f2953a5afde593e4f04a245775cb63)) +* Next release from main branch is 1.39.0 ([#1153](https://github.com/googleapis/google-oauth-java-client/issues/1153)) ([5d58567](https://github.com/googleapis/google-oauth-java-client/commit/5d585670532e4207c6200fc82acbc2506b77792d)) + + +### Bug Fixes + +* Release-please's tagPullRequestNumber ([#1155](https://github.com/googleapis/google-oauth-java-client/issues/1155)) ([382e823](https://github.com/googleapis/google-oauth-java-client/commit/382e8237cad0639d7e99c2e784b6be8375044aec)) + ## [1.38.0](https://github.com/googleapis/google-oauth-java-client/compare/v1.37.0...v1.38.0) (2025-02-14) diff --git a/google-oauth-client-appengine/pom.xml b/google-oauth-client-appengine/pom.xml index 4473bc26a..8b9105a5f 100644 --- a/google-oauth-client-appengine/pom.xml +++ b/google-oauth-client-appengine/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.39.0-SNAPSHOT + 1.39.0 ../pom.xml google-oauth-client-appengine diff --git a/google-oauth-client-assembly/pom.xml b/google-oauth-client-assembly/pom.xml index a6dabd512..c046c46d5 100644 --- a/google-oauth-client-assembly/pom.xml +++ b/google-oauth-client-assembly/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.39.0-SNAPSHOT + 1.39.0 ../pom.xml com.google.oauth-client diff --git a/google-oauth-client-bom/pom.xml b/google-oauth-client-bom/pom.xml index bab3ec0fe..2af3941a4 100644 --- a/google-oauth-client-bom/pom.xml +++ b/google-oauth-client-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.oauth-client google-oauth-client-bom - 1.39.0-SNAPSHOT + 1.39.0 pom Google OAuth Client Library for Java BOM @@ -63,27 +63,27 @@ com.google.oauth-client google-oauth-client - 1.39.0-SNAPSHOT + 1.39.0 com.google.oauth-client google-oauth-client-appengine - 1.39.0-SNAPSHOT + 1.39.0 com.google.oauth-client google-oauth-client-java6 - 1.39.0-SNAPSHOT + 1.39.0 com.google.oauth-client google-oauth-client-jetty - 1.39.0-SNAPSHOT + 1.39.0 com.google.oauth-client google-oauth-client-servlet - 1.39.0-SNAPSHOT + 1.39.0 diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml index e922fafb5..1b7d9cf05 100644 --- a/google-oauth-client-java6/pom.xml +++ b/google-oauth-client-java6/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.39.0-SNAPSHOT + 1.39.0 ../pom.xml google-oauth-client-java6 diff --git a/google-oauth-client-jetty/pom.xml b/google-oauth-client-jetty/pom.xml index 5799cc6bd..3ac9737b4 100644 --- a/google-oauth-client-jetty/pom.xml +++ b/google-oauth-client-jetty/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.39.0-SNAPSHOT + 1.39.0 ../pom.xml google-oauth-client-jetty diff --git a/google-oauth-client-servlet/pom.xml b/google-oauth-client-servlet/pom.xml index b1d488904..8be30fb34 100644 --- a/google-oauth-client-servlet/pom.xml +++ b/google-oauth-client-servlet/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.39.0-SNAPSHOT + 1.39.0 ../pom.xml google-oauth-client-servlet diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml index 0759e425e..c8786e47e 100644 --- a/google-oauth-client/pom.xml +++ b/google-oauth-client/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.39.0-SNAPSHOT + 1.39.0 ../pom.xml google-oauth-client diff --git a/pom.xml b/pom.xml index 5d9f52c19..cef6658c5 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ com.google.oauth-client google-oauth-client-parent - 1.39.0-SNAPSHOT + 1.39.0 pom Parent for the Google OAuth Client Library for Java Google OAuth Client Library for Java diff --git a/samples/dailymotion-cmdline-sample/pom.xml b/samples/dailymotion-cmdline-sample/pom.xml index cbcec1b6e..15f46181b 100644 --- a/samples/dailymotion-cmdline-sample/pom.xml +++ b/samples/dailymotion-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.39.0-SNAPSHOT + 1.39.0 ../../pom.xml dailymotion-simple-cmdline-sample diff --git a/samples/keycloak-pkce-cmdline-sample/pom.xml b/samples/keycloak-pkce-cmdline-sample/pom.xml index 310337795..09fab15e7 100644 --- a/samples/keycloak-pkce-cmdline-sample/pom.xml +++ b/samples/keycloak-pkce-cmdline-sample/pom.xml @@ -4,7 +4,7 @@ com.google.oauth-client google-oauth-client-parent - 1.39.0-SNAPSHOT + 1.39.0 ../../pom.xml keycloak-pkce-cmdline-sample diff --git a/versions.txt b/versions.txt index d75e8d532..5ab8c4652 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ # Format: # module:released-version:current-version -google-oauth-client:1.38.0:1.39.0-SNAPSHOT +google-oauth-client:1.39.0:1.39.0