X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=.classpath;h=c4a28329c239bf7e7a319a3c86a592de48956872;hb=refs%2Fheads%2Fbug%2FJAL-2673_mergewithproblem;hp=832b6d65b921fec0d147a43a5247fc1421d59156;hpb=e4da162f3c4eb461c40f7b97794cd77d3b1e2407;p=jalview.git

diff --git a/.classpath b/.classpath
index 832b6d6..c4a2832 100644
--- a/.classpath
+++ b/.classpath
@@ -36,29 +36,38 @@
 	<classpathentry kind="lib" path="lib/miglayout-4.0-swing.jar"/>
 	<classpathentry kind="lib" path="lib/jswingreader-0.3.jar" sourcepath="/jswingreader"/>
 	<classpathentry kind="lib" path="lib/commons-codec-1.3.jar"/>
-	<classpathentry kind="lib" path="lib/Jmol-12.2.4.jar" sourcepath="/Users/jimp/Documents/e6-workspace-new/Jmol/src"/>
-	<classpathentry kind="lib" path="appletlib/JmolApplet-12.2.4.jar"/>
 	<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-1.8.2.jar"/>
-	<classpathentry kind="lib" path="lib/min-jabaws-client-2.1.0.jar" sourcepath="/clustengine"/>
+	<classpathentry kind="lib" path="lib/jabaws-min-client-2.2.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"/>
 	<classpathentry kind="lib" path="lib/jsoup-1.8.1.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-to-slf4j-2.0-rc2.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-log4j12-1.7.7.jar"/>
-	<classpathentry kind="lib" path="lib/VARNAv3-91.jar"/>
+	<classpathentry kind="lib" path="lib/VARNAv3-93.jar"/>
 	<classpathentry kind="lib" path="lib/jfreesvg-2.1.jar"/>
 	<classpathentry kind="lib" path="lib/quaqua-filechooser-only-8.0.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
+	<classpathentry kind="lib" path="lib/htsjdk-1.133.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin"/>
 	<classpathentry kind="lib" path="lib/xml-apis.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Plugin.jar"/>
 	<classpathentry kind="lib" path="lib/jersey-client-1.19.jar"/>
 	<classpathentry kind="lib" path="lib/jersey-core-1.19.jar"/>
-	<classpathentry kind="lib" path="lib/jersey-json-1.19.jar"/>
 	<classpathentry kind="lib" path="lib/jsr311-api-1.1.1.jar"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/plugin.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-server-9.2.10.v20150310.jar"/>
+	<classpathentry kind="lib" path="lib/servlet-api-3.1.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-util-9.2.10.v20150310.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-http-9.2.10.v20150310.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-io-9.2.10.v20150310.jar"/>
+	<classpathentry kind="lib" path="lib/java-json.jar"/>
+	<classpathentry kind="lib" path="lib/Jmol-14.6.4_2016.10.26.jar"/>
+	<classpathentry kind="con" path="org.testng.TESTNG_CONTAINER"/>
+	<classpathentry kind="lib" path="lib/biojava-core-4.1.0.jar"/>
+	<classpathentry kind="lib" path="lib/biojava-ontology-4.1.0.jar"/>
+	<classpathentry kind="lib" path="lib/groovy-all-2.4.6-indy.jar"/>
 	<classpathentry kind="output" path="classes"/>
 </classpath>