summaryrefslogtreecommitdiffstats
path: root/Documentation/licenses.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/licenses.txt')
-rw-r--r--Documentation/licenses.txt15
1 files changed, 8 insertions, 7 deletions
diff --git a/Documentation/licenses.txt b/Documentation/licenses.txt
index 7787fe8757..69a12c3e12 100644
--- a/Documentation/licenses.txt
+++ b/Documentation/licenses.txt
@@ -38,6 +38,7 @@ Included Components
|Jetty | <<apache2,Apache License 2.0>>, or link:http://www.eclipse.org/legal/epl-v10.html[EPL]
|Prolog Cafe | <<prolog_cafe,EPL or GPL>>
|Google Code Prettify | <<apache2,Apache License 2.0>>
+|JavaEWAH | <<apache2,Apache License 2.0>>
|JGit | <<jgit,New-Style BSD>>
|JSch | <<sshd,New-Style BSD>>
|PostgreSQL JDBC Driver | <<postgresql,New-Style BSD>>
@@ -407,7 +408,8 @@ Prolog Cafe - EPL or GPL
Originally developed by Mutsunori BANBARA and Naoyuki TAMURA at the
Kobe University, JAPAN. Gerrit Code Review uses a fork derived from
-the 1.2.5 release.
+the 1.2.5 release, and offers the corresponding source code at
+link:https://gerrit.googlesource.com/prolog-cafe[].
Prolog Cafe is dual licensed and available under either the
link:http://opensource.org/licenses/eclipse-1.0.php[Eclipse Public License],
@@ -415,8 +417,7 @@ or the
link:http://www.gnu.org/licenses/gpl-2.0.html[GPL version 2.0 (or later)].
In the context of Gerrit Code Review, Prolog Cafe is consumed
-under either the EPL or GPL version 3.0 as GPL version 2.0 is
-not compatible with Apache License 2.0.
+under the EPL.
[[h2]]
H2 Database - EPL or modified MPL
@@ -643,10 +644,10 @@ SLF4J - MIT License
distribute, sublicense, and/or sell copies of the Software, and to
permit persons to whom the Software is furnished to do so, subject to
the following conditions:
-
+
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
-
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
@@ -664,9 +665,9 @@ Clippy - MIT License
----
(The MIT License)
-
+
Copyright (c) 2008 Tom Preston-Werner
-
+
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the
'Software'), to deal in the Software without restriction, including