From: Ben Soares Date: Fri, 13 Oct 2023 17:21:04 +0000 (+0100) Subject: JAL-3783 Updated groovy jars. Requires javaparser-core library to run too X-Git-Tag: Release_2_11_3_0~3^2~36^2~5 X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=d4eb0781b285bc64fbc9b040c9bfc1eb5f6d8267;p=jalview.git JAL-3783 Updated groovy jars. Requires javaparser-core library to run too --- diff --git a/j11lib/groovy-2.5.23.jar b/j11lib/groovy-2.5.23.jar deleted file mode 100644 index 70ac7a0..0000000 Binary files a/j11lib/groovy-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-4.0.15.jar b/j11lib/groovy-4.0.15.jar new file mode 100644 index 0000000..8423d99 Binary files /dev/null and b/j11lib/groovy-4.0.15.jar differ diff --git a/j11lib/groovy-ant-2.5.23.jar b/j11lib/groovy-ant-2.5.23.jar deleted file mode 100644 index 0cd3364..0000000 Binary files a/j11lib/groovy-ant-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-ant-4.0.15.jar b/j11lib/groovy-ant-4.0.15.jar new file mode 100644 index 0000000..b6a39ac Binary files /dev/null and b/j11lib/groovy-ant-4.0.15.jar differ diff --git a/j11lib/groovy-astbuilder-4.0.15.jar b/j11lib/groovy-astbuilder-4.0.15.jar new file mode 100644 index 0000000..f341fac Binary files /dev/null and b/j11lib/groovy-astbuilder-4.0.15.jar differ diff --git a/j11lib/groovy-bsf-2.5.23.jar b/j11lib/groovy-bsf-2.5.23.jar deleted file mode 100644 index 9131626..0000000 Binary files a/j11lib/groovy-bsf-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-cli-commons-2.5.23.jar b/j11lib/groovy-cli-commons-2.5.23.jar deleted file mode 100644 index ebdcff9..0000000 Binary files a/j11lib/groovy-cli-commons-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-cli-commons-4.0.15.jar b/j11lib/groovy-cli-commons-4.0.15.jar new file mode 100644 index 0000000..b482258 Binary files /dev/null and b/j11lib/groovy-cli-commons-4.0.15.jar differ diff --git a/j11lib/groovy-cli-picocli-2.5.23.jar b/j11lib/groovy-cli-picocli-2.5.23.jar deleted file mode 100644 index 56a828b..0000000 Binary files a/j11lib/groovy-cli-picocli-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-cli-picocli-4.0.15.jar b/j11lib/groovy-cli-picocli-4.0.15.jar new file mode 100644 index 0000000..3223ba9 Binary files /dev/null and b/j11lib/groovy-cli-picocli-4.0.15.jar differ diff --git a/j11lib/groovy-console-2.5.23.jar b/j11lib/groovy-console-2.5.23.jar deleted file mode 100644 index 99e4cd4..0000000 Binary files a/j11lib/groovy-console-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-console-4.0.15.jar b/j11lib/groovy-console-4.0.15.jar new file mode 100644 index 0000000..04a402a Binary files /dev/null and b/j11lib/groovy-console-4.0.15.jar differ diff --git a/j11lib/groovy-contracts-4.0.15.jar b/j11lib/groovy-contracts-4.0.15.jar new file mode 100644 index 0000000..6825657 Binary files /dev/null and b/j11lib/groovy-contracts-4.0.15.jar differ diff --git a/j11lib/groovy-datetime-2.5.23.jar b/j11lib/groovy-datetime-2.5.23.jar deleted file mode 100644 index 01137f9..0000000 Binary files a/j11lib/groovy-datetime-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-datetime-4.0.15.jar b/j11lib/groovy-datetime-4.0.15.jar new file mode 100644 index 0000000..312575a Binary files /dev/null and b/j11lib/groovy-datetime-4.0.15.jar differ diff --git a/j11lib/groovy-dateutil-2.5.23.jar b/j11lib/groovy-dateutil-2.5.23.jar deleted file mode 100644 index 1b1f493..0000000 Binary files a/j11lib/groovy-dateutil-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-dateutil-4.0.15.jar b/j11lib/groovy-dateutil-4.0.15.jar new file mode 100644 index 0000000..5893f97 Binary files /dev/null and b/j11lib/groovy-dateutil-4.0.15.jar differ diff --git a/j11lib/groovy-docgenerator-2.5.23.jar b/j11lib/groovy-docgenerator-2.5.23.jar deleted file mode 100644 index 0a46759..0000000 Binary files a/j11lib/groovy-docgenerator-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-docgenerator-4.0.15.jar b/j11lib/groovy-docgenerator-4.0.15.jar new file mode 100644 index 0000000..bf76564 Binary files /dev/null and b/j11lib/groovy-docgenerator-4.0.15.jar differ diff --git a/j11lib/groovy-ginq-4.0.15.jar b/j11lib/groovy-ginq-4.0.15.jar new file mode 100644 index 0000000..46f561e Binary files /dev/null and b/j11lib/groovy-ginq-4.0.15.jar differ diff --git a/j11lib/groovy-groovydoc-2.5.23.jar b/j11lib/groovy-groovydoc-2.5.23.jar deleted file mode 100644 index d45f1f5..0000000 Binary files a/j11lib/groovy-groovydoc-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-groovydoc-4.0.15.jar b/j11lib/groovy-groovydoc-4.0.15.jar new file mode 100644 index 0000000..b818919 Binary files /dev/null and b/j11lib/groovy-groovydoc-4.0.15.jar differ diff --git a/j11lib/groovy-groovysh-2.5.23.jar b/j11lib/groovy-groovysh-2.5.23.jar deleted file mode 100644 index 52bebfa..0000000 Binary files a/j11lib/groovy-groovysh-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-groovysh-4.0.15.jar b/j11lib/groovy-groovysh-4.0.15.jar new file mode 100644 index 0000000..253eff6 Binary files /dev/null and b/j11lib/groovy-groovysh-4.0.15.jar differ diff --git a/j11lib/groovy-jaxb-2.5.23.jar b/j11lib/groovy-jaxb-2.5.23.jar deleted file mode 100644 index 1027777..0000000 Binary files a/j11lib/groovy-jaxb-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-jmx-2.5.23.jar b/j11lib/groovy-jmx-2.5.23.jar deleted file mode 100644 index 5cda1ea..0000000 Binary files a/j11lib/groovy-jmx-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-jmx-4.0.15.jar b/j11lib/groovy-jmx-4.0.15.jar new file mode 100644 index 0000000..8667ac4 Binary files /dev/null and b/j11lib/groovy-jmx-4.0.15.jar differ diff --git a/j11lib/groovy-json-2.5.23.jar b/j11lib/groovy-json-2.5.23.jar deleted file mode 100644 index adb1a70..0000000 Binary files a/j11lib/groovy-json-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-json-4.0.15.jar b/j11lib/groovy-json-4.0.15.jar new file mode 100644 index 0000000..76b486a Binary files /dev/null and b/j11lib/groovy-json-4.0.15.jar differ diff --git a/j11lib/groovy-json-direct-2.5.23.jar b/j11lib/groovy-json-direct-2.5.23.jar deleted file mode 100644 index c6c3a36..0000000 Binary files a/j11lib/groovy-json-direct-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-jsr223-2.5.23.jar b/j11lib/groovy-jsr223-2.5.23.jar deleted file mode 100644 index 8009b2f..0000000 Binary files a/j11lib/groovy-jsr223-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-jsr223-4.0.15.jar b/j11lib/groovy-jsr223-4.0.15.jar new file mode 100644 index 0000000..5ae9f69 Binary files /dev/null and b/j11lib/groovy-jsr223-4.0.15.jar differ diff --git a/j11lib/groovy-macro-2.5.23.jar b/j11lib/groovy-macro-2.5.23.jar deleted file mode 100644 index ba1db57..0000000 Binary files a/j11lib/groovy-macro-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-macro-4.0.15.jar b/j11lib/groovy-macro-4.0.15.jar new file mode 100644 index 0000000..e5f7abb Binary files /dev/null and b/j11lib/groovy-macro-4.0.15.jar differ diff --git a/j11lib/groovy-macro-library-4.0.15.jar b/j11lib/groovy-macro-library-4.0.15.jar new file mode 100644 index 0000000..92c208f Binary files /dev/null and b/j11lib/groovy-macro-library-4.0.15.jar differ diff --git a/j11lib/groovy-nio-2.5.23.jar b/j11lib/groovy-nio-2.5.23.jar deleted file mode 100644 index cf61461..0000000 Binary files a/j11lib/groovy-nio-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-nio-4.0.15.jar b/j11lib/groovy-nio-4.0.15.jar new file mode 100644 index 0000000..e6e2ad8 Binary files /dev/null and b/j11lib/groovy-nio-4.0.15.jar differ diff --git a/j11lib/groovy-servlet-2.5.23.jar b/j11lib/groovy-servlet-2.5.23.jar deleted file mode 100644 index 6b47af9..0000000 Binary files a/j11lib/groovy-servlet-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-servlet-4.0.15.jar b/j11lib/groovy-servlet-4.0.15.jar new file mode 100644 index 0000000..711a1e2 Binary files /dev/null and b/j11lib/groovy-servlet-4.0.15.jar differ diff --git a/j11lib/groovy-sql-2.5.23.jar b/j11lib/groovy-sql-2.5.23.jar deleted file mode 100644 index 921bc9a..0000000 Binary files a/j11lib/groovy-sql-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-sql-4.0.15.jar b/j11lib/groovy-sql-4.0.15.jar new file mode 100644 index 0000000..058db44 Binary files /dev/null and b/j11lib/groovy-sql-4.0.15.jar differ diff --git a/j11lib/groovy-swing-2.5.23.jar b/j11lib/groovy-swing-2.5.23.jar deleted file mode 100644 index 7ee801d..0000000 Binary files a/j11lib/groovy-swing-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-swing-4.0.15.jar b/j11lib/groovy-swing-4.0.15.jar new file mode 100644 index 0000000..848d074 Binary files /dev/null and b/j11lib/groovy-swing-4.0.15.jar differ diff --git a/j11lib/groovy-templates-2.5.23.jar b/j11lib/groovy-templates-2.5.23.jar deleted file mode 100644 index 9da1afc..0000000 Binary files a/j11lib/groovy-templates-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-templates-4.0.15.jar b/j11lib/groovy-templates-4.0.15.jar new file mode 100644 index 0000000..3cd0245 Binary files /dev/null and b/j11lib/groovy-templates-4.0.15.jar differ diff --git a/j11lib/groovy-test-2.5.23.jar b/j11lib/groovy-test-2.5.23.jar deleted file mode 100644 index fd33542..0000000 Binary files a/j11lib/groovy-test-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-test-4.0.15.jar b/j11lib/groovy-test-4.0.15.jar new file mode 100644 index 0000000..e600dc7 Binary files /dev/null and b/j11lib/groovy-test-4.0.15.jar differ diff --git a/j11lib/groovy-test-junit5-2.5.23.jar b/j11lib/groovy-test-junit5-2.5.23.jar deleted file mode 100644 index addce25..0000000 Binary files a/j11lib/groovy-test-junit5-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-test-junit5-4.0.15.jar b/j11lib/groovy-test-junit5-4.0.15.jar new file mode 100644 index 0000000..abcc69a Binary files /dev/null and b/j11lib/groovy-test-junit5-4.0.15.jar differ diff --git a/j11lib/groovy-testng-2.5.23.jar b/j11lib/groovy-testng-2.5.23.jar deleted file mode 100644 index aaf0cf0..0000000 Binary files a/j11lib/groovy-testng-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-testng-4.0.15.jar b/j11lib/groovy-testng-4.0.15.jar new file mode 100644 index 0000000..60c1b58 Binary files /dev/null and b/j11lib/groovy-testng-4.0.15.jar differ diff --git a/j11lib/groovy-toml-4.0.15.jar b/j11lib/groovy-toml-4.0.15.jar new file mode 100644 index 0000000..ad49634 Binary files /dev/null and b/j11lib/groovy-toml-4.0.15.jar differ diff --git a/j11lib/groovy-typecheckers-4.0.15.jar b/j11lib/groovy-typecheckers-4.0.15.jar new file mode 100644 index 0000000..dc113c3 Binary files /dev/null and b/j11lib/groovy-typecheckers-4.0.15.jar differ diff --git a/j11lib/groovy-xml-2.5.23.jar b/j11lib/groovy-xml-2.5.23.jar deleted file mode 100644 index 61a9c18..0000000 Binary files a/j11lib/groovy-xml-2.5.23.jar and /dev/null differ diff --git a/j11lib/groovy-xml-4.0.15.jar b/j11lib/groovy-xml-4.0.15.jar new file mode 100644 index 0000000..21aeea0 Binary files /dev/null and b/j11lib/groovy-xml-4.0.15.jar differ diff --git a/j11lib/groovy-yaml-4.0.15.jar b/j11lib/groovy-yaml-4.0.15.jar new file mode 100644 index 0000000..207d47d Binary files /dev/null and b/j11lib/groovy-yaml-4.0.15.jar differ diff --git a/j11lib/javaparser-core-3.25.5.jar b/j11lib/javaparser-core-3.25.5.jar new file mode 100644 index 0000000..92eed53 Binary files /dev/null and b/j11lib/javaparser-core-3.25.5.jar differ diff --git a/j8lib/groovy-2.5.23.jar b/j8lib/groovy-2.5.23.jar deleted file mode 100644 index 70ac7a0..0000000 Binary files a/j8lib/groovy-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-4.0.15.jar b/j8lib/groovy-4.0.15.jar new file mode 100644 index 0000000..8423d99 Binary files /dev/null and b/j8lib/groovy-4.0.15.jar differ diff --git a/j8lib/groovy-ant-2.5.23.jar b/j8lib/groovy-ant-2.5.23.jar deleted file mode 100644 index 0cd3364..0000000 Binary files a/j8lib/groovy-ant-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-ant-4.0.15.jar b/j8lib/groovy-ant-4.0.15.jar new file mode 100644 index 0000000..b6a39ac Binary files /dev/null and b/j8lib/groovy-ant-4.0.15.jar differ diff --git a/j8lib/groovy-astbuilder-4.0.15.jar b/j8lib/groovy-astbuilder-4.0.15.jar new file mode 100644 index 0000000..f341fac Binary files /dev/null and b/j8lib/groovy-astbuilder-4.0.15.jar differ diff --git a/j8lib/groovy-bsf-2.5.23.jar b/j8lib/groovy-bsf-2.5.23.jar deleted file mode 100644 index 9131626..0000000 Binary files a/j8lib/groovy-bsf-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-cli-commons-2.5.23.jar b/j8lib/groovy-cli-commons-2.5.23.jar deleted file mode 100644 index ebdcff9..0000000 Binary files a/j8lib/groovy-cli-commons-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-cli-commons-4.0.15.jar b/j8lib/groovy-cli-commons-4.0.15.jar new file mode 100644 index 0000000..b482258 Binary files /dev/null and b/j8lib/groovy-cli-commons-4.0.15.jar differ diff --git a/j8lib/groovy-cli-picocli-2.5.23.jar b/j8lib/groovy-cli-picocli-2.5.23.jar deleted file mode 100644 index 56a828b..0000000 Binary files a/j8lib/groovy-cli-picocli-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-cli-picocli-4.0.15.jar b/j8lib/groovy-cli-picocli-4.0.15.jar new file mode 100644 index 0000000..3223ba9 Binary files /dev/null and b/j8lib/groovy-cli-picocli-4.0.15.jar differ diff --git a/j8lib/groovy-console-2.5.23.jar b/j8lib/groovy-console-2.5.23.jar deleted file mode 100644 index 99e4cd4..0000000 Binary files a/j8lib/groovy-console-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-console-4.0.15.jar b/j8lib/groovy-console-4.0.15.jar new file mode 100644 index 0000000..04a402a Binary files /dev/null and b/j8lib/groovy-console-4.0.15.jar differ diff --git a/j8lib/groovy-contracts-4.0.15.jar b/j8lib/groovy-contracts-4.0.15.jar new file mode 100644 index 0000000..6825657 Binary files /dev/null and b/j8lib/groovy-contracts-4.0.15.jar differ diff --git a/j8lib/groovy-datetime-2.5.23.jar b/j8lib/groovy-datetime-2.5.23.jar deleted file mode 100644 index 01137f9..0000000 Binary files a/j8lib/groovy-datetime-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-datetime-4.0.15.jar b/j8lib/groovy-datetime-4.0.15.jar new file mode 100644 index 0000000..312575a Binary files /dev/null and b/j8lib/groovy-datetime-4.0.15.jar differ diff --git a/j8lib/groovy-dateutil-2.5.23.jar b/j8lib/groovy-dateutil-2.5.23.jar deleted file mode 100644 index 1b1f493..0000000 Binary files a/j8lib/groovy-dateutil-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-dateutil-4.0.15.jar b/j8lib/groovy-dateutil-4.0.15.jar new file mode 100644 index 0000000..5893f97 Binary files /dev/null and b/j8lib/groovy-dateutil-4.0.15.jar differ diff --git a/j8lib/groovy-docgenerator-2.5.23.jar b/j8lib/groovy-docgenerator-2.5.23.jar deleted file mode 100644 index 0a46759..0000000 Binary files a/j8lib/groovy-docgenerator-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-docgenerator-4.0.15.jar b/j8lib/groovy-docgenerator-4.0.15.jar new file mode 100644 index 0000000..bf76564 Binary files /dev/null and b/j8lib/groovy-docgenerator-4.0.15.jar differ diff --git a/j8lib/groovy-ginq-4.0.15.jar b/j8lib/groovy-ginq-4.0.15.jar new file mode 100644 index 0000000..46f561e Binary files /dev/null and b/j8lib/groovy-ginq-4.0.15.jar differ diff --git a/j8lib/groovy-groovydoc-2.5.23.jar b/j8lib/groovy-groovydoc-2.5.23.jar deleted file mode 100644 index d45f1f5..0000000 Binary files a/j8lib/groovy-groovydoc-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-groovydoc-4.0.15.jar b/j8lib/groovy-groovydoc-4.0.15.jar new file mode 100644 index 0000000..b818919 Binary files /dev/null and b/j8lib/groovy-groovydoc-4.0.15.jar differ diff --git a/j8lib/groovy-groovysh-2.5.23.jar b/j8lib/groovy-groovysh-2.5.23.jar deleted file mode 100644 index 52bebfa..0000000 Binary files a/j8lib/groovy-groovysh-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-groovysh-4.0.15.jar b/j8lib/groovy-groovysh-4.0.15.jar new file mode 100644 index 0000000..253eff6 Binary files /dev/null and b/j8lib/groovy-groovysh-4.0.15.jar differ diff --git a/j8lib/groovy-jaxb-2.5.23.jar b/j8lib/groovy-jaxb-2.5.23.jar deleted file mode 100644 index 1027777..0000000 Binary files a/j8lib/groovy-jaxb-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-jmx-2.5.23.jar b/j8lib/groovy-jmx-2.5.23.jar deleted file mode 100644 index 5cda1ea..0000000 Binary files a/j8lib/groovy-jmx-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-jmx-4.0.15.jar b/j8lib/groovy-jmx-4.0.15.jar new file mode 100644 index 0000000..8667ac4 Binary files /dev/null and b/j8lib/groovy-jmx-4.0.15.jar differ diff --git a/j8lib/groovy-json-2.5.23.jar b/j8lib/groovy-json-2.5.23.jar deleted file mode 100644 index adb1a70..0000000 Binary files a/j8lib/groovy-json-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-json-4.0.15.jar b/j8lib/groovy-json-4.0.15.jar new file mode 100644 index 0000000..76b486a Binary files /dev/null and b/j8lib/groovy-json-4.0.15.jar differ diff --git a/j8lib/groovy-json-direct-2.5.23.jar b/j8lib/groovy-json-direct-2.5.23.jar deleted file mode 100644 index c6c3a36..0000000 Binary files a/j8lib/groovy-json-direct-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-jsr223-2.5.23.jar b/j8lib/groovy-jsr223-2.5.23.jar deleted file mode 100644 index 8009b2f..0000000 Binary files a/j8lib/groovy-jsr223-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-jsr223-4.0.15.jar b/j8lib/groovy-jsr223-4.0.15.jar new file mode 100644 index 0000000..5ae9f69 Binary files /dev/null and b/j8lib/groovy-jsr223-4.0.15.jar differ diff --git a/j8lib/groovy-macro-2.5.23.jar b/j8lib/groovy-macro-2.5.23.jar deleted file mode 100644 index ba1db57..0000000 Binary files a/j8lib/groovy-macro-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-macro-4.0.15.jar b/j8lib/groovy-macro-4.0.15.jar new file mode 100644 index 0000000..e5f7abb Binary files /dev/null and b/j8lib/groovy-macro-4.0.15.jar differ diff --git a/j8lib/groovy-macro-library-4.0.15.jar b/j8lib/groovy-macro-library-4.0.15.jar new file mode 100644 index 0000000..92c208f Binary files /dev/null and b/j8lib/groovy-macro-library-4.0.15.jar differ diff --git a/j8lib/groovy-nio-2.5.23.jar b/j8lib/groovy-nio-2.5.23.jar deleted file mode 100644 index cf61461..0000000 Binary files a/j8lib/groovy-nio-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-nio-4.0.15.jar b/j8lib/groovy-nio-4.0.15.jar new file mode 100644 index 0000000..e6e2ad8 Binary files /dev/null and b/j8lib/groovy-nio-4.0.15.jar differ diff --git a/j8lib/groovy-servlet-2.5.23.jar b/j8lib/groovy-servlet-2.5.23.jar deleted file mode 100644 index 6b47af9..0000000 Binary files a/j8lib/groovy-servlet-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-servlet-4.0.15.jar b/j8lib/groovy-servlet-4.0.15.jar new file mode 100644 index 0000000..711a1e2 Binary files /dev/null and b/j8lib/groovy-servlet-4.0.15.jar differ diff --git a/j8lib/groovy-sql-2.5.23.jar b/j8lib/groovy-sql-2.5.23.jar deleted file mode 100644 index 921bc9a..0000000 Binary files a/j8lib/groovy-sql-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-sql-4.0.15.jar b/j8lib/groovy-sql-4.0.15.jar new file mode 100644 index 0000000..058db44 Binary files /dev/null and b/j8lib/groovy-sql-4.0.15.jar differ diff --git a/j8lib/groovy-swing-2.5.23.jar b/j8lib/groovy-swing-2.5.23.jar deleted file mode 100644 index 7ee801d..0000000 Binary files a/j8lib/groovy-swing-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-swing-4.0.15.jar b/j8lib/groovy-swing-4.0.15.jar new file mode 100644 index 0000000..848d074 Binary files /dev/null and b/j8lib/groovy-swing-4.0.15.jar differ diff --git a/j8lib/groovy-templates-2.5.23.jar b/j8lib/groovy-templates-2.5.23.jar deleted file mode 100644 index 9da1afc..0000000 Binary files a/j8lib/groovy-templates-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-templates-4.0.15.jar b/j8lib/groovy-templates-4.0.15.jar new file mode 100644 index 0000000..3cd0245 Binary files /dev/null and b/j8lib/groovy-templates-4.0.15.jar differ diff --git a/j8lib/groovy-test-2.5.23.jar b/j8lib/groovy-test-2.5.23.jar deleted file mode 100644 index fd33542..0000000 Binary files a/j8lib/groovy-test-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-test-4.0.15.jar b/j8lib/groovy-test-4.0.15.jar new file mode 100644 index 0000000..e600dc7 Binary files /dev/null and b/j8lib/groovy-test-4.0.15.jar differ diff --git a/j8lib/groovy-test-junit5-2.5.23.jar b/j8lib/groovy-test-junit5-2.5.23.jar deleted file mode 100644 index addce25..0000000 Binary files a/j8lib/groovy-test-junit5-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-test-junit5-4.0.15.jar b/j8lib/groovy-test-junit5-4.0.15.jar new file mode 100644 index 0000000..abcc69a Binary files /dev/null and b/j8lib/groovy-test-junit5-4.0.15.jar differ diff --git a/j8lib/groovy-testng-2.5.23.jar b/j8lib/groovy-testng-2.5.23.jar deleted file mode 100644 index aaf0cf0..0000000 Binary files a/j8lib/groovy-testng-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-testng-4.0.15.jar b/j8lib/groovy-testng-4.0.15.jar new file mode 100644 index 0000000..60c1b58 Binary files /dev/null and b/j8lib/groovy-testng-4.0.15.jar differ diff --git a/j8lib/groovy-toml-4.0.15.jar b/j8lib/groovy-toml-4.0.15.jar new file mode 100644 index 0000000..ad49634 Binary files /dev/null and b/j8lib/groovy-toml-4.0.15.jar differ diff --git a/j8lib/groovy-typecheckers-4.0.15.jar b/j8lib/groovy-typecheckers-4.0.15.jar new file mode 100644 index 0000000..dc113c3 Binary files /dev/null and b/j8lib/groovy-typecheckers-4.0.15.jar differ diff --git a/j8lib/groovy-xml-2.5.23.jar b/j8lib/groovy-xml-2.5.23.jar deleted file mode 100644 index 61a9c18..0000000 Binary files a/j8lib/groovy-xml-2.5.23.jar and /dev/null differ diff --git a/j8lib/groovy-xml-4.0.15.jar b/j8lib/groovy-xml-4.0.15.jar new file mode 100644 index 0000000..21aeea0 Binary files /dev/null and b/j8lib/groovy-xml-4.0.15.jar differ diff --git a/j8lib/groovy-yaml-4.0.15.jar b/j8lib/groovy-yaml-4.0.15.jar new file mode 100644 index 0000000..207d47d Binary files /dev/null and b/j8lib/groovy-yaml-4.0.15.jar differ diff --git a/j8lib/javaparser-core-3.25.5.jar b/j8lib/javaparser-core-3.25.5.jar new file mode 100644 index 0000000..92eed53 Binary files /dev/null and b/j8lib/javaparser-core-3.25.5.jar differ diff --git a/src/jalview/gui/AlignFrame.java b/src/jalview/gui/AlignFrame.java index f3cb012..00bd4f9 100644 --- a/src/jalview/gui/AlignFrame.java +++ b/src/jalview/gui/AlignFrame.java @@ -5964,7 +5964,7 @@ public class AlignFrame extends GAlignFrame implements DropTargetListener, protected void runGroovy_actionPerformed() { Jalview.setCurrentAlignFrame(this); - groovy.ui.Console console = Desktop.getGroovyConsole(); + groovy.console.ui.Console console = Desktop.getGroovyConsole(); if (console != null) { try diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index ab5800c..0ebc58b 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -2624,7 +2624,7 @@ public class Desktop extends jalview.jbgui.GDesktop openGroovyConsole(); } catch (Exception ex) { - jalview.bin.Console.error("Groovy Shell Creation failed.", ex); + jalview.bin.Console.error("Groovy Console creation failed.", ex); JvOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager.getString("label.couldnt_create_groovy_shell"), @@ -2640,7 +2640,7 @@ public class Desktop extends jalview.jbgui.GDesktop { if (groovyConsole == null) { - groovyConsole = new groovy.ui.Console(); + groovyConsole = new groovy.console.ui.Console(); groovyConsole.setVariable("Jalview", this); groovyConsole.run(); @@ -3123,7 +3123,7 @@ public class Desktop extends jalview.jbgui.GDesktop */ private Semaphore block = new Semaphore(0); - private static groovy.ui.Console groovyConsole; + private static groovy.console.ui.Console groovyConsole; /** * add another dialog thread to the queue @@ -3385,7 +3385,7 @@ public class Desktop extends jalview.jbgui.GDesktop myTopFrame.setDisplayedView(myTopFrame.alignPanel); } - public static groovy.ui.Console getGroovyConsole() + public static groovy.console.ui.Console getGroovyConsole() { return groovyConsole; }