This is an automated email from the ASF dual-hosted git repository.
smiklosovic pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra-sidecar.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3e3210e06 CASSSIDECAR-416: Add JDK11_OPTIONS to the startup script
(#328)
3e3210e06 is described below
commit 3e3210e06feb4a6dee009450a6c91bb88514242a
Author: Stefan Miklosovic <[email protected]>
AuthorDate: Thu Mar 26 22:19:16 2026 +0100
CASSSIDECAR-416: Add JDK11_OPTIONS to the startup script (#328)
patch by Stefan Miklosovic; reviewed by Francisco Guerrero, Jyothsna Konisa
for CASSSIDECAR-416
---
CHANGES.txt | 1 +
build.gradle | 9 +++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CHANGES.txt b/CHANGES.txt
index 3b382f539..45666644d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,6 @@
0.4.0
-----
+ * Add JDK11_OPTIONS to the startup script (CASSSIDECAR-416)
* Add safety check to Live Migration data copy task endpoint (CASSSIDECAR-409)
* Define common operational job tracking interface and refactor current
operational job tracker (CASSSIDECAR-372)
diff --git a/build.gradle b/build.gradle
index 8609adf8d..d586c8a31 100644
--- a/build.gradle
+++ b/build.gradle
@@ -191,10 +191,11 @@ startScripts {
// Replacing the placeholder after the script has been generated will
preserve the semantics from Gradle < 7.2.
// See this Gradle issue for more context:
https://github.com/gradle/gradle/issues/18170.
- def defaultJvmOpts = ["-Dsidecar.logdir=" + logDir,
- "-Dsidecar.config=" + confFile,
- "-Dlogback.configurationFile=" + logbackConfFile,
-
"-Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory"]
+ def defaultJvmOpts = project.ext.JDK11_OPTIONS +
+ ["-Dsidecar.logdir=" + logDir,
+ "-Dsidecar.config=" + confFile,
+ "-Dlogback.configurationFile=" + logbackConfFile,
+
"-Dvertx.logger-delegate-factory-class-name=io.vertx.core.logging.SLF4JLogDelegateFactory"]
unixScript.text =
unixScript.text.replace("DEFAULT_JVM_OPTS='\"PLACEHOLDER\"'",
"DEFAULT_JVM_OPTS=\"${defaultJvmOpts.join(" ")}\"")
windowsScript.delete()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
