From: Ben Soares <bsoares@dundee.ac.uk>
Date: Wed, 3 Jul 2019 22:14:41 +0000 (+0100)
Subject: JAL-3348 jvmmempc multiple values shouldn't be merged
X-Git-Tag: Release_2_11_0~1^2~6^2~5
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=d71b2c7fcf8196020700d4884e544a3ca031da23

JAL-3348 jvmmempc multiple values shouldn't be merged
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index cb7ff5b..7324541 100644
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index 73ed005..32a0bc4 100644
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git a/getdown/src/getdown/ant/pom.xml b/getdown/src/getdown/ant/pom.xml
index c742cbd..f9f0d08 100644
--- a/getdown/src/getdown/ant/pom.xml
+++ b/getdown/src/getdown/ant/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings.getdown</groupId>
     <artifactId>getdown</artifactId>
-    <version>1.8.3_1.1.5_JVL</version>
+    <version>1.8.3_1.1.6_JVL</version>
   </parent>
 
   <artifactId>getdown-ant</artifactId>
diff --git a/getdown/src/getdown/core/pom.xml b/getdown/src/getdown/core/pom.xml
index e3b7cfa..b21b1f9 100644
--- a/getdown/src/getdown/core/pom.xml
+++ b/getdown/src/getdown/core/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings.getdown</groupId>
     <artifactId>getdown</artifactId>
-    <version>1.8.3_1.1.5_JVL</version>
+    <version>1.8.3_1.1.6_JVL</version>
   </parent>
 
   <artifactId>getdown-core</artifactId>
diff --git a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java
index 7c35f0d..8767ae0 100644
--- a/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java
+++ b/getdown/src/getdown/core/src/main/java/com/threerings/getdown/util/Config.java
@@ -472,6 +472,6 @@ public class Config
     private final Map<String, Object> _data;
  
     public static final List<String> allowedReplaceKeys = Arrays.asList("appbase","apparg","jvmarg","jvmmempc"); // these are the ones we might use
-    public static final List<String> allowedMergeKeys = Arrays.asList("apparg","jvmarg","jvmmempc"); // these are the ones we might use
+    public static final List<String> allowedMergeKeys = Arrays.asList("apparg","jvmarg"); // these are the ones we might use
     //private final List<String> allowedMergeKeys = Arrays.asList("apparg","jvmarg","resource","code","java_location"); // (not exhaustive list here)
 }
diff --git a/getdown/src/getdown/launcher/pom.xml b/getdown/src/getdown/launcher/pom.xml
index 02ee228..00686cb 100644
--- a/getdown/src/getdown/launcher/pom.xml
+++ b/getdown/src/getdown/launcher/pom.xml
@@ -4,7 +4,7 @@
   <parent>
     <groupId>com.threerings.getdown</groupId>
     <artifactId>getdown</artifactId>
-    <version>1.8.3_1.1.5_JVL</version>
+    <version>1.8.3_1.1.6_JVL</version>
   </parent>
 
   <artifactId>getdown-launcher</artifactId>
diff --git a/getdown/src/getdown/pom.xml b/getdown/src/getdown/pom.xml
index c23e80c..cdee51c 100644
--- a/getdown/src/getdown/pom.xml
+++ b/getdown/src/getdown/pom.xml
@@ -10,7 +10,7 @@
   <groupId>com.threerings.getdown</groupId>
   <artifactId>getdown</artifactId>
   <packaging>pom</packaging>
-  <version>1.8.3_1.1.5_JVL</version>
+  <version>1.8.3_1.1.6_JVL</version>
 
   <name>getdown</name>
   <description>An application installer and updater.</description>
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index cb7ff5b..7324541 100644
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar
index cb7ff5b..7324541 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ