(JAL-980) patch netbeans and installAnywhere builds

diff --git a/nbproject/project.properties b/nbproject/project.properties
index 69d1428..878d309 100644 (file)
--- a/nbproject/project.properties
+++ b/nbproject/project.properties
@@ -59,8 +59,8 @@ file.reference.jalview-src=src
 file.reference.jaxrpc.jar=lib/jaxrpc.jar
 file.reference.JGoogleAnalytics_0.3.jar=lib/JGoogleAnalytics_0.3.jar
 file.reference.jhall.jar=lib/jhall.jar
-file.reference.Jmol-12.1.13.jar=lib/Jmol-12.1.13.jar
-file.reference.JmolApplet-12.1.13.jar=appletlib/JmolApplet-12.1.13.jar
+file.reference.Jmol-12.2.4.jar=lib/Jmol-12.2.4.jar
+file.reference.JmolApplet-12.2.4.jar=appletlib/JmolApplet-12.2.4.jar
 file.reference.log4j-1.2.8.jar=lib/log4j-1.2.8.jar
 file.reference.mail.jar=lib/mail.jar
 file.reference.min-jaba-client.jar=lib/min-jaba-client.jar
@@ -91,7 +91,7 @@ javac.classpath=\
     ${file.reference.jaxrpc.jar}:\
     ${file.reference.JGoogleAnalytics_0.3.jar}:\
     ${file.reference.jhall.jar}:\
-    ${file.reference.Jmol-12.1.13.jar}:\
+    ${file.reference.Jmol-12.2.4.jar}:\
     ${file.reference.miglayout-4.0-swing.jar}:\
     ${file.reference.log4j-1.2.8.jar}:\
     ${file.reference.mail.jar}:\
@@ -100,7 +100,7 @@ javac.classpath=\
     ${file.reference.xml-apis.jar}:\
     ${file.reference.xercesImpl.jar}:\
     ${file.reference.wsdl4j.jar}:\
-    ${file.reference.JmolApplet-12.1.13.jar}
+    ${file.reference.JmolApplet-12.2.4.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.deprecation=false

diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml
index e594abf..9b317a7 100755 (executable)
--- a/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@ -964,7 +964,7 @@ and any path to a file to save to the file]]></string>
                                                                <string><![CDATA[664]]></string>
                                                        </property>
                                                        <property name="sourceName">
-                                                               <string><![CDATA[Jmol-12.1.13.jar]]></string>
+                                                               <string><![CDATA[Jmol-12.2.4.jar]]></string>
                                                        </property>
                                                        <property name="overrideUnixPermissions">
                                                                <boolean>false</boolean>
@@ -982,7 +982,7 @@ and any path to a file to save to the file]]></string>
                                                                <boolean>true</boolean>
                                                        </property>
                                                        <property name="destinationName">
-                                                               <string><![CDATA[Jmol-12.1.13.jar]]></string>
+                                                               <string><![CDATA[Jmol-12.2.4.jar]]></string>
                                                        </property>
                                                        <property name="fileSize">
                                                                <long>4471409</long>