From 2d8fb418737ae84648024884205a80173df596bd Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Fri, 29 Oct 2021 15:09:12 -0700 Subject: [PATCH] fix(java): java 17 dependency arguments (#406) Source-Author: kolea2 <45548808+kolea2@users.noreply.github.com> Source-Date: Mon Oct 25 11:06:10 2021 -0400 Source-Repo: googleapis/synthtool Source-Sha: cb2755306975de4c54ea549c9deb25703b3731bb Source-Link: https://github.com/googleapis/synthtool/commit/cb2755306975de4c54ea549c9deb25703b3731bb --- .kokoro/dependencies.sh | 10 ++++------ synth.metadata | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/.kokoro/dependencies.sh b/.kokoro/dependencies.sh index 9a5105d7..d7476cfe 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) diff --git a/synth.metadata b/synth.metadata index 2b5edc83..e9be5b97 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-grafeas.git", - "sha": "4a7ca6a541f3c9249ddb5c3eb4f7244ef2536503" + "sha": "f03316f24a1af8c9c342c1fcc8ecf1584a0f66d8" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "d45942be8066ad57bd0509f4a16e1fac78ecc50f" + "sha": "cb2755306975de4c54ea549c9deb25703b3731bb" } } ],