Merge branch 'protobuf-4.x-rc' into merge-main

blakeli0 · blakeli0 · commit 241f12c74dfa · 2025-12-17T13:58:49.000-05:00
diff --git a/release-please-config.json b/release-please-config.json
@@ -1,11 +1,14 @@
 {
   "release-type": "java-yoshi",
-  "versioning": "always-bump-minor",
+  "prerelease-type": "rc1",
+  "versioning": "prerelease",
   "separate-pull-requests": false,
   "include-component-in-tag": false,
   "packages": {
     ".": {
       "extra-files": ["README.md"]
     }
   }
+,
+  "prerelease": true
 }

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,14 @@`
`1`	`1`	`{`
`2`	`2`	`"release-type": "java-yoshi",`
`3`		`- "versioning": "always-bump-minor",`
	`3`	`+ "prerelease-type": "rc1",`
	`4`	`+ "versioning": "prerelease",`
`4`	`5`	`"separate-pull-requests": false,`
`5`	`6`	`"include-component-in-tag": false,`
`6`	`7`	`"packages": {`
`7`	`8`	`".": {`
`8`	`9`	`"extra-files": ["README.md"]`
`9`	`10`	`}`
`10`	`11`	`}`
	`12`	`+,`
	`13`	`+ "prerelease": true`
`11`	`14`	`}`