diff --git a/.github/release-please.yml b/.github/release-please.yml index 2ae73c7d9..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 @@ -14,3 +15,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 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 8fa8914ea..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.38.0 + 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 ad02b32b6..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.38.0 + 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 7e396e35f..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.38.0 + 1.39.0 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 com.google.oauth-client google-oauth-client-appengine - 1.38.0 + 1.39.0 com.google.oauth-client google-oauth-client-java6 - 1.38.0 + 1.39.0 com.google.oauth-client google-oauth-client-jetty - 1.38.0 + 1.39.0 com.google.oauth-client google-oauth-client-servlet - 1.38.0 + 1.39.0 diff --git a/google-oauth-client-java6/pom.xml b/google-oauth-client-java6/pom.xml index 925a82dd1..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.38.0 + 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 5b22ac456..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.38.0 + 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 75be51b5f..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.38.0 + 1.39.0 ../pom.xml google-oauth-client-servlet diff --git a/google-oauth-client/pom.xml b/google-oauth-client/pom.xml index e17fd7c2d..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.38.0 + 1.39.0 ../pom.xml google-oauth-client diff --git a/pom.xml b/pom.xml index 6e6c0ab2e..cef6658c5 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 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..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.38.0 + 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 2308b530a..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.38.0 + 1.39.0 ../../pom.xml keycloak-pkce-cmdline-sample diff --git a/versions.txt b/versions.txt index 057190025..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.38.0 +google-oauth-client:1.39.0:1.39.0