Skip to content

Commit

Permalink
[LICENSE] Update LICENSE and NOTICE files
Browse files Browse the repository at this point in the history
 - Add missing entries for dependencies
 - Remove entries for removed dependencies
 - Change DEPENDENCIES file to point to src and bin LICENSE and NOTICE file
 - Add comments in some files to clarify whether the are Flink original,
   or from which third party file they are adapted
 - Change some links from incubator to TLP
  • Loading branch information
StephanEwen committed Jan 18, 2015
1 parent cd6da11 commit 0b2edf1
Show file tree
Hide file tree
Showing 14 changed files with 227 additions and 783 deletions.
763 changes: 7 additions & 756 deletions DEPENDENCIES

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -218,16 +218,18 @@ conditions of their respective licenses.
The Apache Flink project bundles the following files under the MIT License:

- jQuery v2.1.0. (http:https://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
- jQuery resize event v1.1 (http:https://benalman.com/projects/jquery-resize-plugin/) - Copyright (c) 2010 "Cowboy" Ben Alman
- 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
- query.flot.tooltip (https://github.com/krzysu/flot.tooltip) - Copyright (c) Krzysztof Urbas
- Bootstrap 3.1.0 (http:https://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
- Bootswatch Lumen Theme v3.1.1+1 (http:https://bootswatch.com) - Copyright (c) 2012-2014 Thomas Park
- 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
- scopt (http:https://github.com/scopt/scopt)


All rights reserved.

Permission is hereby granted, free of charge, to any person obtaining a copy
Expand Down
8 changes: 7 additions & 1 deletion docs/_plugins/build_apidoc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# ---------------------------------------------------------
# Triggers building the API docs (javadoc and scaladoc)
#
# Written by Aljoscha Krettek
# ---------------------------------------------------------

require 'fileutils'
require 'rubygems'
include FileUtils
Expand All @@ -36,7 +42,7 @@
puts `mvn clean install -DskipTests`

puts "Generating Javadoc"
javadoc_command = %{mvn javadoc:aggregate -Pdocs-and-source #{java8_doc_fix} -Dmaven.javadoc.failOnError=false -Dquiet=true -Dheader="<a href=\"/docs/0.7-incubating/\" target=\"_top\"><h1>Back to Flink Documentation</h1></a>"}
javadoc_command = %{mvn javadoc:aggregate -Pdocs-and-source #{java8_doc_fix} -Dmaven.javadoc.failOnError=false -Dquiet=true -Dheader="<a href=\"/docs/0.8/\" target=\"_top\"><h1>Back to Flink Documentation</h1></a>"}
puts "Running: #{javadoc_command}"
puts `#{javadoc_command}`

Expand Down
8 changes: 7 additions & 1 deletion docs/_plugins/gh_link.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
# specific language governing permissions and limitations
# under the License.

# ---------------------------------------------------------
# Expands a github link shortcut into a proper markdown link
#
# Written by Ufuk Celebi
# ---------------------------------------------------------

module Jekyll
class GitHubLinkTag < Liquid::Tag

Expand Down Expand Up @@ -45,4 +51,4 @@ def render(context)
end
end

Liquid::Template.register_tag('gh_link', Jekyll::GitHubLinkTag)
Liquid::Template.register_tag('gh_link', Jekyll::GitHubLinkTag)
9 changes: 8 additions & 1 deletion docs/_plugins/organizeLicenseHeaders.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,13 @@
# specific language governing permissions and limitations
# under the License.

# ---------------------------------------------------------
# Ensures that teh documentation contains the Apache License
# headers once, not repeatedly for each include.
#
# Written by Fabian Hueske
# ---------------------------------------------------------

module Jekyll

module LicenseRemover
Expand Down Expand Up @@ -67,4 +74,4 @@ def write(dest)
end
end

end
end
2 changes: 1 addition & 1 deletion docs/coding_guidelines.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@ specific language governing permissions and limitations
under the License.
-->

The coding guidelines are now located [on the project website](http:https://flink.incubator.apache.org/coding_guidelines.html).
The coding guidelines are now located [on the project website](http:https://flink.apache.org/coding_guidelines.html).
2 changes: 2 additions & 0 deletions docs/css/bootstrap-lumen-custom.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
@import url("//fonts.googleapis.com/css?family=Source+Sans+Pro:300,400,700,400italic");
/*!
* Modified version based on bootwatch's lumen theme
*
* Bootswatch v3.1.1+1
* Homepage: http:https://bootswatch.com
* Copyright 2012-2014 Thomas Park
Expand Down
Binary file modified flink-clients/src/main/resources/web-docs/img/delete-icon.png
100755 → 100644
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions flink-clients/src/main/resources/web-docs/js/d3.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
/**
* D3 renderer from http:https://d3js.org/
* Copyright (c) 2010-2014, Michael Bostock
*
* Under BSD License (as stated under http:https://d3js.org/)
*/

!function() {
var d3 = {
version: "3.4.6"
Expand Down
133 changes: 119 additions & 14 deletions flink-dist/src/main/flink-bin/LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -220,25 +220,29 @@ under the Apache License (v 2.0):

- Apache Commons Logging (http:https://commons.apache.org/proper/commons-logging/)
- Apache Commons Codec (http:https://commons.apache.org/proper/commons-codec/)
- Apache Commons Collections (http:https://commons.apache.org/collections/)
- Apache Commons CLI (http:https://commons.apache.org/cli/)
- Apache Commons FileUpload (http:https://commons.apache.org/fileupload/)
- Apache Commons IO (http:https://commons.apache.org/io/)
- Apache Commons Lang v.3.3.2 (http:https://commons.apache.org/proper/commons-lang/)
- Apache Commons Math (http:https://commons.apache.org/proper/commons-math/)
- Apache Avro (http:https://avro.apache.org)
- Apache Hadoop (http:https://hadoop.apache.org)
- Apache HBase Client (http:https://hbase.apache.org)
- Apache Derby (http:https://db.apache.org/derby/)
- Apache Kafka (http:https://kafka.apache.org)
- Apache Flume (http:https://flume.apache.org)
- Apache Sling (http:https://sling.apache.org)
- Google Guava (https://code.google.com/p/guava-libraries/)
- Netty (http:https://netty.io)
- Powermock (http:https://www.powermock.org)
- Javassist (http:https://www.javassist.org)
- Netty v4.0.21 (http:https://netty.io)
- Chill_2.10 v0.5.1 (https://github.com/twitter/chill)
- Jetty Web Container (http:https://www.eclipse.org/jetty/)
- Amazon Web Services SDK for Java (http:https://aws.amazon.com/sdkforjava/)
- ScalaTest (http:https://www.scalatest.org)
- StartBootstrap (http:https://startbootstrap.com)
- CHAP Links Library Timeline (http:https://almende.github.io/chap-links-library/)
- Twitter Hosebird Client (hbc) (https://github.com/twitter/hbc)
- Jettison (http:https://jettison.codehaus.org)
- Akka (http:https://akka.io)


-----------------------------------------------------------------------
Expand All @@ -249,13 +253,17 @@ 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 v2.1.0. (http:https://jquery.com) - Copyright 2014 jQuery Foundation and other contributors
- jQuery resize event v1.1 (http:https://benalman.com/projects/jquery-resize-plugin/) - Copyright (c) 2010 "Cowboy" Ben Alman
- 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
- query.flot.tooltip (https://github.com/krzysu/flot.tooltip) - Copyright (c) Krzysztof Urbas
- Bootstrap 3.1.0 (http:https://getbootstrap.com) - Copyright (c) 2011-2014 Twitter, Inc
- Bootswatch Lumen Theme v3.1.1+1 (http:https://bootswatch.com) - Copyright (c) 2012-2014 Thomas Park
- 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
- spymemcached (http:https://code.google.com/p/spymemcached/) - Copyright (c) 2006-2009 Dustin Sallings, Copyright (c) 2009-2011 Couchbase, Inc.


All rights reserved.
Expand Down Expand Up @@ -290,15 +298,14 @@ BSD-style licenses:
- Kryo (https://github.com/EsotericSoftware/kryo) - Copyright (c) 2008, Nathan Sweet
- D3 (http:https://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock
- LevelDB JNI (https://github.com/fusesource/leveldbjni/) - Copyright (c) 2011, FuseSource Corp.
- Memcached (https://github.com/memcached/memcached) - Copyright (c) 2003, Danga Interactive, Inc.
- Redis (http:https://redis.io/) - Copyright (c) 2009, Salvatore Sanfilippo and Pieter Noordhuis

[BSD-like License]
- Scala Library (http:https://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- Scala Compiler (BSD-like) - (http:https://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- Scala Compiler Reflect (BSD-like) - (http:https://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- Scala Quasiquotes (BSD-like) - (http:https://scalamacros.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- ASM (BSD-like) - (http:https://asm.ow2.org/) - Copyright (c) 2000-2011 INRIA, France Telecom
- Scala Compiler (http:https://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- Scala Compiler Reflect (http:https://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- Scala Quasiquotes (http:https://scalamacros.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- ASM (http:https://asm.ow2.org/) - Copyright (c) 2000-2011 INRIA, France Telecom


(Below is the 3-clause BSD license)
Expand Down Expand Up @@ -374,7 +381,6 @@ Open Font License (OFT) - http:https://scripts.sil.org/OFL/
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
Expand Down Expand Up @@ -423,13 +429,12 @@ in src/main/native/src/org/apache/hadoop/util:
* BSD-style license that can be found in the LICENSE file.
*/

For src/main/native/src/org/apache/hadoop/io/compress/lz4/{lz4.h,lz4.c,
lz4_encoder.h,lz4hc.h,lz4hc.c,lz4hc_encoder.h},
For src/main/native/src/org/apache/hadoop/io/compress/lz4/{lz4.h,lz4.c,lz4hc.h,lz4hc.c},

/*
LZ4 - Fast LZ compression algorithm
Header File
Copyright (C) 2011-2013, Yann Collet.
Copyright (C) 2011-2014, Yann Collet.
BSD 2-Clause License (http:https://www.opensource.org/licenses/bsd-license.php)

Redistribution and use in source and binary forms, with or without
Expand All @@ -456,6 +461,106 @@ lz4_encoder.h,lz4hc.h,lz4hc.c,lz4hc_encoder.h},
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

You can contact the author at :
- LZ4 homepage : http:https://fastcompression.blogspot.com/p/lz4.html
- LZ4 source repository : http:https://code.google.com/p/lz4/
- LZ4 public forum : https://groups.google.com/forum/#!forum/lz4c
*/


For hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-nativetask/src/main/native/gtest
---------------------------------------------------------------------
Copyright 2008, Google Inc.
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 Google Inc. 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.

-----------------------------------------------------------------------
For Apache Sling Subcomponents
-----------------------------------------------------------------------

Apache Sling includes subcomponents with separate copyright notices and
license terms. Your use of these subcomponents is subject to the terms
and conditions of the following licenses.

JSON in Java

Copyright (c) 2002 JSON.org

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 shall be used for Good, not Evil.

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.

-----------------------------------------------------------------------
For Apache Kafka
-----------------------------------------------------------------------

Apache Kafka depends on SBT licensed under the following license

SBT LICENSE

Copyright (c) 2008, 2009, 2010 Mark Harrah, Jason Zaugg
All rights reserved.

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.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.

-----------------------------------------------------------------------
Loading

0 comments on commit 0b2edf1

Please sign in to comment.