Merge branch 'main' into PR #3083 to update

lqiu96 · lqiu96 · commit b12f229647b5 · 2025-12-05T03:46:30.000Z
diff --git a/.github/release-please.yml b/.github/release-please.yml
@@ -38,3 +38,8 @@ branches:
     handleGHRelease: true
     releaseType: java-backport
     branch: 3.15.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-yoshi
+    branch: protobuf-4.x-rc
+    manifest: true
