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/09 08:51:50 UTC
[2/2] directory-kerby git commit: Removing hamcrest from licenses +
notice
Removing hamcrest from licenses + notice
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/abc96a96
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/abc96a96
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/abc96a96
Branch: refs/heads/trunk
Commit: abc96a96af1a4d32767e5b293737bc09dff4006a
Parents: e7a2e9c
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue May 9 09:43:45 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue May 9 09:43:45 2017 +0100
----------------------------------------------------------------------
NOTICE | 3 ---
licenses/LICENSE-Mockito.txt | 21 ---------------------
licenses/LICENSE-hamcrest.txt | 27 ---------------------------
3 files changed, 51 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abc96a96/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 9a04942..7422d7e 100644
--- a/NOTICE
+++ b/NOTICE
@@ -7,9 +7,6 @@ The Apache Software Foundation (http://www.apache.org/).
This product includes/uses SLF4J (http://www.slf4j.org/),
Copyright (c) 2004-2010 QOS.ch
-This product includes/uses Java Hamcrest (http://hamcrest.org/JavaHamcrest/).
-Copyright (c) 2000-2015, BSD.
-
This product includes/uses Netty
The Netty Project
=================
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abc96a96/licenses/LICENSE-Mockito.txt
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-Mockito.txt b/licenses/LICENSE-Mockito.txt
deleted file mode 100644
index e0840a4..0000000
--- a/licenses/LICENSE-Mockito.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) 2007 Mockito contributors
-
-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 without limitation the rights
-to use, copy, modify, merge, publish, 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 NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/abc96a96/licenses/LICENSE-hamcrest.txt
----------------------------------------------------------------------
diff --git a/licenses/LICENSE-hamcrest.txt b/licenses/LICENSE-hamcrest.txt
deleted file mode 100644
index 0bf6264..0000000
--- a/licenses/LICENSE-hamcrest.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-BSD License
-
-Copyright (c) 2000-2015 www.hamcrest.org
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this list of
-conditions and the following disclaimer. Redistributions in binary form must reproduce
-the above copyright notice, this list of conditions and the following disclaimer in
-the documentation and/or other materials provided with the distribution.
-
-Neither the name of Hamcrest nor the names of its contributors may be used to endorse
-or promote products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
-SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-CONTRACT, STRICT LIABILITY, 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.
\ No newline at end of file