You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by di...@apache.org on 2020/12/05 12:51:34 UTC
[flink] branch release-1.11 updated: [FLINK-20442][python][legal]
Updated flink-python NOTICE
This is an automated email from the ASF dual-hosted git repository.
dianfu pushed a commit to branch release-1.11
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.11 by this push:
new af80ba5 [FLINK-20442][python][legal] Updated flink-python NOTICE
af80ba5 is described below
commit af80ba57ade23f881af21beb93178495bbb7e500
Author: Dian Fu <di...@apache.org>
AuthorDate: Tue Dec 1 21:58:13 2020 +0800
[FLINK-20442][python][legal] Updated flink-python NOTICE
This closes #14282.
---
flink-python/lib/LICENSE.cloudpickle | 32 -------------------------
flink-python/lib/LICENSE.py4j | 26 --------------------
flink-python/pom.xml | 16 ++++++++++++-
flink-python/src/main/resources/META-INF/NOTICE | 2 --
4 files changed, 15 insertions(+), 61 deletions(-)
diff --git a/flink-python/lib/LICENSE.cloudpickle b/flink-python/lib/LICENSE.cloudpickle
deleted file mode 100644
index d112c48..0000000
--- a/flink-python/lib/LICENSE.cloudpickle
+++ /dev/null
@@ -1,32 +0,0 @@
-This module was extracted from the `cloud` package, developed by
-PiCloud, Inc.
-
-Copyright (c) 2015, Cloudpickle contributors.
-Copyright (c) 2012, Regents of the University of California.
-Copyright (c) 2009 PiCloud, Inc. http://www.picloud.com.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- * Neither the name of the University of California, Berkeley nor the
- names of its contributors may be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/flink-python/lib/LICENSE.py4j b/flink-python/lib/LICENSE.py4j
deleted file mode 100644
index 0f45e3e..0000000
--- a/flink-python/lib/LICENSE.py4j
+++ /dev/null
@@ -1,26 +0,0 @@
-Copyright (c) 2009-2018, Barthelemy Dagenais and individual contributors. All
-rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-- Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-- Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
-
-- The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/flink-python/pom.xml b/flink-python/pom.xml
index 6d9c577..a18131c 100644
--- a/flink-python/pom.xml
+++ b/flink-python/pom.xml
@@ -92,6 +92,12 @@ under the License.
<dependency>
<groupId>org.apache.beam</groupId>
<artifactId>beam-runners-java-fn-execution</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.beam</groupId>
+ <artifactId>beam-vendor-bytebuddy-1_9_3</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -332,12 +338,20 @@ under the License.
<filter>
<artifact>org.apache.beam:beam-sdks-java-core</artifact>
<excludes>
- <exclude>org/apache/beam/vendor/bytebuddy/**</exclude>
<exclude>org/apache/beam/repackaged/core/org/antlr/**</exclude>
<exclude>org/apache/beam/repackaged/core/org/apache/commons/compress/**</exclude>
<exclude>org/apache/beam/repackaged/core/org/apache/commons/lang3/**</exclude>
</excludes>
</filter>
+ <filter>
+ <artifact>*:*</artifact>
+ <excludes>
+ <exclude>LICENSE-junit.txt</exclude>
+ <exclude>LICENSE.txt</exclude>
+ <exclude>META-INF/LICENSE.txt</exclude>
+ <exclude>*.proto</exclude>
+ </excludes>
+ </filter>
</filters>
<relocations combine.children="append">
<relocation>
diff --git a/flink-python/src/main/resources/META-INF/NOTICE b/flink-python/src/main/resources/META-INF/NOTICE
index c7c6a96..5803a06 100644
--- a/flink-python/src/main/resources/META-INF/NOTICE
+++ b/flink-python/src/main/resources/META-INF/NOTICE
@@ -24,7 +24,6 @@ This project bundles the following dependencies under the Apache Software Licens
- org.apache.beam:beam-runners-java-fn-execution:2.19.0
- org.apache.beam:beam-sdks-java-core:2.19.0
- org.apache.beam:beam-sdks-java-fn-execution:2.19.0
-- org.apache.beam:beam-vendor-bytebuddy-1_9_3:0.1
- org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.19.0
- org.apache.beam:beam-vendor-guava-26_0-jre:0.1
- org.apache.beam:beam-vendor-grpc-1_21_0:0.1
@@ -67,7 +66,6 @@ The bundled Apache Beam dependencies bundle the following dependencies under the
- io.netty:netty-tcnative-boringssl-static:2.0.22.Final
- io.opencensus:opencensus-api:0.21.0
- io.opencensus:opencensus-contrib-grpc-metrics:0.21.0
-- net.bytebuddy:1.9.3
The bundled Apache Beam dependencies bundle the following dependencies under the BSD license.
See bundled license files for details