This is an automated email from the ASF dual-hosted git repository. vnick pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-client.git
commit 24681059c34c9544f7cd2b658c4a1ca479f74fc1 Merge: d4e3d8c 7ae3cc1 Author: Virtually Nick <[email protected]> AuthorDate: Thu Apr 1 16:00:37 2021 -0400 GUACAMOLE-1298: Merge correct mismatched dependencies from migration to Jersey 2.x. .ratignore | 3 + .../src/licenses/bundled => doc/licenses}/README | 0 .../bundled => doc/licenses}/angular-1.6.9/LICENSE | 0 doc/licenses/angular-1.6.9/README | 8 + doc/licenses/angular-1.6.9/maven-coordinates.txt | 3 + .../licenses}/angular-module-shim-0.0.4/LICENSE | 0 doc/licenses/angular-module-shim-0.0.4/README | 8 + .../maven-coordinates.txt | 1 + .../licenses}/angular-translate-2.16.0/LICENSE | 0 doc/licenses/angular-translate-2.16.0/README | 8 + .../angular-translate-2.16.0/maven-coordinates.txt | 3 + doc/licenses/antlr-2.7.7/LICENSE.txt | 31 + doc/licenses/antlr-2.7.7/README | 8 + doc/licenses/antlr-2.7.7/maven-coordinates.txt | 1 + .../licenses}/aopalliance-1.0/LICENSE | 0 doc/licenses/aopalliance-1.0/README | 8 + doc/licenses/aopalliance-1.0/maven-coordinates.txt | 1 + doc/licenses/apache-commons-beanutils-1.7.0/NOTICE | 2 + doc/licenses/apache-commons-beanutils-1.7.0/README | 9 + .../maven-coordinates.txt | 2 + doc/licenses/apache-commons-chain-1.2/NOTICE | 5 + doc/licenses/apache-commons-chain-1.2/README | 9 + .../apache-commons-chain-1.2/maven-coordinates.txt | 1 + doc/licenses/apache-commons-codec-1.12/NOTICE | 17 + doc/licenses/apache-commons-codec-1.12/README | 8 + .../maven-coordinates.txt | 1 + doc/licenses/apache-commons-collections-3.2/NOTICE | 2 + doc/licenses/apache-commons-collections-3.2/README | 9 + .../maven-coordinates.txt | 1 + .../apache-commons-collections-4.3}/NOTICE | 4 +- doc/licenses/apache-commons-collections-4.3/README | 9 + .../maven-coordinates.txt | 1 + .../apache-commons-configuration-1.5/NOTICE | 5 + .../apache-commons-configuration-1.5/README | 9 + .../maven-coordinates.txt | 1 + doc/licenses/apache-commons-digester-1.8/NOTICE | 5 + doc/licenses/apache-commons-digester-1.8/README | 9 + .../maven-coordinates.txt | 1 + doc/licenses/apache-commons-lang-2.3/NOTICE | 5 + doc/licenses/apache-commons-lang-2.3/README | 8 + .../apache-commons-lang-2.3/maven-coordinates.txt | 1 + doc/licenses/apache-commons-lang-3.4/NOTICE | 8 + doc/licenses/apache-commons-lang-3.4/README | 8 + .../apache-commons-lang-3.4/maven-coordinates.txt | 1 + .../licenses/apache-commons-lang-3.9}/NOTICE | 4 +- doc/licenses/apache-commons-lang-3.9/README | 8 + .../apache-commons-lang-3.9/maven-coordinates.txt | 1 + .../licenses/apache-commons-logging-1.1.1}/NOTICE | 5 +- doc/licenses/apache-commons-logging-1.1.1/README | 9 + .../maven-coordinates.txt | 1 + doc/licenses/apache-commons-pool-1.5.4/NOTICE | 12 + doc/licenses/apache-commons-pool-1.5.4/README | 8 + .../maven-coordinates.txt | 1 + doc/licenses/apache-commons-pool-2.6.2/NOTICE | 12 + doc/licenses/apache-commons-pool-2.6.2/README | 8 + .../maven-coordinates.txt | 1 + .../licenses/apache-mina-2.1.3}/NOTICE | 4 +- doc/licenses/apache-mina-2.1.3/README | 8 + .../apache-mina-2.1.3/maven-coordinates.txt | 1 + doc/licenses/apache-santuario-2.1.4/NOTICE | 12 + doc/licenses/apache-santuario-2.1.4/README | 8 + .../apache-santuario-2.1.4/maven-coordinates.txt | 1 + .../blob-polyfill-1.0.20150320/LICENSE.md | 0 doc/licenses/blob-polyfill-1.0.20150320/README | 8 + .../maven-coordinates.txt | 1 + .../licenses}/bouncycastle-1.44/LICENSE | 0 doc/licenses/bouncycastle-1.44/README | 8 + .../bouncycastle-1.44/maven-coordinates.txt | 1 + doc/licenses/cas-client-3.4.1/NOTICE | 2 + doc/licenses/cas-client-3.4.1/README | 8 + .../cas-client-3.4.1/maven-coordinates.txt | 1 + .../licenses/checker-qual-3.5.0/LICENSE.txt | 5 +- doc/licenses/checker-qual-3.5.0/README | 8 + .../checker-qual-3.5.0/maven-coordinates.txt | 1 + .../licenses}/datalist-polyfill-1.14.0/LICENSE | 0 doc/licenses/datalist-polyfill-1.14.0/README | 8 + .../datalist-polyfill-1.14.0/maven-coordinates.txt | 1 + doc/licenses/directory-api-2.0.0/NOTICE | 24 + doc/licenses/directory-api-2.0.0/README | 8 + .../directory-api-2.0.0/maven-coordinates.txt | 1 + doc/licenses/dom4j-2.1.1/LICENSE | 39 + doc/licenses/dom4j-2.1.1/README | 8 + doc/licenses/dom4j-2.1.1/maven-coordinates.txt | 1 + doc/licenses/ehcache-2.4.0/README | 8 + doc/licenses/ehcache-2.4.0/maven-coordinates.txt | 1 + doc/licenses/error-prone-2.3.4/README | 8 + .../error-prone-2.3.4/maven-coordinates.txt | 1 + .../licenses}/filesaver-1.3.3/LICENSE.md | 0 doc/licenses/filesaver-1.3.3/README | 8 + doc/licenses/filesaver-1.3.3/maven-coordinates.txt | 1 + doc/licenses/findbugs-jsr305-3.0.2/LICENSE | 28 + doc/licenses/findbugs-jsr305-3.0.2/README | 8 + .../findbugs-jsr305-3.0.2/maven-coordinates.txt | 1 + doc/licenses/generate-license-files.sh | 364 ++++++++++ doc/licenses/glassfish-hk2-2.6.1/LICENSE.md | 637 +++++++++++++++++ doc/licenses/glassfish-hk2-2.6.1/README | 8 + .../glassfish-hk2-2.6.1/maven-coordinates.txt | 6 + doc/licenses/guava-30.1-jre/README | 8 + doc/licenses/guava-30.1-jre/maven-coordinates.txt | 3 + doc/licenses/guice-4.2.3/README | 8 + doc/licenses/guice-4.2.3/maven-coordinates.txt | 4 + doc/licenses/j2objc-annotations-1.3/README | 8 + .../j2objc-annotations-1.3/maven-coordinates.txt | 1 + doc/licenses/jackson-2.10.1/NOTICE | 5 + doc/licenses/jackson-2.10.1/README | 8 + doc/licenses/jackson-2.10.1/maven-coordinates.txt | 4 + doc/licenses/jai-imageio-core-1.3.1/LICENSE.txt | 39 + doc/licenses/jai-imageio-core-1.3.1/README | 12 + .../jai-imageio-core-1.3.1/maven-coordinates.txt | 1 + doc/licenses/jakarta-activation-1.2.1/LICENSE.md | 29 + doc/licenses/jakarta-activation-1.2.1/README | 8 + .../jakarta-activation-1.2.1/maven-coordinates.txt | 1 + doc/licenses/jakarta-activation-1.2.2/LICENSE.md | 29 + doc/licenses/jakarta-activation-1.2.2/README | 8 + .../jakarta-activation-1.2.2/maven-coordinates.txt | 2 + .../jakarta-annotation-api-1.3.5/LICENSE.md | 637 +++++++++++++++++ doc/licenses/jakarta-annotation-api-1.3.5/README | 8 + .../maven-coordinates.txt | 1 + doc/licenses/jakarta-jaxb-2.3.2/LICENSE.md | 28 + doc/licenses/jakarta-jaxb-2.3.2/README | 8 + .../jakarta-jaxb-2.3.2/maven-coordinates.txt | 3 + doc/licenses/jakarta-jaxb-2.3.3/LICENSE.md | 28 + doc/licenses/jakarta-jaxb-2.3.3/README | 8 + .../jakarta-jaxb-2.3.3/maven-coordinates.txt | 1 + doc/licenses/jakarta-validation-api-2.0.2/NOTICE | 11 + doc/licenses/jakarta-validation-api-2.0.2/README | 8 + .../maven-coordinates.txt | 1 + doc/licenses/jakarta-ws-rs-api-2.1.6/LICENSE.md | 637 +++++++++++++++++ doc/licenses/jakarta-ws-rs-api-2.1.6/README | 8 + .../jakarta-ws-rs-api-2.1.6/maven-coordinates.txt | 1 + .../licenses}/java-saml-2.5.0/LICENSE | 0 doc/licenses/java-saml-2.5.0/README | 8 + doc/licenses/java-saml-2.5.0/maven-coordinates.txt | 2 + doc/licenses/javassist-3.25.0-ga/README | 8 + .../javassist-3.25.0-ga/maven-coordinates.txt | 1 + doc/licenses/javax.inject-1/README | 8 + doc/licenses/javax.inject-1/maven-coordinates.txt | 1 + doc/licenses/jaxb-fi-1.2.16/NOTICE | 11 + doc/licenses/jaxb-fi-1.2.16/README | 8 + doc/licenses/jaxb-fi-1.2.16/maven-coordinates.txt | 1 + doc/licenses/jaxb-istack-commons/LICENSE.md | 29 + doc/licenses/jaxb-istack-commons/README | 9 + .../jaxb-istack-commons/maven-coordinates.txt | 1 + doc/licenses/jcommander-1.72/NOTICE | 1 + doc/licenses/jcommander-1.72/README | 8 + doc/licenses/jcommander-1.72/maven-coordinates.txt | 1 + doc/licenses/jersey-2.31/LICENSE.md | 637 +++++++++++++++++ doc/licenses/jersey-2.31/README | 8 + doc/licenses/jersey-2.31/maven-coordinates.txt | 8 + doc/licenses/joda-time-2.10.3/NOTICE | 2 + doc/licenses/joda-time-2.10.3/README | 8 + .../joda-time-2.10.3/maven-coordinates.txt | 1 + .../NOTICE.txt => doc/licenses/jose4j-0.5.5/NOTICE | 0 doc/licenses/jose4j-0.5.5/README | 8 + doc/licenses/jose4j-0.5.5/maven-coordinates.txt | 1 + .../licenses}/jquery-3.3.1/LICENSE.txt | 0 doc/licenses/jquery-3.3.1/README | 8 + doc/licenses/jquery-3.3.1/maven-coordinates.txt | 1 + .../bundled => doc/licenses}/jradius-1.1.5/LICENSE | 0 doc/licenses/jradius-1.1.5/README | 8 + doc/licenses/jradius-1.1.5/maven-coordinates.txt | 3 + .../licenses}/jsr250-api-1.0/CDDLv1.0.txt | 0 doc/licenses/jsr250-api-1.0/README | 9 + doc/licenses/jsr250-api-1.0/maven-coordinates.txt | 1 + .../bundled => doc/licenses}/jstz-1.0.10/LICENSE | 0 doc/licenses/jstz-1.0.10/README | 8 + doc/licenses/jstz-1.0.10/maven-coordinates.txt | 1 + .../licenses}/lodash-4.17.10/LICENSE | 0 doc/licenses/lodash-4.17.10/README | 8 + doc/licenses/lodash-4.17.10/maven-coordinates.txt | 1 + .../licenses/logback-1.2.3}/LICENSE.txt | 2 +- doc/licenses/logback-1.2.3/README | 8 + doc/licenses/logback-1.2.3/maven-coordinates.txt | 2 + .../licenses}/messageformat-1.0.2/LICENSE | 0 doc/licenses/messageformat-1.0.2/README | 8 + .../messageformat-1.0.2/maven-coordinates.txt | 1 + .../bundled => doc/licenses}/mybatis-3.2.8/NOTICE | 23 - doc/licenses/mybatis-3.2.8/README | 8 + doc/licenses/mybatis-3.2.8/maven-coordinates.txt | 1 + doc/licenses/mybatis-guice-3.6/NOTICE | 15 + doc/licenses/mybatis-guice-3.6/README | 8 + .../mybatis-guice-3.6/maven-coordinates.txt | 1 + .../osgi-resource-locator-1.0.3/LICENSE.md | 637 +++++++++++++++++ doc/licenses/osgi-resource-locator-1.0.3/README | 8 + .../maven-coordinates.txt | 1 + .../bundled => doc/licenses}/pickr-1.2.6/LICENSE | 0 doc/licenses/pickr-1.2.6/README | 8 + doc/licenses/pickr-1.2.6/maven-coordinates.txt | 1 + .../licenses/slf4j-api-1.7.30}/LICENSE.txt | 2 +- doc/licenses/slf4j-api-1.7.30/README | 8 + .../slf4j-api-1.7.30/maven-coordinates.txt | 2 + doc/licenses/spring-framework-3.0.5/README | 8 + .../spring-framework-3.0.5/maven-coordinates.txt | 6 + doc/licenses/spring-framework-5.2.9/README | 8 + .../spring-framework-5.2.9/maven-coordinates.txt | 7 + doc/licenses/spring-security-5.4.1/NOTICE | 2 + doc/licenses/spring-security-5.4.1/README | 8 + .../spring-security-5.4.1/maven-coordinates.txt | 2 + doc/licenses/stax-ex-1.8.1/LICENSE.md | 29 + doc/licenses/stax-ex-1.8.1/README | 8 + doc/licenses/stax-ex-1.8.1/maven-coordinates.txt | 1 + .../licenses/webjars-servlet-2.x-1.5}/LICENSE | 0 doc/licenses/webjars-servlet-2.x-1.5/README | 8 + .../webjars-servlet-2.x-1.5/maven-coordinates.txt | 1 + doc/licenses/woodstox-core-5.0.3/README | 8 + .../woodstox-core-5.0.3/maven-coordinates.txt | 1 + .../licenses}/woodstox-stax2-api-3.1.4/LICENSE | 0 doc/licenses/woodstox-stax2-api-3.1.4/README | 8 + .../woodstox-stax2-api-3.1.4/maven-coordinates.txt | 1 + doc/licenses/xpp3-1.1.4c/LICENSE.txt | 46 ++ doc/licenses/xpp3-1.1.4c/NOTICE | 2 + doc/licenses/xpp3-1.1.4c/README | 9 + doc/licenses/xpp3-1.1.4c/maven-coordinates.txt | 1 + doc/licenses/zxing-3.3.1/NOTICE | 7 + doc/licenses/zxing-3.3.1/README | 8 + doc/licenses/zxing-3.3.1/maven-coordinates.txt | 2 + extensions/.ratignore | 1 + extensions/guacamole-auth-cas/.ratignore | 0 extensions/guacamole-auth-cas/pom.xml | 106 +-- extensions/guacamole-auth-cas/src/licenses/LICENSE | 248 ------- .../src/licenses/bundled/aopalliance-1.0/LICENSE | 4 - .../src/licenses/bundled/guava-27.0.1-jre/COPYING | 202 ------ .../src/licenses/bundled/guice-3.0/COPYING | 202 ------ .../bundled/javax.inject-1/LICENSE-2.0.txt | 202 ------ .../guacamole-auth-cas/src/main/assembly/dist.xml | 2 +- extensions/guacamole-auth-duo/.ratignore | 2 + extensions/guacamole-auth-duo/pom.xml | 97 +-- extensions/guacamole-auth-duo/src/licenses/LICENSE | 283 -------- .../src/licenses/bundled/aopalliance-1.0/LICENSE | 4 - .../src/licenses/bundled/duo-java-56570d1/README | 8 + .../src/licenses/bundled/guava-27.0.1-jre/COPYING | 202 ------ .../src/licenses/bundled/guice-3.0/COPYING | 202 ------ .../bundled/javax.inject-1/LICENSE-2.0.txt | 202 ------ .../guacamole-auth-duo/src/main/assembly/dist.xml | 2 +- .../auth/duo/form/DuoSignedResponseField.java | 4 +- extensions/guacamole-auth-header/.ratignore | 0 extensions/guacamole-auth-header/pom.xml | 105 +-- .../guacamole-auth-header/src/licenses/LICENSE | 239 ------- .../src/licenses/bundled/README | 4 - .../src/licenses/bundled/aopalliance-1.0/LICENSE | 4 - .../src/licenses/bundled/guice-3.0/COPYING | 202 ------ .../bundled/javax.inject-1/LICENSE-2.0.txt | 202 ------ .../src/main/assembly/dist.xml | 2 +- extensions/guacamole-auth-jdbc/.ratignore | 0 .../modules/guacamole-auth-jdbc-base/.ratignore | 1 + .../modules/guacamole-auth-jdbc-base/pom.xml | 55 -- .../modules/guacamole-auth-jdbc-dist/.ratignore | 0 .../modules/guacamole-auth-jdbc-dist/pom.xml | 59 +- .../guacamole-auth-jdbc-dist/src/licenses/LICENSE | 265 ------- .../src/licenses/bundled/README | 4 - .../src/licenses/bundled/aopalliance-1.0/LICENSE | 4 - .../src/licenses/bundled/guava-27.0.1-jre/COPYING | 202 ------ .../src/licenses/bundled/guice-3.0/COPYING | 202 ------ .../bundled/javax.inject-1/LICENSE-2.0.txt | 202 ------ .../licenses/bundled/jaxb-api-2.3.1/license.txt | 760 -------------------- .../src/licenses/bundled/mybatis-3.2.8/LICENSE | 202 ------ .../src/licenses/bundled/mybatis-guice-3.6/LICENSE | 202 ------ .../src/licenses/bundled/mybatis-guice-3.6/NOTICE | 38 - .../main/assembly/dist.xml} | 5 +- .../modules/guacamole-auth-jdbc-mysql/.ratignore | 0 .../modules/guacamole-auth-jdbc-mysql/pom.xml | 71 -- .../guacamole-auth-jdbc-postgresql/.ratignore | 0 .../modules/guacamole-auth-jdbc-postgresql/pom.xml | 71 -- .../guacamole-auth-jdbc-sqlserver/.ratignore | 0 .../modules/guacamole-auth-jdbc-sqlserver/pom.xml | 71 -- extensions/guacamole-auth-jdbc/pom.xml | 34 +- extensions/guacamole-auth-json/.ratignore | 0 extensions/guacamole-auth-json/pom.xml | 86 +-- .../guacamole-auth-json/src/licenses/LICENSE | 265 ------- extensions/guacamole-auth-json/src/licenses/NOTICE | 5 - .../src/licenses/bundled/aopalliance-1.0/LICENSE | 4 - .../src/licenses/bundled/guice-3.0/COPYING | 202 ------ .../licenses/bundled/jackson-1.9.2/LICENSE-2.0.txt | 202 ------ .../bundled/javax.inject-1/LICENSE-2.0.txt | 202 ------ .../bundled/spring-framework-5.2.9/LICENSE.txt | 202 ------ .../bundled/spring-security-5.4.1/LICENSE.txt | 202 ------ .../bundled/spring-security-5.4.1/notice.txt | 20 - .../guacamole-auth-json/src/main/assembly/dist.xml | 2 +- .../apache/guacamole/auth/json/user/UserData.java | 4 +- .../guacamole/auth/json/user/UserDataDenylist.java | 4 +- .../guacamole/auth/json/user/UserDataService.java | 6 +- extensions/guacamole-auth-ldap/.ratignore | 0 extensions/guacamole-auth-ldap/pom.xml | 108 +-- .../guacamole-auth-ldap/src/licenses/LICENSE | 248 ------- extensions/guacamole-auth-ldap/src/licenses/NOTICE | 5 - .../src/licenses/bundled/README | 4 - .../src/licenses/bundled/aopalliance-1.0/LICENSE | 4 - .../bundled/directory-api-2.0.0/LICENSE-2.0.txt | 202 ------ .../src/licenses/bundled/guice-3.0/COPYING | 202 ------ .../bundled/javax.inject-1/LICENSE-2.0.txt | 202 ------ .../guacamole-auth-ldap/src/main/assembly/dist.xml | 2 +- extensions/guacamole-auth-openid/.ratignore | 0 extensions/guacamole-auth-openid/pom.xml | 96 +-- .../guacamole-auth-openid/src/licenses/LICENSE | 248 ------- .../guacamole-auth-openid/src/licenses/NOTICE | 5 - .../src/licenses/bundled/README | 4 - .../src/licenses/bundled/aopalliance-1.0/LICENSE | 4 - .../src/licenses/bundled/guice-3.0/COPYING | 202 ------ .../bundled/javax.inject-1/LICENSE-2.0.txt | 202 ------ .../src/licenses/bundled/jose4j-0.5.5/LICENSE | 202 ------ .../src/main/assembly/dist.xml | 2 +- extensions/guacamole-auth-quickconnect/.ratignore | 0 extensions/guacamole-auth-quickconnect/pom.xml | 103 +-- .../src/licenses/LICENSE | 214 ------ .../src/licenses/NOTICE | 5 - .../src/licenses/guice-3.0/COPYING | 202 ------ .../src/main/assembly/dist.xml | 2 +- extensions/guacamole-auth-radius/.ratignore | 0 extensions/guacamole-auth-radius/pom.xml | 101 +-- .../guacamole-auth-radius/src/licenses/LICENSE | 266 ------- .../guacamole-auth-radius/src/licenses/NOTICE | 5 - .../src/licenses/bundled/README | 4 - .../src/licenses/bundled/aopalliance-1.0/LICENSE | 4 - .../src/licenses/bundled/guava-27.0.1-jre/COPYING | 202 ------ .../src/licenses/bundled/guice-3.0/COPYING | 202 ------ .../bundled/javax.inject-1/LICENSE-2.0.txt | 202 ------ .../src/main/assembly/dist.xml | 2 +- extensions/guacamole-auth-saml/.ratignore | 0 extensions/guacamole-auth-saml/pom.xml | 103 +-- .../guacamole-auth-saml/src/licenses/LICENSE | 310 -------- extensions/guacamole-auth-saml/src/licenses/NOTICE | 5 - .../src/licenses/bundled/README | 4 - .../src/licenses/bundled/aopalliance-1.0/LICENSE | 4 - .../bundled/apache-commons-codec-1.12/LICENSE | 202 ------ .../bundled/apache-commons-lang-3.4/LICENSE | 202 ------ .../bundled/apache-santuario-2.1.4/LICENSE | 202 ------ .../src/licenses/bundled/guice-3.0/COPYING | 202 ------ .../bundled/javax.inject-1/LICENSE-2.0.txt | 202 ------ .../src/licenses/bundled/joda-time-2.10.3/LICENSE | 202 ------ .../licenses/bundled/woodstox-core-5.0.3/LICENSE | 202 ------ .../guacamole-auth-saml/src/main/assembly/dist.xml | 2 +- extensions/guacamole-auth-totp/.ratignore | 0 extensions/guacamole-auth-totp/pom.xml | 104 +-- .../guacamole-auth-totp/src/licenses/LICENSE | 294 -------- extensions/guacamole-auth-totp/src/licenses/NOTICE | 5 - .../src/licenses/bundled/aopalliance-1.0/LICENSE | 4 - .../src/licenses/bundled/guava-27.0.1-jre/COPYING | 202 ------ .../src/licenses/bundled/guice-3.0/COPYING | 202 ------ .../bundled/javax.inject-1/LICENSE-2.0.txt | 202 ------ .../licenses/bundled/totp-reference-impl-07/README | 8 + .../src/licenses/bundled/zxing-3.3.1/LICENSE | 245 ------- .../guacamole-auth-totp/src/main/assembly/dist.xml | 2 +- .../auth/totp/form/AuthenticationCodeField.java | 9 +- .../modules/guacamole-auth-jdbc-mysql => }/pom.xml | 99 +-- guacamole-common-js/.ratignore | 0 guacamole-common-js/pom.xml | 35 +- guacamole-common/.ratignore | 0 guacamole-common/pom.xml | 54 +- guacamole-ext/.ratignore | 0 guacamole-ext/pom.xml | 78 +- .../guacamole/environment/LocalEnvironment.java | 2 +- .../main/java/org/apache/guacamole/form/Field.java | 5 +- .../org/apache/guacamole/form/FieldOption.java | 5 +- .../main/java/org/apache/guacamole/form/Form.java | 5 +- .../guacamole/properties/ByteArrayProperty.java | 4 +- guacamole/.ratignore | 0 guacamole/pom.xml | 111 +-- guacamole/src/licenses/LICENSE | 791 --------------------- guacamole/src/licenses/NOTICE | 5 - .../licenses/bundled/activation-1.1/CDDLv1.0.text | 119 ---- guacamole/src/licenses/bundled/asm-3.1/LICENSE | 30 - guacamole/src/licenses/bundled/carlito/README | 8 + .../src/licenses/bundled/guava-27.0.1-jre/COPYING | 202 ------ guacamole/src/licenses/bundled/guice-3.0/COPYING | 202 ------ .../licenses/bundled/jackson-1.9.2/LICENSE-2.0.txt | 202 ------ .../bundled/javax.inject-1/LICENSE-2.0.txt | 202 ------ .../src/licenses/bundled/jersey-1.17.1/LICENSE.txt | 136 ---- .../licenses/bundled/jettison-1.1/LICENSE-2.0.txt | 202 ------ .../org/apache/guacamole/extension/Extension.java | 4 +- .../guacamole/extension/ExtensionManifest.java | 2 +- .../extension/LanguageResourceService.java | 18 +- .../guacamole/rest/connection/APIConnection.java | 7 +- .../rest/connectiongroup/APIConnectionGroup.java | 7 +- .../rest/sharingprofile/APISharingProfile.java | 5 +- .../org/apache/guacamole/rest/user/APIUser.java | 7 +- .../guacamole/rest/usergroup/APIUserGroup.java | 7 +- pom.xml | 336 +++++++-- project-assembly.xml => src/main/assembly/dist.xml | 0 378 files changed, 5396 insertions(+), 15503 deletions(-)
