Merge branch 'main' into PR #2227 to update

lqiu96 · lqiu96 · commit 820f52c11dec · 2025-12-05T03:46:33.000Z
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -6,3 +6,8 @@ branches:
     handleGHRelease: true
     releaseType: java-yoshi
     branch: java7
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-yoshi
+    branch: protobuf-4.x-rc
+    manifest: true
