From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Tue, 26 Apr 2016 07:59:54 +0000 (+0100)
Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
X-Git-Tag: Release_2_10_0~249^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=49a16230c3aa7081afe8a6c502bac36b46b25eee;hp=92f9cb121f5e6bb97fb1356404534ddd64431e21;p=jalview.git

Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop
---

diff --git a/.classpath b/.classpath
index 4a3dbd6..aad4801 100644
--- a/.classpath
+++ b/.classpath
@@ -39,7 +39,7 @@
 	<classpathentry kind="lib" path="lib/jdas-1.0.4.jar"/>
 	<classpathentry kind="lib" path="lib/spring-core-3.0.5.RELEASE.jar"/>
 	<classpathentry kind="lib" path="lib/spring-web-3.0.5.RELEASE.jar"/>
-	<classpathentry kind="lib" path="lib/groovy-all-2.4.6-indy.jar"/>
+	<classpathentry kind="lib" path="/Users/jprocter/git/jalview/lib/groovy-all-2.4.6.jar"/>
 	<classpathentry kind="lib" path="lib/min-jabaws-client-2.1.0.jar" sourcepath="/clustengine"/>
 	<classpathentry kind="lib" path="lib/json_simple-1.1.jar" sourcepath="/Users/jimp/Downloads/json_simple-1.1-all.zip"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.7.jar"/>
diff --git a/lib/groovy-all-1.8.2.jar b/lib/groovy-all-1.8.2.jar
new file mode 100755
index 0000000..85af249
Binary files /dev/null and b/lib/groovy-all-1.8.2.jar differ
diff --git a/lib/groovy-all-2.4.6-indy.jar b/lib/groovy-all-2.4.6-indy.jar
deleted file mode 100644
index 5f3d51c..0000000
Binary files a/lib/groovy-all-2.4.6-indy.jar and /dev/null differ
diff --git a/utils/InstallAnywhere/Jalview.iap_xml b/utils/InstallAnywhere/Jalview.iap_xml
index 428b998..83d1a98 100755
--- a/utils/InstallAnywhere/Jalview.iap_xml
+++ b/utils/InstallAnywhere/Jalview.iap_xml
@@ -2025,7 +2025,7 @@ and any path to a file to save to the file]]></string>
 								<string><![CDATA[664]]></string>
 							</property>
 							<property name="sourceName">
-								<string><![CDATA[groovy-all-2.4.6-indy.jar]]></string>
+								<string><![CDATA[groovy-all-1.8.2.jar]]></string>
 							</property>
 							<property name="overrideUnixPermissions">
 								<boolean>false</boolean>
@@ -2043,7 +2043,7 @@ and any path to a file to save to the file]]></string>
 								<boolean>true</boolean>
 							</property>
 							<property name="destinationName">
-								<string><![CDATA[groovy-all-2.4.6-indy.jar]]></string>
+								<string><![CDATA[groovy-all-1.8.2.jar]]></string>
 							</property>
 							<property name="fileSize">
 								<long>6149494</long>