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/08/29 21:04:00 UTC
[27/28] git commit: [streaming] Moved dependencies to enforce correct
policy
[streaming] Moved dependencies to enforce correct policy
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/a1039500
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/a1039500
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/a1039500
Branch: refs/heads/master
Commit: a103950076b51d3fdc393b2c0a5e89b335e06ab6
Parents: 90ad6b0
Author: mbalassi <ba...@gmail.com>
Authored: Tue Aug 26 10:14:19 2014 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Aug 29 21:01:57 2014 +0200
----------------------------------------------------------------------
DEPENDENCIES | 4 +++-
LICENSE | 18 ------------------
2 files changed, 3 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/a1039500/DEPENDENCIES
----------------------------------------------------------------------
diff --git a/DEPENDENCIES b/DEPENDENCIES
index 7c7b9eb..9a9946a 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -98,7 +98,9 @@ under BSD-style licenses
(New BSD License)
- Kryo (https://github.com/EsotericSoftware/kryo) - Copyright (c) 2008, Nathan Sweet
- 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://redis.io/) - Copyright (c) 2009, Salvatore Sanfilippo and Pieter Noordhuis
+
(BSD-like License)
- Scala Library (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- Scala Compiler (BSD-like) - (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/a1039500/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 9b21194..7e3aff2 100644
--- a/LICENSE
+++ b/LICENSE
@@ -251,26 +251,8 @@ THE SOFTWARE.
BSD-style Licenses
-----------------------------------------------------------------------
-The Apache Flink project depends on and/or bundles the following components
-under BSD-style licenses
-
(3-clause BSD license)
- D3 (http://d3js.org/) - Copyright (c) 2010-2014, Michael Bostock
- - Kryo (https://github.com/EsotericSoftware/kryo) - Copyright (c) 2008, Nathan Sweet
- - LevelDB (http://code.google.com/p/leveldb/) - Copyright (c) 2011, The LevelDB Authors
- - Memcached (https://github.com/memcached/memcached) - Copyright (c) 2003, Danga Interactive, Inc.
- - Redis (http://redis.io/) - Copyright (c) 2009, Salvatore Sanfilippo and Pieter Noordhuis
-
-(BSD-style License)
- - Hamcrest (https://code.google.com/p/hamcrest/) - Copyright (c) 2000-2006, www.hamcrest.org
-
-(BSD-like License)
- - Scala Library (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- - Scala Compiler (BSD-like) - (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- - Scala Compiler Reflect (BSD-like) - (http://www.scala-lang.org/) - Copyright (c) 2002-2014 EPFL, Copyright (c) 2011-2014 Typesafe, Inc.
- - ASM (BSD-like) - (http://asm.ow2.org/) - Copyright (c) 2000-2011 INRIA, France Telecom
-
-(Below is the 3-clause BSD license)
All rights reserved.