This is an automated email from the ASF dual-hosted git repository.
dianfu pushed a commit to branch release-1.12
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.12 by this push:
new 58ccb94 [FLINK-20442][python][legal] Updated flink-python NOTICE
58ccb94 is described below
commit 58ccb941803107afd08f72762072c7467b7bbd01
Author: Dian Fu <[email protected]>
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 | 23 +++++++++++++++-
flink-python/src/main/resources/META-INF/NOTICE | 14 ++++++++--
.../META-INF/licenses/LICENSE.bouncycastle | 17 ++++++++++++
5 files changed, 51 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 c0d6591..8125aad 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_10_8</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
@@ -332,13 +338,28 @@ 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>META-INF/maven/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>org.apache.beam:beam-vendor-grpc-1_26_0</artifact>
+
<excludes>
+
<exclude>org/apache/beam/vendor/grpc/v1p26p0/org/jboss/**</exclude>
+
<exclude>org/apache/beam/vendor/grpc/v1p26p0/org/eclipse/jetty/**</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 1409c57..be8b832 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.23.0
- org.apache.beam:beam-sdks-java-core:2.23.0
- org.apache.beam:beam-sdks-java-fn-execution:2.23.0
-- org.apache.beam:beam-vendor-bytebuddy-1_10_8:0.1
- org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.23.0
- org.apache.beam:beam-vendor-guava-26_0-jre:0.1
- org.apache.beam:beam-vendor-grpc-1_26_0:0.3
@@ -42,9 +41,11 @@ See bundled license files for details.
The bundled Apache Beam dependencies bundle the following dependencies under
the Apache Software License 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
+- com.github.jponge:lzma-java:1.3
- com.google.api.grpc:proto-google-common-protos:1.12.0
- com.google.code.gson:gson:2.8.6
- com.google.guava:guava:26.0-jre
+- com.ning:compress-lzf:1.0.3
- io.grpc:grpc-auth:1.26.0
- io.grpc:grpc-core:1.26.0
- io.grpc:grpc-context:1.26.0
@@ -67,11 +68,20 @@ The bundled Apache Beam dependencies bundle the following
dependencies under the
- io.netty:netty-tcnative-boringssl-static:2.0.26.Final
- io.opencensus:opencensus-api:0.24.0
- io.opencensus:opencensus-contrib-grpc-metrics:0.24.0
-- net.bytebuddy:1.10.8
+- io.perfmark:perfmark-api:0.19.0
+- net.jpountz.lz4:lz4:1.3.0
The bundled Apache Beam dependencies bundle the following dependencies under
the BSD license.
See bundled license files for details
- com.google.auth:google-auth-library-credentials:0.18.0
+- com.google.protobuf.nano:protobuf-javanano:3.0.0-alpha-5
- com.google.protobuf:protobuf-java:3.11.0
- com.google.protobuf:protobuf-java-util:3.11.0
+- com.jcraft:jzlib:1.1.3
+
+The bundled Apache Beam dependencies bundle the following dependencies under
the Bouncy Castle license.
+See bundled license files for details
+
+- org.bouncycastle:bcpkix-jdk15on:1.54
+- org.bouncycastle:bcprov-jdk15on:1.54
diff --git
a/flink-python/src/main/resources/META-INF/licenses/LICENSE.bouncycastle
b/flink-python/src/main/resources/META-INF/licenses/LICENSE.bouncycastle
new file mode 100644
index 0000000..d97c9f1
--- /dev/null
+++ b/flink-python/src/main/resources/META-INF/licenses/LICENSE.bouncycastle
@@ -0,0 +1,17 @@
+Copyright (c) 2000-2015 The Legion of the Bouncy Castle Inc.
(http://www.bouncycastle.org)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
of this software
+and associated documentation files (the "Software"), to deal in the Software
without restriction,
+including without limitation the rights to use, copy, modify, merge, publish,
distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the Software
is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
copies or substantial
+portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
OR OTHER
+DEALINGS IN THE SOFTWARE.
