From ce4413a02ab33e89974ee2e538327e436000171d Mon Sep 17 00:00:00 2001
From: ldetmer <1771267+ldetmer@users.noreply.github.com>
Date: Fri, 28 Feb 2025 16:49:07 +0000
Subject: [PATCH] feat: next release from main branch is 3.22.0

---
 .github/release-please.yml      |  7 +++++++
 .github/sync-repo-settings.yaml | 18 ++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index 4349d45d6..e39dbc752 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -24,6 +24,13 @@ branches:
       - >-
         google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java
     branch: 3.17.x
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-backport
+    extraFiles:
+      - >-
+        google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java
+    branch: 3.21.x
 extraFiles:
   - >-
     google-cloud-logging/src/main/java/com/google/cloud/logging/Instrumentation.java
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index f5e64fe0f..9e9f425f0 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -80,6 +80,24 @@ branchProtectionRules:
       - 'Kokoro - Test: Java GraalVM Native Image'
       - 'Kokoro - Test: Java 17 GraalVM Native Image'
       - javadoc
+  - pattern: 3.21.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'
+      - 'Kokoro - Test: Java 17 GraalVM Native Image'
+      - javadoc
+      - library_generation
+      - unmanaged_dependency_check
 permissionRules:
   - team: yoshi-admins
     permission: admin