From: Jim Procter <jprocter@issues.jalview.org>
Date: Fri, 25 Nov 2016 15:16:55 +0000 (+0000)
Subject: Merge branch 'documentation/JAL-2325_release2101' into develop
X-Git-Tag: Release_2_10_3b1~396^2~4
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=85f63c85907b9e66a5875d67bbb4c51e89ee55eb;hp=3e29fb36af9c48e07837e32b7e99c081b2461b2f;p=jalview.git

Merge branch 'documentation/JAL-2325_release2101' into develop
---

diff --git a/build.xml b/build.xml
index e86aa2b..8d27614 100755
--- a/build.xml
+++ b/build.xml
@@ -728,8 +728,10 @@
       <exclude name="utils/InstallAnywhere/**Build.iap_xml" />
       <exclude name="utils/InstallAnywhere/**Build*/**" />
       <exclude name="utils/InstallAnywhere/**Build*/**" />
+      <exclude name="utils/InstallAnywhere/.build*.*/**" />
       <exclude name="utils/InstallAnywhere/**locale*" />
       <exclude name="utils/InstallAnywhere/**locale*/**" />
+      <exclude name="utils/InstallAnywhere/**locale*/**" />
       <include name="${schemaDir}/**/*" />
       <include name="utils/**/*" />
       <include name="${docDir}/**/*" />
diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml
index 45b3425..bf6eb0d 100755
--- a/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@ -3846,7 +3846,7 @@ Press "Done" to quit the installer.]]></string>
 												<boolean>true</boolean>
 											</property>
 											<property name="bundledVM">
-												<string><![CDATA[OracleJRE8u5_Macosx.vm]]></string>
+												<string><![CDATA[OracleJRE180u92_macosx.vm]]></string>
 											</property>
 											<property name="withoutVmSearchOption">
 												<short>10</short>
@@ -3883,7 +3883,7 @@ Press "Done" to quit the installer.]]></string>
 												<boolean>true</boolean>
 											</property>
 											<property name="bundledVM">
-												<string><![CDATA[SunJRE170_03Win32.vm]]></string>
+												<string><![CDATA[OracleJRE8u92_windows(x86).vm]]></string>
 											</property>
 											<property name="withoutVmSearchOption">
 												<short>10</short>
@@ -3954,10 +3954,10 @@ Press "Done" to quit the installer.]]></string>
 												<boolean>true</boolean>
 											</property>
 											<property name="buildWithVM">
-												<boolean>true</boolean>
+												<boolean>false</boolean>
 											</property>
 											<property name="bundledVM">
-												<string><![CDATA[JRE16_16002HPUX11PA-RISC.vm]]></string>
+												<string><![CDATA[JRE16_16010HPUXPA-RISC.vm]]></string>
 											</property>
 											<property name="withoutVmSearchOption">
 												<short>10</short>
@@ -3994,7 +3994,7 @@ Press "Done" to quit the installer.]]></string>
 												<boolean>true</boolean>
 											</property>
 											<property name="bundledVM">
-												<string><![CDATA[ORACLEJRE7u60_linux32.vm]]></string>
+												<string><![CDATA[OracleJRE180u92_Linux32.vm]]></string>
 											</property>
 											<property name="withoutVmSearchOption">
 												<short>10</short>
@@ -4102,7 +4102,7 @@ Press "Done" to quit the installer.]]></string>
 												<boolean>true</boolean>
 											</property>
 											<property name="bundledVM">
-												<string><![CDATA[ORACLEJRE7u60_linux32.vm]]></string>
+												<string><![CDATA[OracleJRE180u92_Linux32.vm]]></string>
 											</property>
 											<property name="withoutVmSearchOption">
 												<short>10</short>
@@ -4173,7 +4173,7 @@ Press "Done" to quit the installer.]]></string>
 												<boolean>true</boolean>
 											</property>
 											<property name="bundledVM">
-												<string><![CDATA[OracleJRE8u5_windows(x64).vm]]></string>
+												<string><![CDATA[OracleJRE180u92_windows(x64).vm]]></string>
 											</property>
 											<property name="withoutVmSearchOption">
 												<short>10</short>