From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 3 Jul 2015 11:00:25 +0000 (+0100)
Subject: JAL-1759 updated Jmol version in nbproject, install anywhere,
X-Git-Tag: Release_2_10_0~562^2~6
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=7e5b8f22ed3a1b76f6389a4c7d6b7ebc7f9bf74d;p=jalview.git

JAL-1759 updated Jmol version in nbproject, install anywhere,
THIRDPARTYLIBS, (but not yet appletParameters.html)
---

diff --git a/THIRDPARTYLIBS b/THIRDPARTYLIBS
index bbef868..e3237f2 100644
--- a/THIRDPARTYLIBS
+++ b/THIRDPARTYLIBS
@@ -10,8 +10,8 @@ ext.edu.ucsf.rbvi.strucviz2 includes sources originally developed by Scooter Mor
 Licencing information for each library is given below:
 
 JGoogleAnalytics_0.3.jar	APL 2.0 License - http://code.google.com/p/jgoogleanalytics/
-Jmol-12.1.13.jar	GPL/LGPLv2 http://sourceforge.net/projects/jmol/files/
-VARNAv3-91.jar GPL licenced software by Kévin Darty, Alain Denise and Yann Ponty. http://varna.lri.fr
+Jmol-14.2.14_2015.06.11.jar	GPL/LGPLv2 http://sourceforge.net/projects/jmol/files/
+VARNAv3-91.jar GPL licenced software by K�vin Darty, Alain Denise and Yann Ponty. http://varna.lri.fr
 activation.jar	
 apache-mime4j-0.6.jar
 axis.jar
diff --git a/nbproject/project.properties b/nbproject/project.properties
index b505d62..ac1a2e3 100644
--- 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.2.4.jar=lib/Jmol-12.2.4.jar
-file.reference.JmolApplet-12.2.4.jar=appletlib/JmolApplet-12.2.4.jar
+file.reference.Jmol-14.2.14_2015.06.11.jar=lib/Jmol-14.2.14_2015.06.11.jar
+file.reference.JmolApplet-14.2.14_2015.06.11.jar=appletlib/JmolApplet-14.2.14_2015.06.11.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-2.0.jar
@@ -92,7 +92,7 @@ javac.classpath=\
     ${file.reference.jaxrpc.jar}:\
     ${file.reference.JGoogleAnalytics_0.3.jar}:\
     ${file.reference.jhall.jar}:\
-    ${file.reference.Jmol-12.2.4.jar}:\
+    ${file.reference.Jmol-14.2.14_2015.06.11.jar}:\
     ${file.reference.miglayout-4.0-swing.jar}:\
     ${file.reference.log4j-1.2.8.jar}:\
     ${file.reference.mail.jar}:\
@@ -101,7 +101,7 @@ javac.classpath=\
     ${file.reference.xml-apis.jar}:\
     ${file.reference.xercesImpl.jar}:\
     ${file.reference.wsdl4j.jar}:\
-    ${file.reference.JmolApplet-12.2.4.jar} \
+    ${file.reference.JmolApplet-14.2.14_2015.06.11.jar} \
     ${file.reference.varna-3.9-dev.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml
index 64f42cd..ac30366 100755
--- a/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@ -1216,7 +1216,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.2.4.jar]]></string>
+								<string><![CDATA[Jmol-14.2.14_2015.06.11.jar]]></string>
 							</property>
 							<property name="overrideUnixPermissions">
 								<boolean>false</boolean>
@@ -1234,7 +1234,7 @@ and any path to a file to save to the file]]></string>
 								<boolean>true</boolean>
 							</property>
 							<property name="destinationName">
-								<string><![CDATA[Jmol-12.2.4.jar]]></string>
+								<string><![CDATA[Jmol-14.2.14_2015.06.11.jar]]></string>
 							</property>
 							<property name="fileSize">
 								<long>4938027</long>