You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2014/09/22 22:55:49 UTC
git commit: Fixes for LICENSE and DEPENDENCIES files
Repository: incubator-flink
Updated Branches:
refs/heads/master e649d71d5 -> 1e137be52
Fixes for LICENSE and DEPENDENCIES files
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/1e137be5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/1e137be5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/1e137be5
Branch: refs/heads/master
Commit: 1e137be52ceddb0f84502ef6a9202fce3866d88a
Parents: e649d71
Author: Stephan Ewen <se...@apache.org>
Authored: Mon Sep 22 22:49:46 2014 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Mon Sep 22 22:49:46 2014 +0200
----------------------------------------------------------------------
DEPENDENCIES | 6 +++--
LICENSE | 11 +++++----
.../resources/web-docs/img/StratosphereLogo.png | Bin 9444 -> 0 bytes
flink-dist/src/main/flink-bin/LICENSE | 24 ++++++++++---------
4 files changed, 24 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1e137be5/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 5cf024e..3395e01 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -58,10 +58,12 @@ under the MIT License
- Mockito (http://www.mockito.org) - Copyright (c) 2007 Mockito contributors
- SLF4J (http://www.slf4j.org) - Copyright (c) 2004-2013 QOS.ch
- - jQuery 1.4.2 (http://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - jQuery v1.10.2, v1.4.2, v2.1.0. (http://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - Sizzle.js (http://sizzlejs.com) - Copyright 2010, The Dojo Foundation
- jCanvas 13.11.21 (http://calebevans.me/projects/jcanvas/) - Copyright 2014 Caleb Evans
- Flot 0.8.1 (http://www.flotcharts.org) - Copyright (c) 2007-2013 IOLA and Ole Laursen
- - Bootstrap (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - Bootstrap 3.1.0 (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - normalize.css v3.0.0 (http://git.io/normalize) - Copyright (c) Nicolas Gallagher and Jonathan Neal
- Font Awesome - Code (http://fortawesome.github.io/Font-Awesome/) - Copyright (c) 2014 Dave Gandy
- D3 dagre renderer (https://github.com/cpettitt/dagre-d3) - Copyright (c) 2012-2013 Chris Pettitt
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1e137be5/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 7e3aff2..f8dd024 100644
--- a/LICENSE
+++ b/LICENSE
@@ -215,13 +215,14 @@ conditions of their respective licenses.
The MIT License
-----------------------------------------------------------------------
-The Apache Flink project depends on and/or bundles the following components
-under the MIT License
+The Apache Flink project bundles the following files under the MIT License:
- - jQuery 1.4.2 (http://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - jQuery v1.10.2, v1.4.2, v2.1.0. (http://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - Sizzle.js (http://sizzlejs.com) - Copyright 2010, The Dojo Foundation
- jCanvas 13.11.21 (http://calebevans.me/projects/jcanvas/) - Copyright 2014 Caleb Evans
- Flot 0.8.1 (http://www.flotcharts.org) - Copyright (c) 2007-2013 IOLA and Ole Laursen
- - Bootstrap (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - Bootstrap 3.1.0 (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - normalize.css v3.0.0 (http://git.io/normalize) - Copyright (c) Nicolas Gallagher and Jonathan Neal
- Font Awesome - Code (http://fortawesome.github.io/Font-Awesome/) - Copyright (c) 2014 Dave Gandy
- D3 dagre renderer (https://github.com/cpettitt/dagre-d3) - Copyright (c) 2012-2013 Chris Pettitt
@@ -251,6 +252,8 @@ THE SOFTWARE.
BSD-style Licenses
-----------------------------------------------------------------------
+The Apache Flink project bundles the following files under BSD licenses:
+
(3-clause BSD license)
- D3 (http://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1e137be5/flink-clients/resources/web-docs/img/StratosphereLogo.png
----------------------------------------------------------------------
diff --git a/flink-clients/resources/web-docs/img/StratosphereLogo.png b/flink-clients/resources/web-docs/img/StratosphereLogo.png
deleted file mode 100755
index 1e661b7..0000000
Binary files a/flink-clients/resources/web-docs/img/StratosphereLogo.png and /dev/null differ
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/1e137be5/flink-dist/src/main/flink-bin/LICENSE
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/LICENSE b/flink-dist/src/main/flink-bin/LICENSE
index 61a2f3c..39fe8bc 100644
--- a/flink-dist/src/main/flink-bin/LICENSE
+++ b/flink-dist/src/main/flink-bin/LICENSE
@@ -215,7 +215,7 @@ licenses.
Apache License (Version 2.0)
-----------------------------------------------------------------------
-The Apache Flink project depends on and/or bundles the following components
+The Apache Flink project bundles the following components
under the Apache License (v 2.0):
- Apache Commons Logging (http://commons.apache.org/proper/commons-logging/)
@@ -245,14 +245,15 @@ under the Apache License (v 2.0):
The MIT License
-----------------------------------------------------------------------
-The Apache Flink project depends on and/or bundles the following components
-under the MIT License:
+The Apache Flink project bundles the following components under the MIT License:
- SLF4J (http://www.slf4j.org) - Copyright (c) 2004-2013 QOS.ch
- - jQuery 1.4.2 (http://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - jQuery v1.10.2, v1.4.2, v2.1.0. (http://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - Sizzle.js (http://sizzlejs.com) - Copyright 2010, The Dojo Foundation
- jCanvas 13.11.21 (http://calebevans.me/projects/jcanvas/) - Copyright 2014 Caleb Evans
- Flot 0.8.1 (http://www.flotcharts.org) - Copyright (c) 2007-2013 IOLA and Ole Laursen
- - Bootstrap (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - Bootstrap 3.1.0 (http://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - normalize.css v3.0.0 (http://git.io/normalize) - Copyright (c) Nicolas Gallagher and Jonathan Neal
- Font Awesome - Code (http://fortawesome.github.io/Font-Awesome/) - Copyright (c) 2014 Dave Gandy
- D3 dagre renderer (https://github.com/cpettitt/dagre-d3) - Copyright (c) 2012-2013 Chris Pettitt
@@ -282,8 +283,8 @@ THE SOFTWARE.
BSD-style Licenses
-----------------------------------------------------------------------
-The Apache Flink project depends on and/or bundles the following components
-under BSD-style licenses
+The Apache Flink project bundles the following components under
+BSD-style licenses:
[3-clause BSD license]
- Kryo (https://github.com/EsotericSoftware/kryo) - Copyright (c) 2008, Nathan Sweet
@@ -333,7 +334,7 @@ POSSIBILITY OF SUCH DAMAGE.
Mozilla Public License - v 1.1
-----------------------------------------------------------------------
-The Apache Flink project depends on and/or bundles the following components
+The Apache Flink project bundles the following components
under the Mozilla Public License (v 1.1)
- RabbitMQ (http://www.rabbitmq.com)
@@ -348,7 +349,7 @@ http://www.mozilla.org/MPL/
Eclipse Public License - v 1.0
-----------------------------------------------------------------------
-The Apache Flink project depends on and/or bundles the following components
+The Apache Flink project bundles the following components
under the Eclipse Public License (v 1.0)
- LOGback (http://logback.qos.ch)
@@ -361,7 +362,7 @@ https://www.eclipse.org/legal/epl-v10.html
The Open Font License
-----------------------------------------------------------------------
-The Apache Flink project packages the following fonts under the
+The Apache Flink project bundles the following fonts under the
Open Font License (OFT) - http://scripts.sil.org/OFL/
- Font Awesome (http://fortawesome.github.io/Font-Awesome/) - Created by Dave Gandy
@@ -369,9 +370,10 @@ Open Font License (OFT) - http://scripts.sil.org/OFL/
-----------------------------------------------------------------------
-For Apache Hadoop Subcomponents
+ For Apache Hadoop Subcomponents
-----------------------------------------------------------------------
+The Apache Flink project bundles components from the Apache Hadoop project.
The Apache Hadoop 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