From bd7548590824e5c1a0b3e4b281b650489481a3e8 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Mon, 25 Oct 2021 18:53:44 -0400 Subject: [PATCH] fix(java): java 17 dependency arguments (#1046) 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 | 9 +++++---- 2 files changed, 9 insertions(+), 10 deletions(-) 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) diff --git a/synth.metadata b/synth.metadata index e097c133f..fe6370dc1 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,22 +4,22 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/java-bigtable.git", - "sha": "8b120de58f0dfba3573ab696fb0e5375e917a00e" + "sha": "6e64e455180e0f51d2a189c750556708033b739f" } }, { "git": { "name": "googleapis", "remote": "https://github.com/googleapis/googleapis.git", - "sha": "5f761138c64054797b7e25164798d573ff4c1c62", - "internalRef": "391576441" + "sha": "324f036d9dcc21318d89172ceaba5e0fd2377271", + "internalRef": "404267819" } }, { "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "a4be3384ccb92364795d981f2863f6986fcee620" + "sha": "cb2755306975de4c54ea549c9deb25703b3731bb" } } ], @@ -77,6 +77,7 @@ ".kokoro/presubmit/clirr.cfg", ".kokoro/presubmit/common.cfg", ".kokoro/presubmit/dependencies.cfg", + ".kokoro/presubmit/graalvm-native.cfg", ".kokoro/presubmit/java11.cfg", ".kokoro/presubmit/java7.cfg", ".kokoro/presubmit/java8-osx.cfg",