From d235a7fbe15ad15634d8bbc9af40114c8d81d490 Mon Sep 17 00:00:00 2001 From: Michel Davit Date: Tue, 20 Feb 2024 10:26:47 +0100 Subject: [PATCH] Propagate java options for run --- build.sbt | 1 + project/JavaOptions.scala | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/build.sbt b/build.sbt index 9c21450e67..ace8d1aae5 100644 --- a/build.sbt +++ b/build.sbt @@ -433,6 +433,7 @@ val commonSettings = Def.settings( resolvers ++= Resolver.sonatypeOssRepos("public"), fork := true, run / outputStrategy := Some(OutputStrategy.StdoutOutput), + run / javaOptions ++= JavaOptions.runDefaults(javaMajorVersion), Test / classLoaderLayeringStrategy := ClassLoaderLayeringStrategy.Flat, Test / javaOptions ++= JavaOptions.testDefaults(javaMajorVersion), Test / testOptions += Tests.Argument("-oD"), diff --git a/project/JavaOptions.scala b/project/JavaOptions.scala index 7cbf465d2a..3a4798c086 100644 --- a/project/JavaOptions.scala +++ b/project/JavaOptions.scala @@ -86,4 +86,20 @@ object JavaOptions { "cloudsql.sqlserver.password" ).flatMap(prop => sys.props.get(prop).map(value => property(prop, value))) ) + + def runDefaults(javaVersion: Int): Seq[String] = + tokensForVersion( + javaVersion, + Set( + minHeapSize("512m"), + maxHeapSize("2G"), + advanced("+UseParallelGC"), + property("scio.ignoreVersionWarning", "true"), + property("org.slf4j.simpleLogger.defaultLogLevel", "info") + ) ++ Set( + "bigquery.project", + "bigquery.secret", + "cloudsql.sqlserver.password" + ).flatMap(prop => sys.props.get(prop).map(value => property(prop, value))) + ) }