You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by hx...@apache.org on 2022/09/06 09:22:07 UTC

[flink] branch release-1.16 updated: [FLINK-29196][python] Update flink-python NOTICE

This is an automated email from the ASF dual-hosted git repository.

hxb pushed a commit to branch release-1.16
in repository https://gitbox.apache.org/repos/asf/flink.git


The following commit(s) were added to refs/heads/release-1.16 by this push:
     new e22bfd51a89 [FLINK-29196][python] Update flink-python NOTICE
e22bfd51a89 is described below

commit e22bfd51a898e9c98a0d656e6250a38aee700591
Author: huangxingbo <hx...@apache.org>
AuthorDate: Tue Sep 6 12:04:33 2022 +0800

    [FLINK-29196][python] Update flink-python NOTICE
    
    This closes #20758.
---
 flink-python/src/main/resources/META-INF/NOTICE    | 59 +++++++++-------------
 .../META-INF/licenses/LICENSE.bouncycastle         | 17 -------
 .../main/resources/META-INF/licenses/LICENSE.jzlib | 25 ---------
 3 files changed, 24 insertions(+), 77 deletions(-)

diff --git a/flink-python/src/main/resources/META-INF/NOTICE b/flink-python/src/main/resources/META-INF/NOTICE
index fc4a975568e..d8290c98a70 100644
--- a/flink-python/src/main/resources/META-INF/NOTICE
+++ b/flink-python/src/main/resources/META-INF/NOTICE
@@ -10,9 +10,10 @@ This project bundles the following dependencies under the Apache Software Licens
 - com.fasterxml.jackson.core:jackson-core:2.13.2
 - com.fasterxml.jackson.core:jackson-databind:2.13.2.2
 - com.google.flatbuffers:flatbuffers-java:1.12.0
+- io.netty:netty-buffer:4.1.70.Final
+- io.netty:netty-common:4.1.70.Final
 - joda-time:joda-time:2.5
 - org.apache.arrow:arrow-format:5.0.0
-- org.apache.arrow:arrow-memory:5.0.0
 - org.apache.arrow:arrow-memory-core:5.0.0
 - org.apache.arrow:arrow-memory-netty:5.0.0
 - org.apache.arrow:arrow-vector:5.0.0
@@ -25,7 +26,6 @@ This project bundles the following dependencies under the Apache Software Licens
 - org.apache.beam:beam-sdks-java-core:2.38.0
 - org.apache.beam:beam-sdks-java-fn-execution:2.38.0
 - org.apache.beam:beam-vendor-bytebuddy-1_11_0:0.1
-- org.apache.beam:beam-vendor-sdks-java-extensions-protobuf:2.38.0
 - org.apache.beam:beam-vendor-guava-26_0-jre:0.1
 - org.apache.beam:beam-vendor-grpc-1_43_2:0.1
 - com.alibaba:pemja:0.2.4
@@ -43,11 +43,9 @@ 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
+- com.google.api.grpc:proto-google-common-protos:2.0.1
+- com.google.code.gson:gson:2.8.9
+- com.google.guava:guava:30.1.1-jre
 - io.grpc:grpc-auth:1.43.2
 - io.grpc:grpc-core:1.43.2
 - io.grpc:grpc-context:1.43.2
@@ -55,35 +53,26 @@ The bundled Apache Beam dependencies bundle the following dependencies under the
 - io.grpc:grpc-protobuf:1.43.2
 - io.grpc:grpc-stub:1.43.2
 - io.grpc:grpc-testing:1.43.2
-- io.netty:netty-buffer:4.1.70.Final
-- io.netty:netty-codec:4.1.70.Final
-- io.netty:netty-codec-http:4.1.70.Final
-- io.netty:netty-codec-http2:4.1.70.Final
-- io.netty:netty-codec-socks:4.1.70.Final
-- io.netty:netty-common:4.1.70.Final
-- io.netty:netty-handler:4.1.70.Final
-- io.netty:netty-handler-proxy:4.1.70.Final
-- io.netty:netty-resolver:4.1.70.Final
-- io.netty:netty-transport:4.1.70.Final
-- io.netty:netty-transport-native-epoll:4.1.70.Final
-- io.netty:netty-transport-native-unix-common:4.1.70.Final
-- io.netty:netty-tcnative-boringssl-static:2.0.44.Final
-- io.opencensus:opencensus-api:0.24.0
-- io.opencensus:opencensus-contrib-grpc-metrics:0.24.0
-- io.perfmark:perfmark-api:0.19.0
-- net.jpountz.lz4:lz4:1.3.0
+- io.netty:netty-buffer:4.1.63.Final
+- io.netty:netty-codec:4.1.63.Final
+- io.netty:netty-codec-http:4.1.63.Final
+- io.netty:netty-codec-http2:4.1.63.Final
+- io.netty:netty-codec-socks:4.1.63.Final
+- io.netty:netty-common:4.1.63.Final
+- io.netty:netty-handler:4.1.63.Final
+- io.netty:netty-handler-proxy:4.1.63.Final
+- io.netty:netty-resolver:4.1.63.Final
+- io.netty:netty-transport:4.1.63.Final
+- io.netty:netty-transport-native-epoll:4.1.63.Final:linux-x86_64
+- io.netty:netty-transport-native-unix-common:4.1.63.Final
+- io.netty:netty-tcnative-boringssl-static:2.0.38.Final
+- io.opencensus:opencensus-api:0.28.0
+- io.opencensus:opencensus-contrib-grpc-metrics:0.28.0
+- io.perfmark:perfmark-api:0.23.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
+- com.google.auth:google-auth-library-credentials:0.22.2
+- com.google.protobuf:protobuf-java:3.19.2
+- com.google.protobuf:protobuf-java-util:3.19.2
diff --git a/flink-python/src/main/resources/META-INF/licenses/LICENSE.bouncycastle b/flink-python/src/main/resources/META-INF/licenses/LICENSE.bouncycastle
deleted file mode 100644
index d97c9f16d47..00000000000
--- a/flink-python/src/main/resources/META-INF/licenses/LICENSE.bouncycastle
+++ /dev/null
@@ -1,17 +0,0 @@
-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.
diff --git a/flink-python/src/main/resources/META-INF/licenses/LICENSE.jzlib b/flink-python/src/main/resources/META-INF/licenses/LICENSE.jzlib
deleted file mode 100644
index cd3f90f5bf7..00000000000
--- a/flink-python/src/main/resources/META-INF/licenses/LICENSE.jzlib
+++ /dev/null
@@ -1,25 +0,0 @@
-Copyright (c) 2000-2011 ymnk, JCraft,Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  1. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  2. 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.
-
-  3. The names of the authors may not be used to endorse or promote products
-     derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 JCRAFT,
-INC. OR ANY CONTRIBUTORS TO THIS SOFTWARE 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.