From 53a755b315c0e739e33929fa5db92eb1daf32e8b Mon Sep 17 00:00:00 2001
From: BenWhitehead <BenWhitehead@users.noreply.github.com>
Date: Mon, 25 Oct 2021 16:31:28 -0400
Subject: [PATCH] feat: next release from mainline is 2.2.0 (#1124)

* feat: next release from mainline is 2.2.0

* fix(java): java 17 dependency arguments

manual application of https://github.com/googleapis/synthtool/pull/1266
---
 .github/release-please.yml      |  4 ++++
 .github/sync-repo-settings.yaml | 14 ++++++++++++++
 .kokoro/dependencies.sh         | 10 ++++------
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/.github/release-please.yml b/.github/release-please.yml
index ff422365f..069b97322 100644
--- a/.github/release-please.yml
+++ b/.github/release-please.yml
@@ -18,3 +18,7 @@ branches:
     handleGHRelease: true
     releaseType: java-yoshi
     branch: java7
+  - bumpMinorPreMajor: true
+    handleGHRelease: true
+    releaseType: java-yoshi
+    branch: 2.1.x
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
index 85d52c141..600b1584a 100644
--- a/.github/sync-repo-settings.yaml
+++ b/.github/sync-repo-settings.yaml
@@ -76,6 +76,20 @@ branchProtectionRules:
       - units (11)
       - 'Kokoro - Test: Integration'
       - cla/google
+  - pattern: 2.1.x
+    isAdminEnforced: true
+    requiredApprovingReviewCount: 1
+    requiresCodeOwnerReviews: true
+    requiresStrictStatusChecks: false
+    requiredStatusCheckContexts:
+      - dependencies (8)
+      - dependencies (11)
+      - lint
+      - clirr
+      - units (8)
+      - units (11)
+      - 'Kokoro - Test: Integration'
+      - cla/google
 permissionRules:
   - team: yoshi-admins
     permission: admin
diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh
index 9a5105d7e..d7476cfe9 100755
--- a/.kokoro/dependencies.sh
+++ b/.kokoro/dependencies.sh
@@ -38,15 +38,13 @@ function determineMavenOpts() {
       | sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
   )
 
-  case $javaVersion in
-    "17")
+  if [[ $javaVersion == 17* ]]
+    then
       # MaxPermSize is no longer supported as of jdk 17
       echo -n "-Xmx1024m"
-      ;;
-    *)
+  else
       echo -n "-Xmx1024m -XX:MaxPermSize=128m"
-      ;;
-  esac
+  fi
 }
 
 export MAVEN_OPTS=$(determineMavenOpts)