You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by zj...@apache.org on 2021/01/23 05:04:24 UTC
[zeppelin] branch branch-0.9 updated: [ZEPPELIN-5202]. Upgrade
flink to 1.11.3
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch branch-0.9
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/branch-0.9 by this push:
new 3211633 [ZEPPELIN-5202]. Upgrade flink to 1.11.3
3211633 is described below
commit 3211633847baa7ad621d43752e5f38c7e8652b2c
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Sun Jan 17 10:11:08 2021 +0800
[ZEPPELIN-5202]. Upgrade flink to 1.11.3
### What is this PR for?
2 things in this PR:
* Upgrade flink to 1.11.3
* Fix the dependency issue of flink which cause the test failure (this is due to #4006)
### What type of PR is it?
[ Improvement ]
### Todos
* [ ] - Task
### What is the Jira issue?
* https://issues.apache.org/jira/browse/ZEPPELIN-5202
### How should this be tested?
* CI pass
### Screenshots (if appropriate)
### Questions:
* Does the licenses files need update? No
* Is there breaking changes for older versions? No
* Does this needs documentation? No
Author: Jeff Zhang <zj...@apache.org>
Closes #4023 from zjffdu/ZEPPELIN-5202 and squashes the following commits:
2fec4a40c [Jeff Zhang] address dependency issue
1524d058c [Jeff Zhang] [ZEPPELIN-5202]. Upgrade flink to 1.11.3
(cherry picked from commit c8fd17da11c7a16fe741dc7794f01c60986f1f5e)
Signed-off-by: Jeff Zhang <zj...@apache.org>
---
flink/interpreter/pom.xml | 10 ++++++++++
flink/pom.xml | 2 +-
.../apache/zeppelin/integration/FlinkIntegrationTest111.java | 2 +-
.../zeppelin/integration/ZeppelinFlinkClusterTest111.java | 2 +-
4 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/flink/interpreter/pom.xml b/flink/interpreter/pom.xml
index 5947947..98f6b72 100644
--- a/flink/interpreter/pom.xml
+++ b/flink/interpreter/pom.xml
@@ -85,6 +85,16 @@
<groupId>org.apache.zeppelin</groupId>
<artifactId>zeppelin-shell</artifactId>
<version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId> org.eclipse.jetty</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
diff --git a/flink/pom.xml b/flink/pom.xml
index ef115bb..8dcf666 100644
--- a/flink/pom.xml
+++ b/flink/pom.xml
@@ -44,7 +44,7 @@
<properties>
<flink1.10.version>1.10.2</flink1.10.version>
- <flink1.11.version>1.11.2</flink1.11.version>
+ <flink1.11.version>1.11.3</flink1.11.version>
<flink1.12.version>1.12.0</flink1.12.version>
</properties>
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/FlinkIntegrationTest111.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/FlinkIntegrationTest111.java
index f2193e1..a85bb5f 100644
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/FlinkIntegrationTest111.java
+++ b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/FlinkIntegrationTest111.java
@@ -29,7 +29,7 @@ public class FlinkIntegrationTest111 extends FlinkIntegrationTest {
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"1.11.2"}
+ {"1.11.3"}
});
}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinFlinkClusterTest111.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinFlinkClusterTest111.java
index c16dddd..7b1ba0f 100644
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinFlinkClusterTest111.java
+++ b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinFlinkClusterTest111.java
@@ -29,7 +29,7 @@ public class ZeppelinFlinkClusterTest111 extends ZeppelinFlinkClusterTest {
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"1.11.2"}
+ {"1.11.3"}
});
}