[streaming] Fix LICENSE file for streaming project. Minor merge fixes.

This closes apache#72
mbalassi · Aug 18, 2014 · 0163cfa · 0163cfa
1 parent 35cf874
commit 0163cfa
Show file tree

Hide file tree

Showing 14 changed files with 93 additions and 67 deletions.
diff --git a/LICENSE b/LICENSE
@@ -227,6 +227,8 @@ under the Apache License (v 2.0):
  - Apache Avro (http:https://avro.apache.org)
  - Apache Hadoop (http:https://hadoop.apache.org)
  - Apache Derby (http:https://db.apache.org/derby/)
+ - Apache Kafka (http:https://kafka.apache.org)
+ - Apache Flume (http:https://flume.apache.org)
  - Google Guava (https://code.google.com/p/guava-libraries/)
  - Netty (http:https://netty.io)
  - Powermock (http:https://www.powermock.org)
@@ -236,6 +238,8 @@ under the Apache License (v 2.0):
  - 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)
+
 
 -----------------------------------------------------------------------
  Eclipse Public License - v 1.0
@@ -336,6 +340,21 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 
+-----------------------------------------------------------------------
+ Mozilla Public License - v 1.1
+-----------------------------------------------------------------------
+
+The Apache Flink project depends on and/or bundles the following components
+under the Mozilla Public License (v 1.1)
+
+ - RabbitMQ (http:https://www.rabbitmq.com) 
+ The Initial Developer of the Original Code is GoPivotal,Ltd.
+ Copyright (c) 2007-2013 GoPivotal, Inc. All Rights Reserved.
+
+You may obtain a copy of the Mozilla Public License (v 1.1) at
+http:https://www.mozilla.org/MPL/
+
+
 -----------------------------------------------------------------------
  The Open Font License
 -----------------------------------------------------------------------

diff --git a/NOTICE b/NOTICE
@@ -88,6 +88,14 @@ The JRuby community went out of their way to make JRuby compatible with Apache
 projects: See https://issues.apache.org/jira/browse/HBASE-3374)
 
 
+-----------------------------------------------------------------------
+ Apache Flume
+-----------------------------------------------------------------------
+
+Portions of this software were developed at
+Cloudera, Inc. (http:https://www.cloudera.com/).
+
+
 -----------------------------------------------------------------------
  Amazon Web Services SDK for Java
 -----------------------------------------------------------------------

diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
@@ -66,20 +66,19 @@ under the License.
  <version>1.5.0</version>
  </dependency>
 
-   <dependency>
+   <dependency>
  <groupId>com.twitter</groupId>
  <artifactId>hbc-core</artifactId>
  <version>2.2.0</version>
  </dependency>
 
- </dependencies>
+ </dependencies>
 
  <build>
  <plugins>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
  <executions>
  <execution>
  <goals>

diff --git a/flink-addons/flink-streaming/flink-streaming-core/pom.xml b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
@@ -36,12 +36,6 @@ under the License.
 
  <dependencies>
 
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
- </dependency>
-
  <dependency>
  <groupId>org.apache.sling</groupId>
  <artifactId>org.apache.sling.commons.json</artifactId>
@@ -55,7 +49,6 @@ under the License.
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
  <executions>
  <execution>
  <goals>

diff --git a/...ore/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java b/...ore/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
@@ -89,7 +89,7 @@ public void execute() {
  }
 
  Configuration configuration = jobGraph.getJobConfiguration();
- Client client = new Client(new InetSocketAddress(host, port), configuration);
+ Client client = new Client(new InetSocketAddress(host, port), configuration, getClass().getClassLoader());
 
  try {
  client.run(jobGraph, true);

diff --git a/...core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamRecordWriter.java b/...core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamRecordWriter.java
@@ -1,3 +1,22 @@
+/**
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http:https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
 package org.apache.flink.streaming.api.streamcomponent;
 
 import java.io.IOException;

diff --git a/...aming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java b/...aming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java
@@ -49,7 +49,7 @@ public static void runOnMiniCluster(JobGraph jobGraph, int numberOfTaskTrackers,
  NepheleMiniCluster exec = new NepheleMiniCluster();
  exec.setMemorySize(memorySize);
  exec.setNumTaskTracker(numberOfTaskTrackers);
- Client client = new Client(new InetSocketAddress("localhost", 6498), configuration);
+ Client client = new Client(new InetSocketAddress("localhost", 6498), configuration, ClusterUtil.class.getClassLoader());
 
  if (LOG.isInfoEnabled()) {
  LOG.info("Running on mini cluster");
@@ -77,7 +77,7 @@ public static void runOnLocalCluster(JobGraph jobGraph, String IP, int port) {
 
  Configuration configuration = jobGraph.getJobConfiguration();
 
- Client client = new Client(new InetSocketAddress(IP, port), configuration);
+ Client client = new Client(new InetSocketAddress(IP, port), configuration, ClusterUtil.class.getClassLoader());
 
  try {
  client.run(jobGraph, true);
@@ -86,4 +86,4 @@ public static void runOnLocalCluster(JobGraph jobGraph, String IP, int port) {
  }
  }
 
-}
+}
diff --git a/flink-addons/flink-streaming/flink-streaming-examples/pom.xml b/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
@@ -42,19 +42,13 @@ under the License.
  <version>${project.version}</version>
  </dependency>
 
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
- </dependency>
  </dependencies>
 
  <build>
  <plugins>
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-jar-plugin</artifactId>
- <version>2.4</version>
  <executions>
  <execution>
  <goals>

diff --git a/flink-addons/flink-streaming/pom.xml b/flink-addons/flink-streaming/pom.xml
@@ -43,7 +43,7 @@ under the License.
  <dependency>
  <groupId>org.apache.flink</groupId>
  <artifactId>flink-core</artifactId>
-  <version>${project.version}</version>
+  <version>${project.version}</version>
  <type>jar</type>
  </dependency>
 
@@ -89,37 +89,6 @@ under the License.
  <type>jar</type>
  </dependency>
 
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>1.1.1</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <type>jar</type>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.7</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-all</artifactId>
- <version>1.8.5</version>
- <type>jar</type>
- <scope>test</scope>
- </dependency>
  </dependencies>
 
 </project>
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
@@ -33,14 +33,6 @@ under the License.
  <name>flink-core</name>
 
  <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
- </dependency>
- </dependencies>
 
  <build>
  <plugins>

diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
@@ -140,12 +140,12 @@ under the License.
  <goal>single</goal>
  </goals>
  <configuration>
-  <archiverConfig>
-   <!-- https://jira.codehaus.org/browse/MASSEMBLY-449 -->
-  <fileMode>420</fileMode> <!-- 420(dec) = 644(oct) -->
-   <directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) -->
+  <archiverConfig>
+   <!-- https://jira.codehaus.org/browse/MASSEMBLY-449 -->
+  <fileMode>420</fileMode> <!-- 420(dec) = 644(oct) -->
+   <directoryMode>493</directoryMode> <!-- 493(dec) = 755(oct) -->
  <defaultDirectoryMode>493</defaultDirectoryMode>
-  </archiverConfig>
+  </archiverConfig>
  <archive>
  <manifest>
  <mainClass>org.apache.flink.yarn.Client</mainClass>

diff --git a/flink-dist/src/main/flink-bin/LICENSE b/flink-dist/src/main/flink-bin/LICENSE
@@ -227,6 +227,8 @@ under the Apache License (v 2.0):
  - Apache Avro (http:https://avro.apache.org)
  - Apache Hadoop (http:https://hadoop.apache.org)
  - Apache Derby (http:https://db.apache.org/derby/)
+ - Apache Kafka (http:https://kafka.apache.org)
+ - Apache Flume (http:https://flume.apache.org)
  - Google Guava (https://code.google.com/p/guava-libraries/)
  - Netty (http:https://netty.io)
  - Powermock (http:https://www.powermock.org)
@@ -236,6 +238,8 @@ under the Apache License (v 2.0):
  - 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)
+
 
 -----------------------------------------------------------------------
  Eclipse Public License - v 1.0
@@ -336,6 +340,21 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGE.
 
 
+-----------------------------------------------------------------------
+ Mozilla Public License - v 1.1
+-----------------------------------------------------------------------
+
+The Apache Flink project depends on and/or bundles the following components
+under the Mozilla Public License (v 1.1)
+
+ - RabbitMQ (http:https://www.rabbitmq.com) 
+ The Initial Developer of the Original Code is GoPivotal,Ltd.
+ Copyright (c) 2007-2013 GoPivotal, Inc. All Rights Reserved.
+
+You may obtain a copy of the Mozilla Public License (v 1.1) at
+http:https://www.mozilla.org/MPL/
+
+
 -----------------------------------------------------------------------
  The Open Font License
 -----------------------------------------------------------------------
@@ -344,7 +363,7 @@ The Apache Flink project packages 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 "resources/web-docs-infoserver/font-awesome/fonts"
+ -> fonts in "flink-runtime/resources/web-docs-infoserver/font-awesome/fonts"
 
 
 -----------------------------------------------------------------------

diff --git a/flink-dist/src/main/flink-bin/NOTICE b/flink-dist/src/main/flink-bin/NOTICE
@@ -88,6 +88,14 @@ The JRuby community went out of their way to make JRuby compatible with Apache
 projects: See https://issues.apache.org/jira/browse/HBASE-3374)
 
 
+-----------------------------------------------------------------------
+ Apache Flume
+-----------------------------------------------------------------------
+
+Portions of this software were developed at
+Cloudera, Inc. (http:https://www.cloudera.com/).
+
+
 -----------------------------------------------------------------------
  Amazon Web Services SDK for Java
 -----------------------------------------------------------------------

diff --git a/pom.xml b/pom.xml
@@ -79,6 +79,12 @@ under the License.
  </properties>
 
  <dependencies>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ <version>3.1</version>
+ </dependency>
+
  <dependency>
  <groupId>commons-logging</groupId>
  <artifactId>commons-logging</artifactId>
@@ -324,7 +330,7 @@ under the License.
  <plugin>
  <groupId>org.apache.maven.plugins</groupId>
  <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.9.1</version>
+ <version>2.9.1</version><!--$NO-MVN-MAN-VER$-->
  <configuration>
  <quiet>true</quiet>
  </configuration>