From: Ben Soares Date: Tue, 2 Jul 2019 12:30:43 +0000 (+0100) Subject: JAL-3337 Updated the j11lib jars (don't need to be converted to modules) that aren... X-Git-Tag: Release_2_11_0~2^2~2^2~4 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=ae1c90ecfad4bd26ade358127a5582fa99f3d2b8;p=jalview.git JAL-3337 Updated the j11lib jars (don't need to be converted to modules) that aren't in j8libs. Added licensing information for these jars to THIRDPARTYLIBS. --- diff --git a/THIRDPARTYLIBS b/THIRDPARTYLIBS index b44be9c..296ae17 100644 --- a/THIRDPARTYLIBS +++ b/THIRDPARTYLIBS @@ -13,13 +13,7 @@ ext.edu.ucsf.rbvi.strucviz2 includes sources originally developed by Scooter Mor Licensing information for each library is given below: -FastInfoset.jar - - - - - - +j8lib: JGoogleAnalytics_0.3.jar APL 2.0 License - http://code.google.com/p/jgoogleanalytics/ Jmol-14.6.4_2016.10.26.jar GPL/LGPLv2 http://sourceforge.net/projects/jmol/files/ @@ -77,3 +71,33 @@ examples/javascript/jquery*.js : BSD license examples/javascript/jshashtable-2.1.js : Apache License examples/javascript/facebox-1.3.js : MTI License - http://www.opensource.org/licenses/mit-license.php + +New in j11lib: + +FastInfoset.jar CDDL Version 1.1 - https://javaee.github.io/metro-fi/LICENSE +getdown-core.jar Getdown license - https://github.com/threerings/getdown/blob/master/LICENSE +groovy-*2.5.7.jar Apache License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.html +istack-commons-runtime.jar CDDL Version 1.1 - https://glassfish.java.net/public/CDDL+GPL_1_1.html +javax.activation-api-1.2.0.jar CDDL/GPLv2+CE - https://github.com/javaee/activation/blob/master/LICENSE.txt +javax.annotation-api-1.3.2.jar CDDL + GPLv2 with classpath exception - https://github.com/javaee/javax.annotation/blob/master/LICENSE +javax.jws-api-1.1.jar CDDL + GPLv2 with classpath exception - https://glassfish.dev.java.net/nonav/public/CDDL+GPL.html +javax.servlet-api-4.0.1.jar CDDL + GPLv2 with classpath exception - https://oss.oracle.com/licenses/CDDL+GPL-1.1 +javax.xml.rpc-api-1.1.2.jar CDDL + GPLv2 with classpath exception - https://oss.oracle.com/licenses/CDDL+GPL-1.1 +javax.xml.soap-api.jar CDDL + GPLv2 with classpath exception - https://github.com/javaee/javax.xml.soap/blob/master/LICENSE +jaxb-api-2.3.1.jar CDDL 1.1 + GPL2 w/ CPE - https://oss.oracle.com/licenses/CDDL+GPL-1.1 +jaxb-runtime-2.3.2.jar Eclipse Distribution License - v 1.0 - http://www.eclipse.org/org/documents/edl-v10.php +jaxws-api.jar CDDL + GPLv2 with classpath exception - https://github.com/javaee/jax-ws-spec/blob/master/LICENSE.md +jersey-client-1.19.4.jar CDDL 1.1 + GPL2 w/ CPE - http://glassfish.java.net/public/CDDL+GPL_1_1.html +jersey-core-1.19.4.jar CDDL 1.1 + GPL2 w/ CPE - http://glassfish.java.net/public/CDDL+GPL_1_1.html +jersey-json-1.19.4.jar CDDL 1.1 + GPL2 w/ CPE - http://glassfish.java.net/public/CDDL+GPL_1_1.html +jsr311-api-1.1.1.jar CDDL License - http://www.opensource.org/licenses/cddl1.php +mimepull-1.9.11.jar Eclipse Distribution License - v 1.0 - http://www.eclipse.org/org/documents/edl-v10.php +policy-2.7.6.jar Eclipse Distribution License - v 1.0 - http://www.eclipse.org/org/documents/edl-v10.php +slf4j-api-1.7.26.jar MIT License - https://opensource.org/licenses/mit-license.php +slf4j-log4j12-1.7.26.jar MIT License - https://opensource.org/licenses/mit-license.php +stax-ex-1.8.1.jar Eclipse Distribution License - v 1.0 - http://www.eclipse.org/org/documents/edl-v10.php +stax2-api-4.2.jar The BSD License - http://www.opensource.org/licenses/bsd-license.php +streambuffer-1.5.7.jar Eclipse Distribution License - v 1.0 - http://www.eclipse.org/org/documents/edl-v10.php +txw2-2.3.2.jar Eclipse Distribution License - v 1.0 - http://www.eclipse.org/org/documents/edl-v10.php +wsdl4j-1.6.3.jar CPL - http://www.opensource.org/licenses/cpl1.0.txt + diff --git a/NEW_JARS b/doc/NEW_JARS similarity index 86% rename from NEW_JARS rename to doc/NEW_JARS index 50e7862..d7b1c56 100644 --- a/NEW_JARS +++ b/doc/NEW_JARS @@ -1,6 +1,6 @@ -# this command gets a list of jars in j11lib/ that are not present or different content in lib/. The output is below. -for y in j11lib/*.jar; do x=${y##*/}; if [ \! -e ./lib/$x ] || ! diff ./lib/$x $y; then echo $y; fi; done - +## this command gets a list of jars in j11lib/ that are not present or different content in lib/. The output is below. +#for y in j11lib/*.jar; do x=${y##*/}; if [ \! -e ./lib/$x ] || ! diff ./lib/$x $y; then echo $y; fi; done +# j11lib/FastInfoset.jar j11lib/getdown-core.jar j11lib/groovy-2.5.7.jar diff --git a/j11lib/javax.activation-MODULE.jar b/j11lib/javax.activation-MODULE.jar deleted file mode 100644 index b764265..0000000 Binary files a/j11lib/javax.activation-MODULE.jar and /dev/null differ diff --git a/j11lib/javax.activation-api-1.2.0.jar b/j11lib/javax.activation-api-1.2.0.jar new file mode 100644 index 0000000..986c365 Binary files /dev/null and b/j11lib/javax.activation-api-1.2.0.jar differ diff --git a/j11lib/javax.annotation-api-MODULE.jar b/j11lib/javax.annotation-api-1.3.2.jar similarity index 69% rename from j11lib/javax.annotation-api-MODULE.jar rename to j11lib/javax.annotation-api-1.3.2.jar index a0f12ad..a8a470a 100644 Binary files a/j11lib/javax.annotation-api-MODULE.jar and b/j11lib/javax.annotation-api-1.3.2.jar differ diff --git a/j11lib/javax.servlet-api-4.0.1.jar b/j11lib/javax.servlet-api-4.0.1.jar new file mode 100644 index 0000000..844ec7f Binary files /dev/null and b/j11lib/javax.servlet-api-4.0.1.jar differ diff --git a/j11lib/javax.servlet-api-MODULE.jar b/j11lib/javax.servlet-api-MODULE.jar deleted file mode 100644 index 9241563..0000000 Binary files a/j11lib/javax.servlet-api-MODULE.jar and /dev/null differ diff --git a/j11lib/javax.xml.soap-api.jar b/j11lib/javax.xml.soap-api-1.4.0.jar similarity index 100% rename from j11lib/javax.xml.soap-api.jar rename to j11lib/javax.xml.soap-api-1.4.0.jar diff --git a/j11lib/jaxb-api-java9.jar b/j11lib/jaxb-api-2.3.1.jar similarity index 60% rename from j11lib/jaxb-api-java9.jar rename to j11lib/jaxb-api-2.3.1.jar index 41de3c1..4565865 100644 Binary files a/j11lib/jaxb-api-java9.jar and b/j11lib/jaxb-api-2.3.1.jar differ diff --git a/j11lib/jaxb-runtime-2.3.2.jar b/j11lib/jaxb-runtime-2.3.2.jar new file mode 100644 index 0000000..62f8719 Binary files /dev/null and b/j11lib/jaxb-runtime-2.3.2.jar differ diff --git a/j11lib/jaxb-runtime.jar b/j11lib/jaxb-runtime.jar deleted file mode 100644 index 0b9ef67..0000000 Binary files a/j11lib/jaxb-runtime.jar and /dev/null differ diff --git a/j11lib/jaxws-api.jar b/j11lib/jaxws-api-2.3.1.jar similarity index 100% rename from j11lib/jaxws-api.jar rename to j11lib/jaxws-api-2.3.1.jar diff --git a/j11lib/jersey-client-1.19.1.jar b/j11lib/jersey-client-1.19.1.jar deleted file mode 100644 index 455a7f2..0000000 Binary files a/j11lib/jersey-client-1.19.1.jar and /dev/null differ diff --git a/j11lib/jersey-client-1.19.4.jar b/j11lib/jersey-client-1.19.4.jar new file mode 100644 index 0000000..0588ee2 Binary files /dev/null and b/j11lib/jersey-client-1.19.4.jar differ diff --git a/j11lib/jersey-core-1.19.1.jar b/j11lib/jersey-core-1.19.1.jar deleted file mode 100644 index 8e5185d..0000000 Binary files a/j11lib/jersey-core-1.19.1.jar and /dev/null differ diff --git a/j11lib/jersey-core-1.19.4.jar b/j11lib/jersey-core-1.19.4.jar new file mode 100644 index 0000000..e800c60 Binary files /dev/null and b/j11lib/jersey-core-1.19.4.jar differ diff --git a/j11lib/jersey-json-1.19.1.jar b/j11lib/jersey-json-1.19.4.jar similarity index 54% rename from j11lib/jersey-json-1.19.1.jar rename to j11lib/jersey-json-1.19.4.jar index 2cbf79e..c79271b 100644 Binary files a/j11lib/jersey-json-1.19.1.jar and b/j11lib/jersey-json-1.19.4.jar differ diff --git a/j11lib/mimepull-1.9.11.jar b/j11lib/mimepull-1.9.11.jar new file mode 100644 index 0000000..99a4aba Binary files /dev/null and b/j11lib/mimepull-1.9.11.jar differ diff --git a/j11lib/mimepull.jar b/j11lib/mimepull.jar deleted file mode 100644 index 9007c56..0000000 Binary files a/j11lib/mimepull.jar and /dev/null differ diff --git a/j11lib/policy-2.7.6.jar b/j11lib/policy-2.7.6.jar new file mode 100644 index 0000000..56b0e31 Binary files /dev/null and b/j11lib/policy-2.7.6.jar differ diff --git a/j11lib/policy.jar b/j11lib/policy.jar deleted file mode 100644 index 8a2ef0f..0000000 Binary files a/j11lib/policy.jar and /dev/null differ diff --git a/j11lib/slf4j-api-1.7.26.jar b/j11lib/slf4j-api-1.7.26.jar new file mode 100644 index 0000000..d2f27ac Binary files /dev/null and b/j11lib/slf4j-api-1.7.26.jar differ diff --git a/j11lib/slf4j-api-1.7.7.jar b/j11lib/slf4j-api-1.7.7.jar deleted file mode 100644 index b28e220..0000000 Binary files a/j11lib/slf4j-api-1.7.7.jar and /dev/null differ diff --git a/j11lib/slf4j-log4j12-1.7.26.jar b/j11lib/slf4j-log4j12-1.7.26.jar new file mode 100644 index 0000000..aed1195 Binary files /dev/null and b/j11lib/slf4j-log4j12-1.7.26.jar differ diff --git a/j11lib/slf4j-log4j12-1.7.7.jar b/j11lib/slf4j-log4j12-1.7.7.jar deleted file mode 100644 index 12c804e..0000000 Binary files a/j11lib/slf4j-log4j12-1.7.7.jar and /dev/null differ diff --git a/j11lib/stax-ex-1.8.1.jar b/j11lib/stax-ex-1.8.1.jar new file mode 100644 index 0000000..a200db5 Binary files /dev/null and b/j11lib/stax-ex-1.8.1.jar differ diff --git a/j11lib/stax-ex.jar b/j11lib/stax-ex.jar deleted file mode 100644 index 5e60637..0000000 Binary files a/j11lib/stax-ex.jar and /dev/null differ diff --git a/j11lib/stax2-api-4.2.jar b/j11lib/stax2-api-4.2.jar new file mode 100644 index 0000000..668dd42 Binary files /dev/null and b/j11lib/stax2-api-4.2.jar differ diff --git a/j11lib/stax2-api-MODULE.jar b/j11lib/stax2-api-MODULE.jar deleted file mode 100644 index eff6586..0000000 Binary files a/j11lib/stax2-api-MODULE.jar and /dev/null differ diff --git a/j11lib/streambuffer-1.5.7.jar b/j11lib/streambuffer-1.5.7.jar new file mode 100644 index 0000000..efc9a68 Binary files /dev/null and b/j11lib/streambuffer-1.5.7.jar differ diff --git a/j11lib/streambuffer.jar b/j11lib/streambuffer.jar deleted file mode 100644 index a8f9640..0000000 Binary files a/j11lib/streambuffer.jar and /dev/null differ diff --git a/j11lib/txw2-2.3.2.jar b/j11lib/txw2-2.3.2.jar new file mode 100644 index 0000000..0d5ac01 Binary files /dev/null and b/j11lib/txw2-2.3.2.jar differ diff --git a/j11lib/txw2.jar b/j11lib/txw2.jar deleted file mode 100644 index 75ed519..0000000 Binary files a/j11lib/txw2.jar and /dev/null differ diff --git a/j11lib/wsdl4j-1.6.3.jar b/j11lib/wsdl4j-1.6.3.jar new file mode 100644 index 0000000..b9c10b9 Binary files /dev/null and b/j11lib/wsdl4j-1.6.3.jar differ diff --git a/j11lib/wsdl4j-MODULE.jar b/j11lib/wsdl4j-MODULE.jar deleted file mode 100644 index 0f9e45c..0000000 Binary files a/j11lib/wsdl4j-MODULE.jar and /dev/null differ