Consolidate some third-party license entries, update readme in binary…

… distribution [ci skip]
deepfield · Jul 21, 2014 · bbff328 · bbff328
1 parent 9fb620d
commit bbff328
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 165 deletions.
diff --git a/LICENSE b/LICENSE
@@ -256,7 +256,9 @@ under the 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
+ - 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
 
 All rights reserved.
 
@@ -283,6 +285,9 @@ THE SOFTWARE.
  BSD-style Licenses
 -----------------------------------------------------------------------
 
+The Apache Flink project depends on and/or bundles the following components
+under BSD-style licenses
+
 (BSD-style License)
  - Hamcrest (https://code.google.com/p/hamcrest/) - Copyright (c) 2000-2006, www.hamcrest.org
 
@@ -295,6 +300,8 @@ THE SOFTWARE.
  - Scala Compiler Reflect (BSD-like) - (http:https://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
 
 
+(Below is the 3-clause BSD license)
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -411,84 +418,3 @@ lz4_encoder.h,lz4hc.h,lz4hc.c,lz4hc_encoder.h},
  - LZ4 homepage : http:https://fastcompression.blogspot.com/p/lz4.html
  - LZ4 source repository : http:https://code.google.com/p/lz4/
 */
-
------------------------------------------------------------------------
-For jQuery 1.4.2 (MIT) in:
- - flink-runtime/resources/web-docs-infoserver/js/jquery.js
- - flink-clients/resources/web-docs/jquery.js
------------------------------------------------------------------------
-Copyright 2014 jQuery Foundation and other contributors
-http:https://jquery.com/
-
-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.
-
------------------------------------------------------------------------
-For jCanvas 13.11.21 (MIT) in:
- - flink-runtime/resources/web-docs-infoserver/js/jcanvas.min.js
------------------------------------------------------------------------
-Copyright 2014 Caleb Evans
-http:https://calebevans.me/projects/jcanvas/
-
-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.
-
------------------------------------------------------------------------
-For Flot 0.8.1 in:
- - flink-runtime/resources/web-docs-infoserver/js/jquery.flot.*
------------------------------------------------------------------------
-Copyright (c) 2007-2013 IOLA and Ole Laursen
-
-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.
-
diff --git a/flink-dist/src/main/flink-bin/LICENSE b/flink-dist/src/main/flink-bin/LICENSE
@@ -256,7 +256,9 @@ under the 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
+ - 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
 
 All rights reserved.
 
@@ -283,6 +285,9 @@ THE SOFTWARE.
  BSD-style Licenses
 -----------------------------------------------------------------------
 
+The Apache Flink project depends on and/or bundles the following components
+under BSD-style licenses
+
 (BSD-style License)
  - Hamcrest (https://code.google.com/p/hamcrest/) - Copyright (c) 2000-2006, www.hamcrest.org
 
@@ -295,6 +300,8 @@ THE SOFTWARE.
  - Scala Compiler Reflect (BSD-like) - (http:https://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
 
 
+(Below is the 3-clause BSD license)
+
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
@@ -411,84 +418,3 @@ lz4_encoder.h,lz4hc.h,lz4hc.c,lz4hc_encoder.h},
  - LZ4 homepage : http:https://fastcompression.blogspot.com/p/lz4.html
  - LZ4 source repository : http:https://code.google.com/p/lz4/
 */
-
------------------------------------------------------------------------
-For jQuery 1.4.2 (MIT) in:
- - flink-runtime/resources/web-docs-infoserver/js/jquery.js
- - flink-clients/resources/web-docs/jquery.js
------------------------------------------------------------------------
-Copyright 2014 jQuery Foundation and other contributors
-http:https://jquery.com/
-
-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.
-
------------------------------------------------------------------------
-For jCanvas 13.11.21 (MIT) in:
- - flink-runtime/resources/web-docs-infoserver/js/jcanvas.min.js
------------------------------------------------------------------------
-Copyright 2014 Caleb Evans
-http:https://calebevans.me/projects/jcanvas/
-
-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.
-
------------------------------------------------------------------------
-For Flot 0.8.1 in:
- - flink-runtime/resources/web-docs-infoserver/js/jquery.flot.*
------------------------------------------------------------------------
-Copyright (c) 2007-2013 IOLA and Ole Laursen
-
-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.
-
diff --git a/flink-dist/src/main/flink-bin/README.txt b/flink-dist/src/main/flink-bin/README.txt
@@ -6,8 +6,9 @@ and our GitHub Account
 
  https://github.com/apache/incubator-flink
 
-If you have any questions, ask on our Mailing list
+If you have any questions, ask on our Mailing lists:
 
+ [email protected]
  [email protected]
 
 This distribution includes cryptographic software. The country in