You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2020/12/07 10:52:55 UTC
[flink] branch release-1.11 updated (af80ba5 -> c8b8bca)
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a change to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git.
from af80ba5 [FLINK-20442][python][legal] Updated flink-python NOTICE
new 3682e76 [FLINK-20455][oss][legal] Move license to META-INF directory
new adbf2f3 [FLINK-20455][influxdb][legal] Inline notice
new 7f127b8 [FLINK-20455][table][legal] Exclude icu4j LICENSE file
new c8b8bca [FLINK-20455][build][legal] Bundle LICENSE/NOTICE in various deployed jars
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
flink-connectors/flink-connector-kafka/pom.xml | 4 ++++
flink-connectors/flink-connector-kinesis/pom.xml | 2 ++
flink-examples/flink-examples-batch/pom.xml | 16 ++++++++++++++++
flink-examples/flink-examples-streaming/pom.xml | 20 +++++++++++++++++++-
flink-examples/flink-examples-table/pom.xml | 22 ++++++++++++++++++++++
.../resources/{ => META-INF}/licenses/LICENSE.jdom | 0
flink-metrics/flink-metrics-influxdb/pom.xml | 8 ++++++++
.../src/main/resources/META-INF/NOTICE | 8 ++++++++
.../flink-statebackend-rocksdb/pom.xml | 2 ++
flink-table/flink-table-planner-blink/pom.xml | 2 ++
flink-table/flink-table-planner/pom.xml | 2 ++
11 files changed, 85 insertions(+), 1 deletion(-)
rename flink-filesystems/flink-oss-fs-hadoop/src/main/resources/{ => META-INF}/licenses/LICENSE.jdom (100%)
[flink] 02/04: [FLINK-20455][influxdb][legal] Inline notice
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
commit adbf2f352f6dcec90f996ebefe1f108098f52a9d
Author: Robert Metzger <rm...@apache.org>
AuthorDate: Mon Dec 7 02:58:04 2020 +0100
[FLINK-20455][influxdb][legal] Inline notice
---
flink-metrics/flink-metrics-influxdb/pom.xml | 8 ++++++++
.../flink-metrics-influxdb/src/main/resources/META-INF/NOTICE | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/flink-metrics/flink-metrics-influxdb/pom.xml b/flink-metrics/flink-metrics-influxdb/pom.xml
index fa1d557..39f3a07 100644
--- a/flink-metrics/flink-metrics-influxdb/pom.xml
+++ b/flink-metrics/flink-metrics-influxdb/pom.xml
@@ -112,6 +112,14 @@ under the License.
<!-- org.msgpack:msgpack-core is not required -->
</includes>
</artifactSet>
+ <filters>
+ <filter>
+ <artifact>*</artifact>
+ <excludes>
+ <exclude>okhttp3/internal/publicsuffix/NOTICE</exclude>
+ </excludes>
+ </filter>
+ </filters>
</configuration>
</execution>
</executions>
diff --git a/flink-metrics/flink-metrics-influxdb/src/main/resources/META-INF/NOTICE b/flink-metrics/flink-metrics-influxdb/src/main/resources/META-INF/NOTICE
index cfd39b4..54500bd 100644
--- a/flink-metrics/flink-metrics-influxdb/src/main/resources/META-INF/NOTICE
+++ b/flink-metrics/flink-metrics-influxdb/src/main/resources/META-INF/NOTICE
@@ -16,3 +16,11 @@ This project bundles the following dependencies under the Apache Software Licens
This project bundles the following dependencies under the MIT license. (https://opensource.org/licenses/MIT)
- org.influxdb:influxdb-java:2.17
+
+This project bundles a file called "publicsuffixes.gz":
+
+Note that publicsuffixes.gz is compiled from The Public Suffix List:
+https://publicsuffix.org/list/public_suffix_list.dat
+
+It is subject to the terms of the Mozilla Public License, v. 2.0:
+https://mozilla.org/MPL/2.0/
\ No newline at end of file
[flink] 04/04: [FLINK-20455][build][legal] Bundle LICENSE/NOTICE in
various deployed jars
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
commit c8b8bcad5163094cb5c43906355a739ec5f36ce8
Author: Robert Metzger <rm...@apache.org>
AuthorDate: Mon Dec 7 02:59:31 2020 +0100
[FLINK-20455][build][legal] Bundle LICENSE/NOTICE in various deployed jars
---
flink-connectors/flink-connector-kafka/pom.xml | 4 ++++
flink-connectors/flink-connector-kinesis/pom.xml | 2 ++
flink-examples/flink-examples-batch/pom.xml | 16 ++++++++++++++++
flink-examples/flink-examples-streaming/pom.xml | 20 +++++++++++++++++++-
flink-examples/flink-examples-table/pom.xml | 22 ++++++++++++++++++++++
.../flink-statebackend-rocksdb/pom.xml | 2 ++
6 files changed, 65 insertions(+), 1 deletion(-)
diff --git a/flink-connectors/flink-connector-kafka/pom.xml b/flink-connectors/flink-connector-kafka/pom.xml
index 294fa3c..c7d6af4 100644
--- a/flink-connectors/flink-connector-kafka/pom.xml
+++ b/flink-connectors/flink-connector-kafka/pom.xml
@@ -231,6 +231,8 @@ under the License.
<configuration>
<includes>
<include>**/KafkaTestEnvironmentImpl*</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -248,6 +250,8 @@ under the License.
<configuration>
<includes>
<include>**/KafkaTestEnvironmentImpl*</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
diff --git a/flink-connectors/flink-connector-kinesis/pom.xml b/flink-connectors/flink-connector-kinesis/pom.xml
index 3d0e19f..54ae30d 100644
--- a/flink-connectors/flink-connector-kinesis/pom.xml
+++ b/flink-connectors/flink-connector-kinesis/pom.xml
@@ -181,6 +181,8 @@ under the License.
<configuration>
<includes>
<include>**/org/apache/flink/streaming/connectors/kinesis/testutils/**</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
diff --git a/flink-examples/flink-examples-batch/pom.xml b/flink-examples/flink-examples-batch/pom.xml
index e2ee888..5759f3c 100644
--- a/flink-examples/flink-examples-batch/pom.xml
+++ b/flink-examples/flink-examples-batch/pom.xml
@@ -179,6 +179,8 @@ under the License.
<include>**/java/clustering/KMeans$*.class</include>
<include>**/java/clustering/util/KMeansDataGenerator.class</include>
<include>**/java/clustering/util/KMeansData.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -203,6 +205,8 @@ under the License.
<include>**/java/graph/TransitiveClosureNaive.class</include>
<include>**/java/graph/TransitiveClosureNaive$*.class</include>
<include>**/java/graph/util/ConnectedComponentsData.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -227,6 +231,8 @@ under the License.
<include>**/java/graph/ConnectedComponents.class</include>
<include>**/java/graph/ConnectedComponents$*.class</include>
<include>**/java/graph/util/ConnectedComponentsData.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -253,6 +259,8 @@ under the License.
<include>**/java/graph/util/EnumTrianglesDataTypes.class</include>
<include>**/java/graph/util/EnumTrianglesDataTypes$*.class</include>
<include>**/java/graph/util/EnumTrianglesData.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -277,6 +285,8 @@ under the License.
<include>**/java/graph/PageRank.class</include>
<include>**/java/graph/PageRank$*.class</include>
<include>**/java/graph/util/PageRankData.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -302,6 +312,8 @@ under the License.
<include>**/java/relational/WebLogAnalysis$*.class</include>
<include>**/java/relational/util/WebLogData.class</include>
<include>**/java/relational/util/WebLogDataGenerator.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -326,6 +338,8 @@ under the License.
<include>**/java/wordcount/WordCount.class</include>
<include>**/java/wordcount/WordCount$*.class</include>
<include>**/java/wordcount/util/WordCountData.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -348,6 +362,8 @@ under the License.
<includes>
<include>**/java/distcp/*</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
diff --git a/flink-examples/flink-examples-streaming/pom.xml b/flink-examples/flink-examples-streaming/pom.xml
index cc77e6ed..9b5ecad 100644
--- a/flink-examples/flink-examples-streaming/pom.xml
+++ b/flink-examples/flink-examples-streaming/pom.xml
@@ -206,6 +206,8 @@ under the License.
<includes>
<include>org/apache/flink/streaming/examples/iteration/*.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -227,7 +229,9 @@ under the License.
</archive>
<includes>
- <include>org/apache/flink/streaming/examples/ml/*.class</include>
+ <include>org/apache/flink/streaming/examples/ml/*.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -251,6 +255,8 @@ under the License.
<includes>
<include>org/apache/flink/streaming/examples/join/*.class</include>
<include>org/apache/flink/streaming/examples/utils/ThrottledIterator.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -273,6 +279,8 @@ under the License.
<includes>
<include>org/apache/flink/streaming/examples/async/*.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -297,6 +305,8 @@ under the License.
<include>org/apache/flink/streaming/examples/wordcount/PojoExample.class</include>
<include>org/apache/flink/streaming/examples/wordcount/PojoExample$*.class</include>
<include>org/apache/flink/streaming/examples/wordcount/util/WordCountData.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -321,6 +331,8 @@ under the License.
<include>org/apache/flink/streaming/examples/wordcount/WordCount.class</include>
<include>org/apache/flink/streaming/examples/wordcount/WordCount$*.class</include>
<include>org/apache/flink/streaming/examples/wordcount/util/WordCountData.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -344,6 +356,8 @@ under the License.
<includes>
<include>org/apache/flink/streaming/examples/socket/SocketWindowWordCount.class</include>
<include>org/apache/flink/streaming/examples/socket/SocketWindowWordCount$*.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -367,6 +381,8 @@ under the License.
<includes>
<include>org/apache/flink/streaming/examples/windowing/TopSpeedWindowing.class</include>
<include>org/apache/flink/streaming/examples/windowing/TopSpeedWindowing$*.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -390,6 +406,8 @@ under the License.
<includes>
<include>org/apache/flink/streaming/examples/windowing/SessionWindowing.class</include>
<include>org/apache/flink/streaming/examples/windowing/SessionWindowing$*.class</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
diff --git a/flink-examples/flink-examples-table/pom.xml b/flink-examples/flink-examples-table/pom.xml
index f5e14d1..56ddd78 100644
--- a/flink-examples/flink-examples-table/pom.xml
+++ b/flink-examples/flink-examples-table/pom.xml
@@ -116,6 +116,8 @@ under the License.
<includes>
<include>org/apache/flink/table/examples/java/basics/StreamSQLExample*</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -138,6 +140,8 @@ under the License.
<includes>
<include>org/apache/flink/table/examples/java/basics/StreamWindowSQLExample*</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -160,6 +164,8 @@ under the License.
<includes>
<include>org/apache/flink/table/examples/java/basics/WordCountSQL*</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -182,6 +188,8 @@ under the License.
<includes>
<include>org/apache/flink/table/examples/java/basics/WordCountTable*</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -205,6 +213,8 @@ under the License.
<includes>
<include>org/apache/flink/table/examples/java/connectors/*</include>
<include>**/META-INF/services/*</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
@@ -226,7 +236,13 @@ under the License.
</archive>
<includes>
+<<<<<<< HEAD
<include>org/apache/flink/table/examples/scala/StreamTableExample*</include>
+=======
+ <include>org/apache/flink/table/examples/scala/basics/StreamTableExample*</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
+>>>>>>> 8fe1928da5... [FLINK-20455][build][legal] Bundle LICENSE/NOTICE in various deployed jars
</includes>
</configuration>
</execution>
@@ -248,7 +264,13 @@ under the License.
</archive>
<includes>
+<<<<<<< HEAD
<include>org/apache/flink/table/examples/scala/TPCHQuery3Table*</include>
+=======
+ <include>org/apache/flink/table/examples/scala/basics/TPCHQuery3Table*</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
+>>>>>>> 8fe1928da5... [FLINK-20455][build][legal] Bundle LICENSE/NOTICE in various deployed jars
</includes>
</configuration>
</execution>
diff --git a/flink-state-backends/flink-statebackend-rocksdb/pom.xml b/flink-state-backends/flink-statebackend-rocksdb/pom.xml
index d6c452f..1ae62e6 100644
--- a/flink-state-backends/flink-statebackend-rocksdb/pom.xml
+++ b/flink-state-backends/flink-statebackend-rocksdb/pom.xml
@@ -98,6 +98,8 @@ under the License.
<includes>
<include>**/org/apache/flink/contrib/streaming/state/RocksDBTestUtils*</include>
<include>**/org/apache/flink/contrib/streaming/state/benchmark/StateBackendBenchmarkUtils*</include>
+ <include>META-INF/LICENSE</include>
+ <include>META-INF/NOTICE</include>
</includes>
</configuration>
</execution>
[flink] 01/04: [FLINK-20455][oss][legal] Move license to META-INF
directory
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 3682e76108fa412a4ff8aecc2ccb4d0cdee6421b
Author: Robert Metzger <rm...@apache.org>
AuthorDate: Mon Dec 7 02:57:21 2020 +0100
[FLINK-20455][oss][legal] Move license to META-INF directory
---
.../src/main/resources/{ => META-INF}/licenses/LICENSE.jdom | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/flink-filesystems/flink-oss-fs-hadoop/src/main/resources/licenses/LICENSE.jdom b/flink-filesystems/flink-oss-fs-hadoop/src/main/resources/META-INF/licenses/LICENSE.jdom
similarity index 100%
rename from flink-filesystems/flink-oss-fs-hadoop/src/main/resources/licenses/LICENSE.jdom
rename to flink-filesystems/flink-oss-fs-hadoop/src/main/resources/META-INF/licenses/LICENSE.jdom
[flink] 03/04: [FLINK-20455][table][legal] Exclude icu4j LICENSE
file
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chesnay pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
commit 7f127b8ead71b644a4fb364466029619364aba34
Author: Robert Metzger <rm...@apache.org>
AuthorDate: Mon Dec 7 02:58:37 2020 +0100
[FLINK-20455][table][legal] Exclude icu4j LICENSE file
---
flink-table/flink-table-planner-blink/pom.xml | 2 ++
flink-table/flink-table-planner/pom.xml | 2 ++
2 files changed, 4 insertions(+)
diff --git a/flink-table/flink-table-planner-blink/pom.xml b/flink-table/flink-table-planner-blink/pom.xml
index 0a13eb6..fdad8cd 100644
--- a/flink-table/flink-table-planner-blink/pom.xml
+++ b/flink-table/flink-table-planner-blink/pom.xml
@@ -341,6 +341,8 @@ under the License.
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
<exclude>META-INF/services/java.sql.Driver</exclude>
+ <!-- com.ibm.icu:icu4j includes a LICENSE file in its root folder -->
+ <exclude>LICENSE</exclude>
</excludes>
</filter>
</filters>
diff --git a/flink-table/flink-table-planner/pom.xml b/flink-table/flink-table-planner/pom.xml
index e8dccf4..285ea5e 100644
--- a/flink-table/flink-table-planner/pom.xml
+++ b/flink-table/flink-table-planner/pom.xml
@@ -311,6 +311,8 @@ under the License.
<exclude>META-INF/services/java.sql.Driver</exclude>
<!-- not relocated for now, because it is needed by Calcite -->
<!--<exclude>org.codehaus.commons.compiler.properties</exclude>-->
+ <!-- com.ibm.icu:icu4j includes a LICENSE file in its root folder -->
+ <exclude>LICENSE</exclude>
</excludes>
</filter>
</filters>