Merge branch 'forpush/JAL-674_dssp' into develop

diff --git a/build.xml b/build.xml
index 681804d..19b41e5 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -106,7 +106,7 @@
     <property name="outputJar" value="jalview.jar" />
     <!-- Jalview Applet JMol Jar Dependency -->
     <property name="jmolJar" value="JmolApplet-12.2.4.jar" />
-    <property name="varnaJar" value="VARNAv3-9.jar" />
+    <property name="varnaJar" value="VARNAv3-91.jar" />
     <property name="jalviewLiteJar" value="jalviewApplet.jar" />
     <!-- switch to indicate if we should obfuscate jalviewLite -->
     <!-- <property name="donotobfuscate" value="true"/> -->

diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml
index 0e23d53..626351b 100755 (executable)
--- a/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@ -1008,7 +1008,7 @@ and any path to a file to save to the file]]></string>
                                                                <string><![CDATA[664]]></string>
                                                        </property>
                                                        <property name="sourceName">
-                                                               <string><![CDATA[slf-api-1.7.7.jar]]></string>
+                                                               <string><![CDATA[slf4j-api-1.7.7.jar]]></string>
                                                        </property>
                                                        <property name="overrideUnixPermissions">
                                                                <boolean>false</boolean>
@@ -1026,7 +1026,7 @@ and any path to a file to save to the file]]></string>
                                                                <boolean>true</boolean>
                                                        </property>
                                                        <property name="destinationName">
-                                                               <string><![CDATA[slf-api-1.7.7.jar]]></string>
+                                                               <string><![CDATA[slf4j-api-1.7.7.jar]]></string>
                                                        </property>
                                                        <property name="fileSize">
                                                                <long>348699</long>