Merge branch 'JAL-1422_srs_r281' into develop

[jalview.git] / THIRDPARTYLIBS

diff --git a/THIRDPARTYLIBS b/THIRDPARTYLIBS
index 5918fc2..57aad05 100644 (file)
--- a/THIRDPARTYLIBS
+++ b/THIRDPARTYLIBS
@@ -18,6 +18,7 @@ httpclient-4.0.3.jar
 httpcore-4.0.1.jar
 httpmime-4.0.3.jar
 jaxrpc.jar
+jdas-1.0.4.jar : Apache License - built from http://code.google.com/p/jdas/ (29th Feb 2012)
 jhall.jar
 jswingreader-0.3.jar : Apache license - built from http://jswingreader.sourceforge.net/ svn/trunk v12
 log4j-1.2.8.jar
@@ -26,8 +27,15 @@ miglayout-4.0-swing.jar      BSD http://www.migcalendar.com/miglayout/versions/4.0/li
 min-jaba-client.jar
 regex.jar
 saaj.jar
+spring-core-3.0.5.RELEASE.jar : Apache License: jdas runtime dependencies retrieved via maven
+spring-web-3.0.5.RELEASE.jar : Apache License: jdas runtime dependencies retrieved via maven
 vamsas-client.jar
 wsdl4j.jar
 xercesImpl.jar
 xml-apis.jar
+json_simple-1.1.jar : Apache 2.0 license : downloaded from https://code.google.com/p/json-simple/downloads/list (will move to 1.1.1 version when jalview is mavenised and osgi-ised)
+Additional dependencies
 
+examples/javascript/deployJava.js : http://java.com/js/deployJava.js
+examples/javascript/jquery*.js : BSD license
+examples/javascript/jshashtable-2.1.js : Apache License