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 2022/04/03 06:01:52 UTC
[zeppelin] branch master updated: [HOTFIX] Fix Flink UT fails
This is an automated email from the ASF dual-hosted git repository.
zjffdu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/zeppelin.git
The following commit(s) were added to refs/heads/master by this push:
new 50f42b8 [HOTFIX] Fix Flink UT fails
50f42b8 is described below
commit 50f42b86cde8dc28ef5ecb5375304a4fad38a4a1
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Thu Mar 31 15:54:08 2022 +0800
[HOTFIX] Fix Flink UT fails
---
elasticsearch/pom.xml | 8 ++++++++
.../src/main/java/org/apache/zeppelin/spark/SparkShims.java | 4 ++--
zeppelin-interpreter-parent/pom.xml | 2 +-
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/elasticsearch/pom.xml b/elasticsearch/pom.xml
index d4392ac..e56843b 100644
--- a/elasticsearch/pom.xml
+++ b/elasticsearch/pom.xml
@@ -38,6 +38,8 @@
<guava.version>18.0</guava.version>
<json-flattener.version>0.1.6</json-flattener.version>
<unirest.version>1.4.9</unirest.version>
+ <!--test library versions-->
+ <hamcrest.all.version>1.3</hamcrest.all.version>
</properties>
<dependencies>
@@ -81,6 +83,12 @@
<version>${unirest.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>${hamcrest.all.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<build>
diff --git a/spark/spark-shims/src/main/java/org/apache/zeppelin/spark/SparkShims.java b/spark/spark-shims/src/main/java/org/apache/zeppelin/spark/SparkShims.java
index 3fff0f0..709f484 100644
--- a/spark/spark-shims/src/main/java/org/apache/zeppelin/spark/SparkShims.java
+++ b/spark/spark-shims/src/main/java/org/apache/zeppelin/spark/SparkShims.java
@@ -17,7 +17,8 @@
package org.apache.zeppelin.spark;
-import com.google.common.annotations.VisibleForTesting;
+
+import org.apache.zeppelin.shaded.com.google.common.annotations.VisibleForTesting;
import org.apache.hadoop.util.VersionInfo;
import org.apache.hadoop.util.VersionUtil;
import org.apache.zeppelin.interpreter.InterpreterContext;
@@ -162,7 +163,6 @@ public abstract class SparkShims {
|| (VersionUtil.compareVersions(HADOOP_VERSION_3_0_0, version) <= 0);
}
- @VisibleForTesting
public static void reset() {
sparkShims = null;
}
diff --git a/zeppelin-interpreter-parent/pom.xml b/zeppelin-interpreter-parent/pom.xml
index da1e438..82986d5 100644
--- a/zeppelin-interpreter-parent/pom.xml
+++ b/zeppelin-interpreter-parent/pom.xml
@@ -50,7 +50,7 @@
</exclusion>
<exclusion>
<groupId>io.atomix</groupId>
- <artifactId>atomix</artifactId>
+ <artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>