Fixes for LICENSE and DEPENDENCIES files

deepfield · Sep 22, 2014 · 1e137be · 1e137be
1 parent e649d71
commit 1e137be
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 17 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -58,10 +58,12 @@ under the MIT License
 
  - Mockito (http:https://www.mockito.org) - Copyright (c) 2007 Mockito contributors
  - SLF4J (http:https://www.slf4j.org) - Copyright (c) 2004-2013 QOS.ch
- - jQuery 1.4.2 (http:https://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - jQuery v1.10.2, v1.4.2, v2.1.0. (http:https://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - Sizzle.js (http:https://sizzlejs.com) - Copyright 2010, The Dojo Foundation
  - jCanvas 13.11.21 (http:https://calebevans.me/projects/jcanvas/) - Copyright 2014 Caleb Evans
  - Flot 0.8.1 (http:https://www.flotcharts.org) - Copyright (c) 2007-2013 IOLA and Ole Laursen
- - Bootstrap (http:https://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - Bootstrap 3.1.0 (http:https://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - normalize.css v3.0.0 (http:https://git.io/normalize) - Copyright (c) Nicolas Gallagher and Jonathan Neal
  - Font Awesome - Code (http:https://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
 

diff --git 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:https://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - jQuery v1.10.2, v1.4.2, v2.1.0. (http:https://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - Sizzle.js (http:https://sizzlejs.com) - Copyright 2010, The Dojo Foundation
  - jCanvas 13.11.21 (http:https://calebevans.me/projects/jcanvas/) - Copyright 2014 Caleb Evans
  - Flot 0.8.1 (http:https://www.flotcharts.org) - Copyright (c) 2007-2013 IOLA and Ole Laursen
- - Bootstrap (http:https://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - Bootstrap 3.1.0 (http:https://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - normalize.css v3.0.0 (http:https://git.io/normalize) - Copyright (c) Nicolas Gallagher and Jonathan Neal
  - Font Awesome - Code (http:https://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:https://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock
 

diff --git a/flink-clients/resources/web-docs/img/StratosphereLogo.png b/flink-clients/resources/web-docs/img/StratosphereLogo.png
diff --git 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:https://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:https://www.slf4j.org) - Copyright (c) 2004-2013 QOS.ch
- - jQuery 1.4.2 (http:https://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - jQuery v1.10.2, v1.4.2, v2.1.0. (http:https://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
+ - Sizzle.js (http:https://sizzlejs.com) - Copyright 2010, The Dojo Foundation
  - jCanvas 13.11.21 (http:https://calebevans.me/projects/jcanvas/) - Copyright 2014 Caleb Evans
  - Flot 0.8.1 (http:https://www.flotcharts.org) - Copyright (c) 2007-2013 IOLA and Ole Laursen
- - Bootstrap (http:https://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - Bootstrap 3.1.0 (http:https://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
+ - normalize.css v3.0.0 (http:https://git.io/normalize) - Copyright (c) Nicolas Gallagher and Jonathan Neal
  - Font Awesome - Code (http:https://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:https://www.rabbitmq.com) 
@@ -348,7 +349,7 @@ http:https://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:https://logback.qos.ch)
@@ -361,17 +362,18 @@ 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:https://scripts.sil.org/OFL/
 
  - Font Awesome (http:https://fortawesome.github.io/Font-Awesome/) - Created by Dave Gandy
  -> fonts in "flink-runtime/resources/web-docs-infoserver/font-awesome/fonts"
 
 
 -----------------------------------------------------------------------
-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