From: Ben Soares <bsoares@dundee.ac.uk>
Date: Wed, 3 Jul 2019 16:06:55 +0000 (+0100)
Subject: JAL-3348 jvmmempc allowed in jvl file
X-Git-Tag: Release_2_11_0~1^2~6^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=d1492daecffba8aba9c8dcb1fed8bc172357d515;p=jalview.git

JAL-3348 jvmmempc allowed in jvl file
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index 7849bc7..cb7ff5b 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 7f99732..73ed005 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 3b29977..c742cbd 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.5_JVL</version>
   </parent>
 
   <artifactId>getdown-ant</artifactId>
diff --git a/getdown/src/getdown/core/pom.xml b/getdown/src/getdown/core/pom.xml
index c63fd37..e3b7cfa 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.5_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 6ad2b4f..7c35f0d 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
@@ -471,7 +471,7 @@ public class Config
 
     private final Map<String, Object> _data;
  
-    public static final List<String> allowedReplaceKeys = Arrays.asList("appbase","apparg","jvmarg"); // these are the ones we might use
-    public static final List<String> allowedMergeKeys = Arrays.asList("apparg","jvmarg"); // these are the ones we might use
+    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
     //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 d1514df..02ee228 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.5_JVL</version>
   </parent>
 
   <artifactId>getdown-launcher</artifactId>
diff --git a/getdown/src/getdown/launcher/src/main/java/jalview/bin/StartupNotificationListener.java b/getdown/src/getdown/launcher/src/main/java/jalview/bin/StartupNotificationListener.java
index c6aadd7..5c6c7c3 100644
--- a/getdown/src/getdown/launcher/src/main/java/jalview/bin/StartupNotificationListener.java
+++ b/getdown/src/getdown/launcher/src/main/java/jalview/bin/StartupNotificationListener.java
@@ -25,10 +25,5 @@ public class StartupNotificationListener {
     }
 
   }
-  
-  public String[] getExtraCommandLineArguments() {
-    com.install4j.api.context.Context c = new com.install4j.api.context.Context();
-    return c.getExtraCommandLineArguments();
-  }
 
 }
diff --git a/getdown/src/getdown/pom.xml b/getdown/src/getdown/pom.xml
index 4615ca8..c23e80c 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.5_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 7849bc7..cb7ff5b 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 7849bc7..cb7ff5b 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ