GUACAMOLE-736: Stick with alphabetic order in LICENSE files.

This commit is contained in:
Nick Couchman
2019-02-19 10:39:40 -05:00
parent 8fa71d2fd2
commit 055dfc93ef
4 changed files with 37 additions and 35 deletions

View File

@@ -219,6 +219,7 @@ AOP Alliance (http://aopalliance.sourceforge.net/)
License(s): License(s):
Public Domain (bundled/aopalliance-1.0/LICENSE) Public Domain (bundled/aopalliance-1.0/LICENSE)
Google Guice (https://github.com/google/guice) Google Guice (https://github.com/google/guice)
---------------------------------------------- ----------------------------------------------
@@ -227,14 +228,6 @@ Google Guice (https://github.com/google/guice)
License(s): License(s):
Apache v2.0 (bundled/guice-3.0/COPYING) 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) 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): License(s):
CDDL 1.1 (bundled/jaxb-api-2.3.1/license.txt) 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)

View File

@@ -264,15 +264,6 @@ Google Guice (https://github.com/google/guice)
Apache v2.0 (bundled/guice-3.0/COPYING) 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) 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): License(s):
CDDL 1.1 (bundled/jaxb-api-2.3.1/license.txt) 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)

View File

@@ -238,15 +238,6 @@ Guava: Google Core Libraries for Java (https://github.com/google/guava)
Apache v2.0 (bundled/guava-18.0/COPYING) 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) 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) 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/) MyBatis (http://www.mybatis.org/mybatis-3/)
------------------------------------------- -------------------------------------------

View File

@@ -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. 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) 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): License(s):
CDDL 1.1 (bundled/jaxb-api-2.3.1/license.txt) 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)