chore: merge main into generate-libraries-main

Author: cloud-java-bot

.github/release-please.yml

@@ -3,38 +3,19 @@ releaseType: java-yoshi
 manifest: true
 handleGHRelease: true
 branches:
-  - branch: 1.0.x
-    releaseType: java-backport
-    bumpMinorPreMajor: true
-    handleGHRelease: true
-  - branch: 1.13.x
-    releaseType: java-backport
-    manifest: true
-    handleGHRelease: true
-  - branch: 1.25.x
-    releaseType: java-backport
-    manifest: true
-    handleGHRelease: true
-  - branch: 1.37.x
-    releaseType: java-backport
-    manifest: true
-    handleGHRelease: true
-  - releaseType: java-backport
-    manifest: true
-    handleGHRelease: true
-    branch: 1.53.x
-  - primaryBranch: main
-    releaseType: java-backport
-    manifest: true
-    handleGHRelease: true
-    branch: 1.61.x
-  - primaryBranch: main
-    releaseType: java-backport
-    manifest: true
-    handleGHRelease: true
-    branch: 1.58.x
-  - primaryBranch: main
-    releaseType: java-yoshi
-    manifest: true
-    handleGHRelease: true
-    branch: protobuf-4.x-rc
+    - branch: 1.0.x
+      releaseType: java-backport
+      bumpMinorPreMajor: true
+    - branch: 1.13.x
+      releaseType: java-backport
+    - branch: 1.25.x
+      releaseType: java-backport
+    - branch: 1.37.x
+      releaseType: java-backport
+    - branch: 1.53.x
+      releaseType: java-backport
+    - branch: 1.61.x
+      releaseType: java-backport
+    - branch: 1.58.x
+      releaseType: java-backport
+    - branch: protobuf-4.x-rc