feat: next release from main branch is 2.36.0

.github/release-please.yml

@@ -2,7 +2,14 @@ releaseType: java-yoshi
 bumpMinorPreMajor: true
 handleGHRelease: true
 branches:
-    - branch: 1.21.x
-    - branch: protobuf-4.x-rc
-      manifest: true
-extraFiles: ["README.md"]
+  - branch: 1.21.x
+  - branch: protobuf-4.x-rc
+    manifest: true
+  - releaseType: java-backport
+    bumpMinorPreMajor: true
+    handleGHRelease: true
+    extraFiles:
+      - README.md
+    branch: 2.35.x
+extraFiles:
+  - README.md

.github/sync-repo-settings.yaml

@@ -1,76 +1,60 @@
-
-# Whether or not rebase-merging is enabled on this repository.
-# Defaults to `true`
 rebaseMergeAllowed: false
-
-# Whether or not squash-merging is enabled on this repository.
-# Defaults to `true`
 squashMergeAllowed: true
-
-# Whether or not PRs are merged with a merge commit on this repository.
-# Defaults to `false`
 mergeCommitAllowed: false
-
-# Rules for main branch protection
 branchProtectionRules:
-# Identifies the protection rule pattern. Name of the branch to be protected.
-# Defaults to `main`
-- pattern: main
-  # Can admins overwrite branch protection.
-  # Defaults to `true`
-  isAdminEnforced: true
-  # Number of approving reviews required to update matching branches.
-  # Defaults to `1`
-  requiredApprovingReviewCount: 1
-  # Are reviews from code owners required to update matching branches.
-  # Defaults to `false`
-  requiresCodeOwnerReviews: true
-  # Require up to date branches
-  requiresStrictStatusChecks: false
-  # List of required status check contexts that must pass for commits to be accepted to matching branches.
-  requiredStatusCheckContexts:
-    - "dependencies (17)"
-    - "lint"
-    - "clirr"
-    - "units (8)"
-    - "units (11)"
-    - "Kokoro - Test: Integration"
-    - "cla/google"
-    - 'Kokoro - Test: Java GraalVM Native Image A'
-    - 'Kokoro - Test: Java GraalVM Native Image B'
-    - 'Kokoro - Test: Java GraalVM Native Image C'
-    - unmanaged_dependency_check
-# Identifies the protection rule pattern. Name of the branch to be protected.
-# Defaults to `main`
-- pattern: 1.21.x
-  # Can admins overwrite branch protection.
-  # Defaults to `true`
-  isAdminEnforced: true
-  # Number of approving reviews required to update matching branches.
-  # Defaults to `1`
-  requiredApprovingReviewCount: 1
-  # Are reviews from code owners required to update matching branches.
-  # Defaults to `false`
-  requiresCodeOwnerReviews: true
-  # Require up to date branches
-  requiresStrictStatusChecks: false
-  # List of required status check contexts that must pass for commits to be accepted to matching branches.
-  requiredStatusCheckContexts:
-    - "dependencies (8)"
-    - "dependencies (11)"
-    - "lint"
-    - "clirr"
-    - "units (7)"
-    - "units (8)"
-    - "units (11)"
-    - "Kokoro - Test: Integration"
-    - "cla/google"
-
-# List of explicit permissions to add (additive only)
+  - pattern: main
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - 'Kokoro - Test: Java GraalVM Native Image A'
+      - 'Kokoro - Test: Java GraalVM Native Image B'
+      - 'Kokoro - Test: Java GraalVM Native Image C'
+      - unmanaged_dependency_check
+  - pattern: 1.21.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (8)
+      - dependencies (11)
+      - lint
+      - clirr
+      - units (7)
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+  - pattern: 2.35.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (17)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
+      - 'Kokoro - Test: Java GraalVM Native Image A'
+      - 'Kokoro - Test: Java GraalVM Native Image B'
+      - 'Kokoro - Test: Java GraalVM Native Image C'
+      - unmanaged_dependency_check
 permissionRules:
-- team: yoshi-admins
-  permission: admin
-- team: yoshi-java-admins
-  permission: admin
-- team: yoshi-java
-  permission: push
+  - team: yoshi-admins
+    permission: admin
+  - team: yoshi-java-admins
+    permission: admin
+  - team: yoshi-java
+    permission: push