X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=utils%2FInstallAnywhere%2FJalview.iap_xml;h=abe9d4bc6212d50e2ab731630db6f89555cf3848;hb=f4766a7bbcfae845fc95923b01fa14ff83d589ff;hp=428b998fadf913df8ab4d93e49cbec83f27f58a3;hpb=31e5b573849f9c56ef6a38b13e3d4c759fcec44b;p=jalview.git

diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml
index 428b998..abe9d4b 100755
--- a/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@ -1245,7 +1245,7 @@ and any path to a file to save to the file]]></string>
 								<string><![CDATA[664]]></string>
 							</property>
 							<property name="sourceName">
-								<string><![CDATA[Jmol-14.2.14_2015.06.11.jar]]></string>
+								<string><![CDATA[Jmol-14.6.4_2016.10.26.jar]]></string>
 							</property>
 							<property name="overrideUnixPermissions">
 								<boolean>false</boolean>
@@ -1263,7 +1263,7 @@ and any path to a file to save to the file]]></string>
 								<boolean>true</boolean>
 							</property>
 							<property name="destinationName">
-								<string><![CDATA[Jmol-14.2.14_2015.06.11.jar]]></string>
+								<string><![CDATA[Jmol-14.6.4_2016.10.26.jar]]></string>
 							</property>
 							<property name="fileSize">
 								<long>5417196</long>
@@ -1453,7 +1453,7 @@ and any path to a file to save to the file]]></string>
 								<string><![CDATA[664]]></string>
 							</property>
 							<property name="sourceName">
-								<string><![CDATA[min-jabaws-client-2.1.0.jar]]></string>
+								<string><![CDATA[jabaws-min-client-2.2.0.jar]]></string>
 							</property>
 							<property name="overrideUnixPermissions">
 								<boolean>false</boolean>
@@ -1471,7 +1471,7 @@ and any path to a file to save to the file]]></string>
 								<boolean>true</boolean>
 							</property>
 							<property name="destinationName">
-								<string><![CDATA[min-jabaws-client-2.1.0.jar]]></string>
+								<string><![CDATA[min-jabaws-client-2.2.0.jar]]></string>
 							</property>
 							<property name="fileSize">
 								<long>601804</long>
@@ -2891,6 +2891,58 @@ and any path to a file to save to the file]]></string>
 							</property>
 						</object>
 					</method>
+					<method name="addElement">
+						<object class="com.zerog.ia.installer.actions.InstallZipfile" objectID="1000ddddfab939">
+							<property name="belongsToUninstallPhase">
+								<boolean>false</boolean>
+							</property>
+							<property name="rollbackEnabledCancel">
+								<boolean>true</boolean>
+							</property>
+							<property name="rollbackEnabledError">
+								<boolean>true</boolean>
+							</property>
+							<property name="ruleExpression">
+								<string><![CDATA[]]></string>
+							</property>
+							<property name="unixPermissions">
+								<string><![CDATA[664]]></string>
+							</property>
+							<property name="sourceName">
+								<string><![CDATA[servlet-api-3.1.jar]]></string>
+							</property>
+							<property name="overrideUnixPermissions">
+								<boolean>false</boolean>
+							</property>
+							<property name="sourcePath">
+								<string><![CDATA[/home/cruisecontrol/jalview/lib/]]></string>
+							</property>
+							<property name="shouldUninstall">
+								<boolean>true</boolean>
+							</property>
+							<property name="rollbackEnabledCancel">
+								<boolean>true</boolean>
+							</property>
+							<property name="rollbackEnabledError">
+								<boolean>true</boolean>
+							</property>
+							<property name="destinationName">
+								<string><![CDATA[servlet-api-3.1.jar]]></string>
+							</property>
+							<property name="fileSize">
+								<long>16046</long>
+							</property>
+							<property name="macBinary">
+								<boolean>false</boolean>
+							</property>
+							<property name="targetCheckKind">
+								<int>0</int>
+							</property>
+							<property name="ruleExpression">
+								<string><![CDATA[]]></string>
+							</property>
+						</object>
+					</method>
 				</object>
 			</property>
 			<property name="rulesFailedMessage">
@@ -3794,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>
@@ -3831,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>
@@ -3902,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>
@@ -3942,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>
@@ -4050,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>
@@ -4121,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>
@@ -5218,7 +5270,7 @@ Press "Done" to quit the installer.]]></string>
 					</method>
 					<method name="put">
 						<string><![CDATA[com.zerog.ia.installer.options.valid.vm.list]]></string>
-						<string><![CDATA[1.7+]]></string>
+						<string><![CDATA[1.8+]]></string>
 					</method>
 					<method name="put">
 						<string><![CDATA[com.zerog.ia.project.build.last.date]]></string>
@@ -5314,7 +5366,7 @@ Press "Done" to quit the installer.]]></string>
 					</method>
 					<method name="put">
 						<string><![CDATA[com.zerog.ia.installer.options.platform.macosx.vm.version]]></string>
-						<string><![CDATA[1.7+]]></string>
+						<string><![CDATA[1.8+]]></string>
 					</method>
 					<method name="put">
 						<string><![CDATA[com.zerog.ia.build.platform.java.novm]]></string>
@@ -7360,6 +7412,7 @@ and any path to a file to read from that file]]></string>
 										<object refID="1f46efeefab93"/>
 										<object refID="1936efeefab93"/>
 										<object refID="1000ddddfab93"/>
+										<object refID="1000ddddfab939"/>
 										<object refID="10936efeefab93"/>
 										<object refID="11936efeefab93"/>
 										<object refID="12936efeefab93"/>
@@ -7948,6 +8001,7 @@ and any path to a file to read from that file]]></string>
 												<object refID="1f46efeefab93"/>
 												<object refID="1936efeefab93"/>
 												<object refID="1000ddddfab93"/>
+												<object refID="1000ddddfab939"/>
 												<object refID="10936efeefab93"/>
 												<object refID="11936efeefab93"/>
 												<object refID="12936efeefab93"/>