diff --git a/cli/osx/build.xml b/cli/osx/build.xml
index a29067cadd..3fbdc051e1 100644
--- a/cli/osx/build.xml
+++ b/cli/osx/build.xml
@@ -23,7 +23,7 @@
+ value="-client --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED -Djava.library.path=$APP_PACKAGE/Contents/Frameworks -Djna.boot.library.path=$APP_PACKAGE/Contents/Frameworks -Djna.library.path=$APP_PACKAGE/Contents/Frameworks -Djna.nounpack=true -Djava.awt.headless=true -Dsun.jnu.encoding=utf-8 -Dfile.encoding=utf-8 -Dsun.io.useCanonCaches=false -DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector -XX:+UseG1GC -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:+UseStringDeduplication"/>
diff --git a/osx/build.xml b/osx/build.xml
index 713124c5eb..20708c262a 100644
--- a/osx/build.xml
+++ b/osx/build.xml
@@ -31,7 +31,7 @@
+ value="-client --add-opens=java.base/sun.security.ssl=ALL-UNNAMED --add-opens=java.base/sun.security.util=ALL-UNNAMED -Djava.library.path=$APP_PACKAGE/Contents/Frameworks -Djna.boot.library.path=$APP_PACKAGE/Contents/Frameworks -Djna.library.path=$APP_PACKAGE/Contents/Frameworks -Djna.nounpack=true -Djava.awt.headless=true -Dsun.jnu.encoding=utf-8 -Dfile.encoding=utf-8 -Dsun.io.useCanonCaches=false -DLog4jContextSelector=org.apache.logging.log4j.core.selector.BasicContextSelector -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact -XX:MinHeapFreeRatio=10 -XX:MaxHeapFreeRatio=20 -XX:+UseStringDeduplication"/>
diff --git a/pom.xml b/pom.xml
index 57643777a9..fe34fa8553 100644
--- a/pom.xml
+++ b/pom.xml
@@ -544,7 +544,6 @@
@{argLine} --add-opens=java.base/sun.security.ssl=ALL-UNNAMED
--add-opens=java.base/sun.security.util=ALL-UNNAMED
- --add-opens=java.base/java.lang=ALL-UNNAMED
-Djava.library.path=${project.build.directory}
@@ -574,7 +573,6 @@
UTF-8
@{argLine} --add-opens=java.base/sun.security.ssl=ALL-UNNAMED
--add-opens=java.base/sun.security.util=ALL-UNNAMED
- --add-opens=java.base/java.lang=ALL-UNNAMED
-Djava.library.path=${project.build.directory}