You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2018/05/22 23:51:07 UTC
[4/4] flink git commit: [FLINK-9414] Remove unnecessary jline-reader
and jline-terminal entries from LICENSE
[FLINK-9414] Remove unnecessary jline-reader and jline-terminal entries from LICENSE
The jline-reader and jline-terminal are dependencies against which we link.
They don't need to be included in LICENSE, because LICENSE only contains code
which is contained in the source release of Flink.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/8c2a70fa
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/8c2a70fa
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/8c2a70fa
Branch: refs/heads/release-1.5
Commit: 8c2a70fa2ac3f0fc5ec35cf36a8c68bfa15b6cbe
Parents: a62683e
Author: Till Rohrmann <tr...@apache.org>
Authored: Wed May 23 01:36:57 2018 +0200
Committer: Till Rohrmann <tr...@apache.org>
Committed: Wed May 23 01:36:57 2018 +0200
----------------------------------------------------------------------
LICENSE | 28 ----------------------------
1 file changed, 28 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/8c2a70fa/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index f66290e..6485073 100644
--- a/LICENSE
+++ b/LICENSE
@@ -320,31 +320,3 @@ ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUT
DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE
USE OR PERFORMANCE OF THIS SOFTWARE.
-
------------------------------------------------------------------------
- BSD-style Licenses (BSD-2-clause)
------------------------------------------------------------------------
-
-The Apache Flink project contains or reuses code that is licensed under the BSD-2-clause license
-from the following projects:
- - jline-terminal (https://github.com/jline/jline3) Copyright (c) 2002-2016, various authors.
- - jline-reader (https://github.com/jline/jline3) Copyright (c) 2002-2016, various authors.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted
-provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions
- and the following disclaimer.
-
-2. 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.
-
-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 HOLDER 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.