You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by tr...@apache.org on 2020/07/29 12:08:11 UTC

[flink] 02/02: [hotfix][k8s] Correct dependencies in Kubernetes pom and notice file

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

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

commit 47ea2341dbc93cb3eb234e91253ed33b2f0c1902
Author: wangyang0918 <da...@alibaba-inc.com>
AuthorDate: Mon Jul 27 17:48:09 2020 +0800

    [hotfix][k8s] Correct dependencies in Kubernetes pom and notice file
---
 flink-kubernetes/pom.xml                            | 5 -----
 flink-kubernetes/src/main/resources/META-INF/NOTICE | 5 ++---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/flink-kubernetes/pom.xml b/flink-kubernetes/pom.xml
index 06b0ec6..25591cf 100644
--- a/flink-kubernetes/pom.xml
+++ b/flink-kubernetes/pom.xml
@@ -131,7 +131,6 @@ under the License.
 									<include>com.squareup.okhttp3:*</include>
 									<include>com.squareup.okio:okio</include>
 									<include>org.yaml:*</include>
-									<include>com.mifmif:*</include>
 									<include>dk.brics.automaton:*</include>
 
 									<include>META-INF/services/org.apache.flink.*</include>
@@ -173,10 +172,6 @@ under the License.
 									<shadedPattern>org.apache.flink.kubernetes.shadded.org.yaml</shadedPattern>
 								</relocation>
 								<relocation>
-									<pattern>com.mifmif</pattern>
-									<shadedPattern>org.apache.flink.kubernetes.shadded.com.mifmif</shadedPattern>
-								</relocation>
-								<relocation>
 									<pattern>dk.brics.automaton</pattern>
 									<shadedPattern>org.apache.flink.kubernetes.shadded.dk.brics.automaton</shadedPattern>
 								</relocation>
diff --git a/flink-kubernetes/src/main/resources/META-INF/NOTICE b/flink-kubernetes/src/main/resources/META-INF/NOTICE
index 84f4997..4b76c62 100644
--- a/flink-kubernetes/src/main/resources/META-INF/NOTICE
+++ b/flink-kubernetes/src/main/resources/META-INF/NOTICE
@@ -11,14 +11,13 @@ This project bundles the following dependencies under the Apache Software Licens
 - com.fasterxml.jackson.core:jackson-databind:2.10.1
 - com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.10.1
 - com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.10.3
-- com.github.mifmif:generex:1.0.2
-- com.squareup.okhttp3:logging-interceptor:3.12.0
+- com.squareup.okhttp3:logging-interceptor:3.12.6
 - com.squareup.okhttp3:okhttp:3.12.1
 - com.squareup.okio:okio:1.15.0
 - io.fabric8:kubernetes-client:4.9.2
 - io.fabric8:kubernetes-model:4.9.2
 - io.fabric8:kubernetes-model-common:4.9.2
-- org.yaml:snakeyaml:1.23
+- org.yaml:snakeyaml:1.24
 
 This project bundles the following dependencies under the BSD License.
 See bundled license files for details.