You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2017/05/10 11:24:52 UTC
directory-kerby git commit: Cleaning up LICENSE files
Repository: directory-kerby
Updated Branches:
refs/heads/trunk 9c1045247 -> f0ad9fc8a
Cleaning up LICENSE files
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/f0ad9fc8
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/f0ad9fc8
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/f0ad9fc8
Branch: refs/heads/trunk
Commit: f0ad9fc8a1148d978c92d3dba16e51125881b33b
Parents: 9c10452
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Wed May 10 12:24:41 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed May 10 12:24:41 2017 +0100
----------------------------------------------------------------------
LICENSE | 27 ---------------------------
kerby-dist/kdc-dist/LICENSE | 18 ++----------------
kerby-dist/kdc-dist/NOTICE | 3 ---
kerby-dist/tool-dist/LICENSE | 19 ++-----------------
kerby-dist/tool-dist/NOTICE | 2 --
5 files changed, 4 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/f0ad9fc8/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index c8205fd..e06d208 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,30 +200,3 @@ Apache License
See the License for the specific language governing permissions and
limitations under the License.
-
-APACHE DIRECTORY-KERBY SUBCOMPONENTS:
-
-The Apache DIRECTORY-KERBY project contains subcomponents with separate copyright
-notices and license terms. Your use of the source code for the these
-subcomponents is subject to the terms and conditions of the following
-licenses.
-
-===============================================================================
-For the SLF4J library:
-See license/LICENSE-slf4j.txt
-
-===========================================================================
-For the Mockito library:
-See license/LICENSE-Mockito.txt (MIT License)
-
-===============================================================================
-For the org.hamcrest library:
-See license/LICENSE-hamcrest.txt (BSD License)
-
-=============================================================================
-For the org.bouncycastle library:
-see license/LICENSE.bouncycastle.txt (MIT License)
-
-=============================================================================
-For the jline library:
-see license/LICENSE.jline.txt (BSD License)
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/f0ad9fc8/kerby-dist/kdc-dist/LICENSE
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/LICENSE b/kerby-dist/kdc-dist/LICENSE
index c8205fd..2e39269 100644
--- a/kerby-dist/kdc-dist/LICENSE
+++ b/kerby-dist/kdc-dist/LICENSE
@@ -209,21 +209,7 @@ subcomponents is subject to the terms and conditions of the following
licenses.
===============================================================================
-For the SLF4J library:
-See license/LICENSE-slf4j.txt
-
-===========================================================================
-For the Mockito library:
-See license/LICENSE-Mockito.txt (MIT License)
+For the SLF4J library (MIT license):
-===============================================================================
-For the org.hamcrest library:
-See license/LICENSE-hamcrest.txt (BSD License)
-
-=============================================================================
-For the org.bouncycastle library:
-see license/LICENSE.bouncycastle.txt (MIT License)
+See license/LICENSE-slf4j.txt
-=============================================================================
-For the jline library:
-see license/LICENSE.jline.txt (BSD License)
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/f0ad9fc8/kerby-dist/kdc-dist/NOTICE
----------------------------------------------------------------------
diff --git a/kerby-dist/kdc-dist/NOTICE b/kerby-dist/kdc-dist/NOTICE
index bf185f7..f9622a4 100644
--- a/kerby-dist/kdc-dist/NOTICE
+++ b/kerby-dist/kdc-dist/NOTICE
@@ -4,9 +4,6 @@ Copyright 2015-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product includes/uses SLF4J (http://www.slf4j.org/),
-Copyright (c) 2004-2017 QOS.ch
-
This product includes/uses Netty
The Netty Project
=================
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/f0ad9fc8/kerby-dist/tool-dist/LICENSE
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/LICENSE b/kerby-dist/tool-dist/LICENSE
index c8205fd..ede4a18 100644
--- a/kerby-dist/tool-dist/LICENSE
+++ b/kerby-dist/tool-dist/LICENSE
@@ -209,21 +209,6 @@ subcomponents is subject to the terms and conditions of the following
licenses.
===============================================================================
-For the SLF4J library:
-See license/LICENSE-slf4j.txt
-
-===========================================================================
-For the Mockito library:
-See license/LICENSE-Mockito.txt (MIT License)
-
-===============================================================================
-For the org.hamcrest library:
-See license/LICENSE-hamcrest.txt (BSD License)
-
-=============================================================================
-For the org.bouncycastle library:
-see license/LICENSE.bouncycastle.txt (MIT License)
+For the SLF4J library (MIT license):
-=============================================================================
-For the jline library:
-see license/LICENSE.jline.txt (BSD License)
+See license/LICENSE-slf4j.txt
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/f0ad9fc8/kerby-dist/tool-dist/NOTICE
----------------------------------------------------------------------
diff --git a/kerby-dist/tool-dist/NOTICE b/kerby-dist/tool-dist/NOTICE
index 7e87226..98f896f 100644
--- a/kerby-dist/tool-dist/NOTICE
+++ b/kerby-dist/tool-dist/NOTICE
@@ -4,5 +4,3 @@ Copyright 2015-2017 The Apache Software Foundation
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
-This product includes/uses SLF4J (http://www.slf4j.org/),
-Copyright (c) 2004-2017 QOS.ch