[bugfix] Cleanup JVM arguments

Author: adamretter

exist-core/src/main/java/org/exist/launcher/LauncherWrapper.java

@@ -201,6 +201,9 @@ protected String getJavaCmd() {
     }
 
     protected void getJavaOpts(final List<String> args, final Properties launcherProperties) {
+        args.add("-XX:+UseNUMA");
+        args.add("-XX:+UseZGC");
+
         args.add("-XX:+ExitOnOutOfMemoryError");
 
         getLauncherOpts(args, launcherProperties);

exist-core/src/main/java/org/exist/launcher/WindowsServiceManager.java

@@ -124,7 +124,9 @@ public void install() throws ServiceManagerException {
         final Optional<String> minMemory = asJavaCmdlineMemoryString(launcherProperties.getProperty(LAUNCHER_PROPERTY_MIN_MEM, "128"));
 
         final StringBuilder jvmOptions = new StringBuilder();
-        jvmOptions.append("-XX:+ExitOnOutOfMemoryError");
+        jvmOptions.append("-XX:+UseNUMA");
+        jvmOptions.append(";-XX:+UseZGC");
+        jvmOptions.append(";-XX:+ExitOnOutOfMemoryError");
         jvmOptions.append(";-Dfile.encoding=UTF-8");
         for (final String propertyName : System.getProperties().stringPropertyNames()) {
             if (propertyName.startsWith("exist.") ||

exist-distribution/pom.xml

@@ -884,12 +884,11 @@
                         <extraArguments>
                             <extraArgument>-XX:+UseNUMA</extraArgument>
                             <extraArgument>-XX:+UseZGC</extraArgument>
-                            <extraArgument>-XX:+UseStringDeduplication</extraArgument>
 
                             <extraArgument>-XX:+ExitOnOutOfMemoryError</extraArgument>
 
                             <!-- Option to generate JDWP debuggable app -->
-                            <!-- extraArgument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</extraArgument -->
+                            <!-- extraArgument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=*:5005</extraArgument -->
 
                         </extraArguments>
                         <systemProperties>