From 960df819a7fad38a86b5eac6afc29bbf29b9cf85 Mon Sep 17 00:00:00 2001 From: "gcf-owl-bot[bot]" <78513119+gcf-owl-bot[bot]@users.noreply.github.com> Date: Mon, 25 Oct 2021 16:10:58 +0000 Subject: [PATCH] fix(java): java 17 dependency arguments (#1266) (#367) --- java-workflows/.github/.OwlBot.lock.yaml | 2 +- java-workflows/.kokoro/dependencies.sh | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/java-workflows/.github/.OwlBot.lock.yaml b/java-workflows/.github/.OwlBot.lock.yaml index dc53bbb57be5..0df65ebe91a6 100644 --- a/java-workflows/.github/.OwlBot.lock.yaml +++ b/java-workflows/.github/.OwlBot.lock.yaml @@ -1,3 +1,3 @@ docker: image: gcr.io/cloud-devrel-public-resources/owlbot-java:latest - digest: sha256:d4b2141d65566523dfd523f63c6e6899ab1281463bce182a9f600e74b0511875 + digest: sha256:a3ac08d167454718ff057b97a1950d3cb5e16fc39fb3f355d90276285a6cac75 diff --git a/java-workflows/.kokoro/dependencies.sh b/java-workflows/.kokoro/dependencies.sh index 9a5105d7ebf4..d7476cfe9727 100755 --- a/java-workflows/.kokoro/dependencies.sh +++ b/java-workflows/.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)