From 2551dc43d5ef60696e44cfc78f21c4756da97b43 Mon Sep 17 00:00:00 2001
From: Till Rohrmann <trohrmann@apache.org>
Date: Mon, 13 Oct 2014 16:06:50 +0200
Subject: [PATCH] Updated DEPENDENCIES, NOTICE and LICENSE files.

---
 DEPENDENCIES                         |  3 +++
 LICENSE                              |  1 +
 flink-dist/src/main/flink-bin/NOTICE | 29 ++++++++++++++++++++++++++++
 3 files changed, 33 insertions(+)

diff --git a/DEPENDENCIES b/DEPENDENCIES
index 1f421d62c3187..8e616b55724b6 100644
--- a/DEPENDENCIES
+++ b/DEPENDENCIES
@@ -23,6 +23,7 @@ under the Apache License (v 2.0):
  - Apache Derby (http://db.apache.org/derby/)
  - Apache Kafka (http://kafka.apache.org)
  - Apache Flume (http://flume.apache.org)
+ - Apache Camel (http://camel.apache.org)
  - Google Guava (https://code.google.com/p/guava-libraries/)
  - Netty (http://netty.io)
  - Powermock (http://www.powermock.org)
@@ -33,6 +34,7 @@ under the Apache License (v 2.0):
  - StartBootstrap (http://startbootstrap.com)
  - CHAP Links Library Timeline (http://almende.github.io/chap-links-library/)
  - Twitter Hosebird Client (hbc) (https://github.com/twitter/hbc)
+ - Akka (http://akka.io)
 
 
 -----------------------------------------------------------------------
@@ -65,6 +67,7 @@ under the MIT License
  - 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
+ - scopt v3.2.0 (http://github.com/scopt/scopt)
 
 
 All rights reserved.
diff --git a/LICENSE b/LICENSE
index f4286fecf3fb3..bb8b845784ebc 100644
--- a/LICENSE
+++ b/LICENSE
@@ -225,6 +225,7 @@ The Apache Flink project bundles the following files under the MIT License:
  - 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
+ - scopt (http://github.com/scopt/scopt)
 
 
 All rights reserved.
diff --git a/flink-dist/src/main/flink-bin/NOTICE b/flink-dist/src/main/flink-bin/NOTICE
index b43d671f67f5a..43816957778ca 100644
--- a/flink-dist/src/main/flink-bin/NOTICE
+++ b/flink-dist/src/main/flink-bin/NOTICE
@@ -98,6 +98,18 @@ projects: See https://issues.apache.org/jira/browse/HBASE-3374)
 Portions of this software were developed at
 Cloudera, Inc. (http://www.cloudera.com/).
 
+-----------------------------------------------------------------------
+                           Apache Camel
+-----------------------------------------------------------------------
+
+This product includes software developed by The Apache Software
+Foundation (http://www.apache.org/).
+
+-----------------------------------------------------------------------
+                           Akka
+-----------------------------------------------------------------------
+
+Copyright 2009-2014 Typesafe Inc. (http://www.typesafe.com)
 
 -----------------------------------------------------------------------
                    Amazon Web Services SDK for Java
@@ -516,3 +528,20 @@ project. The following notice covers the Xalan jar files:
 	     - software copyright (c) 1999, Sun Microsystems., http://www.sun.com.
 	     - software copyright (c) 2000 World Wide Web Consortium, http://www.w3.org
 
+
+-----------------------------------------------------------------------
+                           Scopt
+-----------------------------------------------------------------------
+
+  * January 13, 2008: Aaron Harnly creates aaronharnly/scala-options.
+  * December 1, 2009: Tim Perrett introduces it as a gist on Parsing command lines argument in a
+  "scalaesque" way.
+  * January 10, 2010: James Strachan takes the code, adds usage text, sbt build, etc and creates
+  jstrachan/scopt, which is also mentioned in Scala CLI Library?.
+  * March 4th, 2010: Eugene Yokota joins scopt project, improves usage text, and adds support for
+  key=value option and argument list.
+  * May 27, 2011: scopt 1.0.0 is released to scala-tools.org.
+  * March 18, 2012: Eugene adds immutable parser, forks the project to scopt/scopt, and releases
+  scopt 2.0.0.
+  * June 7, 2013: Eugene rewrites scopt from scratch for polymorphic options, and releases scopt 3
+  .0.0.
\ No newline at end of file