Skip to content

Commit 53a755b

Browse files
authored
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 googleapis/synthtool#1266
1 parent d5884cb commit 53a755b

File tree

3 files changed

+22
-6
lines changed

3 files changed

+22
-6
lines changed

.github/release-please.yml

+4
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,7 @@ branches:
1818
handleGHRelease: true
1919
releaseType: java-yoshi
2020
branch: java7
21+
- bumpMinorPreMajor: true
22+
handleGHRelease: true
23+
releaseType: java-yoshi
24+
branch: 2.1.x

.github/sync-repo-settings.yaml

+14
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,20 @@ branchProtectionRules:
7676
- units (11)
7777
- 'Kokoro - Test: Integration'
7878
- cla/google
79+
- pattern: 2.1.x
80+
isAdminEnforced: true
81+
requiredApprovingReviewCount: 1
82+
requiresCodeOwnerReviews: true
83+
requiresStrictStatusChecks: false
84+
requiredStatusCheckContexts:
85+
- dependencies (8)
86+
- dependencies (11)
87+
- lint
88+
- clirr
89+
- units (8)
90+
- units (11)
91+
- 'Kokoro - Test: Integration'
92+
- cla/google
7993
permissionRules:
8094
- team: yoshi-admins
8195
permission: admin

.kokoro/dependencies.sh

+4-6
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,13 @@ function determineMavenOpts() {
3838
| sed -E 's/^(1\.[0-9]\.0).*$/\1/g'
3939
)
4040

41-
case $javaVersion in
42-
"17")
41+
if [[ $javaVersion == 17* ]]
42+
then
4343
# MaxPermSize is no longer supported as of jdk 17
4444
echo -n "-Xmx1024m"
45-
;;
46-
*)
45+
else
4746
echo -n "-Xmx1024m -XX:MaxPermSize=128m"
48-
;;
49-
esac
47+
fi
5048
}
5149

5250
export MAVEN_OPTS=$(determineMavenOpts)

0 commit comments

Comments
 (0)