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/18 19:26:27 UTC
[50/51] [abbrv] git commit: [streaming] Fix LICENSE file for
streaming project. Minor merge fixes.
[streaming] Fix LICENSE file for streaming project. Minor merge fixes.
This closes #72
Project: http://git-wip-us.apache.org/repos/asf/incubator-flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-flink/commit/0163cfa1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-flink/tree/0163cfa1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-flink/diff/0163cfa1
Branch: refs/heads/master
Commit: 0163cfa11d64b641718a70aa30b7b896cdc077ba
Parents: 35cf874
Author: Stephan Ewen <se...@apache.org>
Authored: Mon Aug 18 17:00:39 2014 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Mon Aug 18 17:34:09 2014 +0200
----------------------------------------------------------------------
LICENSE | 19 +++++++++++
NOTICE | 8 +++++
.../flink-streaming-connectors/pom.xml | 5 ++-
.../flink-streaming-core/pom.xml | 7 -----
.../environment/RemoteStreamEnvironment.java | 2 +-
.../api/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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index c46c750..15caf5a 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
@@ -337,6 +341,21 @@ 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
-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 00ebeda..cf03416 100644
--- a/NOTICE
+++ b/NOTICE
@@ -89,6 +89,14 @@ 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
-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml b/flink-addons/flink-streaming/flink-streaming-connectors/pom.xml
index 23e3fef..4424c91 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.
<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>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/flink-addons/flink-streaming/flink-streaming-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-core/pom.xml b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
index 73b8158..3877930 100644
--- a/flink-addons/flink-streaming/flink-streaming-core/pom.xml
+++ b/flink-addons/flink-streaming/flink-streaming-core/pom.xml
@@ -37,12 +37,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>
<version>2.0.6</version>
@@ -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>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/environment/RemoteStreamEnvironment.java
----------------------------------------------------------------------
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 ec6bc6f..f6495e2 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 class RemoteStreamEnvironment extends StreamExecutionEnvironment {
}
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);
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/api/streamcomponent/StreamRecordWriter.java
----------------------------------------------------------------------
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 f695cb1..67cc7fc 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;
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/flink-addons/flink-streaming/flink-streaming-core/src/main/java/org/apache/flink/streaming/util/ClusterUtil.java
----------------------------------------------------------------------
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 fc5978e..a6e842f 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 class ClusterUtil {
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 class ClusterUtil {
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 class ClusterUtil {
}
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/flink-streaming-examples/pom.xml b/flink-addons/flink-streaming/flink-streaming-examples/pom.xml
index a36946f..a848626 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.
<version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.1</version>
- </dependency>
</dependencies>
<build>
@@ -54,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>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/flink-addons/flink-streaming/pom.xml
----------------------------------------------------------------------
diff --git a/flink-addons/flink-streaming/pom.xml b/flink-addons/flink-streaming/pom.xml
index 202069f..b9ad104 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/flink-core/pom.xml
----------------------------------------------------------------------
diff --git a/flink-core/pom.xml b/flink-core/pom.xml
index ef4cd00..81d6e51 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/flink-dist/pom.xml
----------------------------------------------------------------------
diff --git a/flink-dist/pom.xml b/flink-dist/pom.xml
index ac340f4..bde8d4d 100644
--- 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>
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/flink-dist/src/main/flink-bin/LICENSE
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/LICENSE b/flink-dist/src/main/flink-bin/LICENSE
index 13f25f8..15caf5a 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
@@ -337,6 +341,21 @@ 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"
-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/flink-dist/src/main/flink-bin/NOTICE
----------------------------------------------------------------------
diff --git a/flink-dist/src/main/flink-bin/NOTICE b/flink-dist/src/main/flink-bin/NOTICE
index 00ebeda..cf03416 100644
--- a/flink-dist/src/main/flink-bin/NOTICE
+++ b/flink-dist/src/main/flink-bin/NOTICE
@@ -89,6 +89,14 @@ 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
-----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-flink/blob/0163cfa1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0394053..b6b4c8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,12 @@ under the License.
<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>
<version>1.1.3</version>
@@ -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>