From 0163cfa11d64b641718a70aa30b7b896cdc077ba Mon Sep 17 00:00:00 2001 From: Stephan Ewen Date: Mon, 18 Aug 2014 17:00:39 +0200 Subject: [PATCH] [streaming] Fix LICENSE file for streaming project. Minor merge fixes. This closes #72 --- LICENSE | 19 +++++++++++ NOTICE | 8 +++++ .../flink-streaming-connectors/pom.xml | 5 ++- .../flink-streaming-core/pom.xml | 7 ---- .../environment/RemoteStreamEnvironment.java | 2 +- .../streamcomponent/StreamRecordWriter.java | 19 +++++++++++ .../flink/streaming/util/ClusterUtil.java | 6 ++-- .../flink-streaming-examples/pom.xml | 6 ---- flink-addons/flink-streaming/pom.xml | 33 +------------------ flink-core/pom.xml | 8 ----- flink-dist/pom.xml | 10 +++--- flink-dist/src/main/flink-bin/LICENSE | 21 +++++++++++- flink-dist/src/main/flink-bin/NOTICE | 8 +++++ pom.xml | 8 ++++- 14 files changed, 93 insertions(+), 67 deletions(-) diff --git a/LICENSE b/LICENSE index c46c750e8afc8..15caf5aed0f3b 100644 --- a/LICENSE +++ b/LICENSE @@ -227,6 +227,8 @@ under the Apache License (v 2.0): - Apache Avro (http://avro.apache.org) - Apache Hadoop (http://hadoop.apache.org) - Apache Derby (http://db.apache.org/derby/) + - Apache Kafka (http://kafka.apache.org) + - Apache Flume (http://flume.apache.org) - Google Guava (https://code.google.com/p/guava-libraries/) - Netty (http://netty.io) - Powermock (http://www.powermock.org) @@ -236,6 +238,8 @@ under the Apache License (v 2.0): - ScalaTest (http://www.scalatest.org) - StartBootstrap (http://startbootstrap.com) - CHAP Links Library Timeline (http://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://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://www.mozilla.org/MPL/ + + ----------------------------------------------------------------------- The Open Font License ----------------------------------------------------------------------- diff --git a/NOTICE b/NOTICE index 00ebeda8a4521..cf0341680ad52 100644 --- 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://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 index 23e3fef778616..4424c91d211fe 100644 --- 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. 1.5.0 - + com.twitter hbc-core 2.2.0 - + org.apache.maven.plugins maven-jar-plugin - 2.4 diff --git a/flink-addons/flink-streaming/flink-streaming-core/pom.xml b/flink-addons/flink-streaming/flink-streaming-core/pom.xml index 73b8158a3f0b3..3877930a2d1a8 100644 --- 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. - - org.apache.commons - commons-lang3 - 3.1 - - org.apache.sling org.apache.sling.commons.json @@ -55,7 +49,6 @@ under the License. org.apache.maven.plugins maven-jar-plugin - 2.4 diff --git a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java index ec6bc6f912a4c..f6495e24bd96c 100644 --- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java +++ b/flink-addons/flink-streaming/flink-streaming-core/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/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamRecordWriter.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamRecordWriter.java index f695cb1a3e6c3..67cc7fc4079eb 100755 --- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamRecordWriter.java +++ b/flink-addons/flink-streaming/flink-streaming-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://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/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java b/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java index fc5978e00e4c1..a6e842f98d3d9 100755 --- a/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java +++ b/flink-addons/flink-streaming/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) { } } -} +} \ No newline at end of file diff --git a/flink-addons/flink-streaming/flink-streaming-examples/pom.xml b/flink-addons/flink-streaming/flink-streaming-examples/pom.xml index a36946fad11de..a8486269e6099 100644 --- a/flink-addons/flink-streaming/flink-streaming-examples/pom.xml +++ b/flink-addons/flink-streaming/flink-streaming-examples/pom.xml @@ -42,11 +42,6 @@ under the License. ${project.version} - - org.apache.commons - commons-lang3 - 3.1 - @@ -54,7 +49,6 @@ under the License. org.apache.maven.plugins maven-jar-plugin - 2.4 diff --git a/flink-addons/flink-streaming/pom.xml b/flink-addons/flink-streaming/pom.xml index 202069fc536b8..b9ad104c8992d 100644 --- a/flink-addons/flink-streaming/pom.xml +++ b/flink-addons/flink-streaming/pom.xml @@ -43,7 +43,7 @@ under the License. org.apache.flink flink-core - ${project.version} + ${project.version} jar @@ -89,37 +89,6 @@ under the License. jar - - commons-logging - commons-logging - 1.1.1 - jar - compile - - - - log4j - log4j - 1.2.16 - jar - compile - - - - junit - junit - 4.7 - jar - test - - - - org.mockito - mockito-all - 1.8.5 - jar - test - diff --git a/flink-core/pom.xml b/flink-core/pom.xml index ef4cd00873ef8..81d6e51021da1 100644 --- a/flink-core/pom.xml +++ b/flink-core/pom.xml @@ -33,14 +33,6 @@ under the License. flink-core jar - - - - org.apache.commons - commons-lang3 - 3.1 - - diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml index ac340f4ad1cae..bde8d4dfc187e 100644 --- a/flink-dist/pom.xml +++ b/flink-dist/pom.xml @@ -140,12 +140,12 @@ under the License. single - - - 420 - 493 + + + 420 + 493 493 - + org.apache.flink.yarn.Client diff --git a/flink-dist/src/main/flink-bin/LICENSE b/flink-dist/src/main/flink-bin/LICENSE index 13f25f825f20a..15caf5aed0f3b 100644 --- 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://avro.apache.org) - Apache Hadoop (http://hadoop.apache.org) - Apache Derby (http://db.apache.org/derby/) + - Apache Kafka (http://kafka.apache.org) + - Apache Flume (http://flume.apache.org) - Google Guava (https://code.google.com/p/guava-libraries/) - Netty (http://netty.io) - Powermock (http://www.powermock.org) @@ -236,6 +238,8 @@ under the Apache License (v 2.0): - ScalaTest (http://www.scalatest.org) - StartBootstrap (http://startbootstrap.com) - CHAP Links Library Timeline (http://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://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://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://scripts.sil.org/OFL/ - Font Awesome (http://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 index 00ebeda8a4521..cf0341680ad52 100644 --- 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://www.cloudera.com/). + + ----------------------------------------------------------------------- Amazon Web Services SDK for Java ----------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 0394053005f3c..b6b4c8f4181bf 100644 --- a/pom.xml +++ b/pom.xml @@ -79,6 +79,12 @@ under the License. + + org.apache.commons + commons-lang3 + 3.1 + + commons-logging commons-logging @@ -324,7 +330,7 @@ under the License. org.apache.maven.plugins maven-javadoc-plugin - 2.9.1 + 2.9.1 true