From 055dfc93ef014de60865d7b6f99d39605f6eef31 Mon Sep 17 00:00:00 2001 From: Nick Couchman Date: Tue, 19 Feb 2019 10:39:40 -0500 Subject: [PATCH] GUACAMOLE-736: Stick with alphabetic order in LICENSE files. --- .../guacamole-auth-cas/src/licenses/LICENSE | 18 ++++++++++-------- .../guacamole-auth-duo/src/licenses/LICENSE | 18 +++++++++--------- .../src/licenses/LICENSE | 18 +++++++++--------- .../guacamole-auth-totp/src/licenses/LICENSE | 18 +++++++++--------- 4 files changed, 37 insertions(+), 35 deletions(-) diff --git a/extensions/guacamole-auth-cas/src/licenses/LICENSE b/extensions/guacamole-auth-cas/src/licenses/LICENSE index 4ce26c996..e43e74a54 100644 --- a/extensions/guacamole-auth-cas/src/licenses/LICENSE +++ b/extensions/guacamole-auth-cas/src/licenses/LICENSE @@ -219,6 +219,7 @@ AOP Alliance (http://aopalliance.sourceforge.net/) License(s): Public Domain (bundled/aopalliance-1.0/LICENSE) + Google Guice (https://github.com/google/guice) ---------------------------------------------- @@ -227,14 +228,6 @@ Google Guice (https://github.com/google/guice) License(s): Apache v2.0 (bundled/guice-3.0/COPYING) -JSR-330 / Dependency Injection for Java (http://code.google.com/p/atinject/) ----------------------------------------------------------------------------- - - Version: 1 - From: 'JSR-330 Expert Group' (https://jcp.org/en/jsr/detail?id=330) - License(s): - Apache v2.0 (bundled/javax.inject-1/LICENSE-2.0.txt) - JAXB API / XML Processing (https://projects.eclipse.org/projects/ee4j.jaxb) --------------------------------------------------------------------------- @@ -244,3 +237,12 @@ JAXB API / XML Processing (https://projects.eclipse.org/projects/ee4j.jaxb) License(s): CDDL 1.1 (bundled/jaxb-api-2.3.1/license.txt) + +JSR-330 / Dependency Injection for Java (http://code.google.com/p/atinject/) +---------------------------------------------------------------------------- + + Version: 1 + From: 'JSR-330 Expert Group' (https://jcp.org/en/jsr/detail?id=330) + License(s): + Apache v2.0 (bundled/javax.inject-1/LICENSE-2.0.txt) + diff --git a/extensions/guacamole-auth-duo/src/licenses/LICENSE b/extensions/guacamole-auth-duo/src/licenses/LICENSE index c5c1b5933..f55f14344 100644 --- a/extensions/guacamole-auth-duo/src/licenses/LICENSE +++ b/extensions/guacamole-auth-duo/src/licenses/LICENSE @@ -264,15 +264,6 @@ Google Guice (https://github.com/google/guice) Apache v2.0 (bundled/guice-3.0/COPYING) -JSR-330 / Dependency Injection for Java (http://code.google.com/p/atinject/) ----------------------------------------------------------------------------- - - Version: 1 - From: 'JSR-330 Expert Group' (https://jcp.org/en/jsr/detail?id=330) - License(s): - Apache v2.0 (bundled/javax.inject-1/LICENSE-2.0.txt) - - JAXB API / XML Processing (https://projects.eclipse.org/projects/ee4j.jaxb) --------------------------------------------------------------------------- @@ -281,3 +272,12 @@ JAXB API / XML Processing (https://projects.eclipse.org/projects/ee4j.jaxb) License(s): CDDL 1.1 (bundled/jaxb-api-2.3.1/license.txt) + +JSR-330 / Dependency Injection for Java (http://code.google.com/p/atinject/) +---------------------------------------------------------------------------- + + Version: 1 + From: 'JSR-330 Expert Group' (https://jcp.org/en/jsr/detail?id=330) + License(s): + Apache v2.0 (bundled/javax.inject-1/LICENSE-2.0.txt) + diff --git a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/src/licenses/LICENSE b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/src/licenses/LICENSE index e29f99530..d25498151 100644 --- a/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/src/licenses/LICENSE +++ b/extensions/guacamole-auth-jdbc/modules/guacamole-auth-jdbc-dist/src/licenses/LICENSE @@ -238,15 +238,6 @@ Guava: Google Core Libraries for Java (https://github.com/google/guava) Apache v2.0 (bundled/guava-18.0/COPYING) -JSR-330 / Dependency Injection for Java (http://code.google.com/p/atinject/) ----------------------------------------------------------------------------- - - Version: 1 - From: 'JSR-330 Expert Group' (https://jcp.org/en/jsr/detail?id=330) - License(s): - Apache v2.0 (bundled/javax.inject-1/LICENSE-2.0.txt) - - JAXB API / XML Processing (https://projects.eclipse.org/projects/ee4j.jaxb) --------------------------------------------------------------------------- @@ -256,6 +247,15 @@ JAXB API / XML Processing (https://projects.eclipse.org/projects/ee4j.jaxb) CDDL 1.1 (bundled/jaxb-api-2.3.1/license.txt) +JSR-330 / Dependency Injection for Java (http://code.google.com/p/atinject/) +---------------------------------------------------------------------------- + + Version: 1 + From: 'JSR-330 Expert Group' (https://jcp.org/en/jsr/detail?id=330) + License(s): + Apache v2.0 (bundled/javax.inject-1/LICENSE-2.0.txt) + + MyBatis (http://www.mybatis.org/mybatis-3/) ------------------------------------------- diff --git a/extensions/guacamole-auth-totp/src/licenses/LICENSE b/extensions/guacamole-auth-totp/src/licenses/LICENSE index 37fab58ba..956ae39e8 100644 --- a/extensions/guacamole-auth-totp/src/licenses/LICENSE +++ b/extensions/guacamole-auth-totp/src/licenses/LICENSE @@ -284,15 +284,6 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -ZXing Barcode Scanning Library (https://github.com/zxing/zxing/) ----------------------------------------------------------------- - - Version: 3.3.1 - From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.3.1/AUTHORS) - License(s): - Apache v2.0 (bundled/zxing-3.3.1/LICENSE) - - JAXB API / XML Processing (https://projects.eclipse.org/projects/ee4j.jaxb) --------------------------------------------------------------------------- @@ -301,3 +292,12 @@ JAXB API / XML Processing (https://projects.eclipse.org/projects/ee4j.jaxb) License(s): CDDL 1.1 (bundled/jaxb-api-2.3.1/license.txt) + +ZXing Barcode Scanning Library (https://github.com/zxing/zxing/) +---------------------------------------------------------------- + + Version: 3.3.1 + From: 'ZXing authors' (https://github.com/zxing/zxing/blob/zxing-3.3.1/AUTHORS) + License(s): + Apache v2.0 (bundled/zxing-3.3.1/LICENSE) +