You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@zeppelin.apache.org by mo...@apache.org on 2021/03/29 14:01:58 UTC
[zeppelin] branch master updated: [ZEPPELIN-5273] Support Spark
3.1.1
This is an automated email from the ASF dual-hosted git repository.
moon 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 a8f7657 [ZEPPELIN-5273] Support Spark 3.1.1
a8f7657 is described below
commit a8f7657d0f663db155b62bc75ca2fb564379c108
Author: Lee moon soo <le...@gmail.com>
AuthorDate: Mon Mar 22 09:01:09 2021 -0700
[ZEPPELIN-5273] Support Spark 3.1.1
### What is this PR for?
This PR makes Zeppelin supports Spark 3.1.1.
In my quick test, the current Spark interpreter seems to work fine with Spark 3.1.1 without modification, when the version check passes. So, this PR simply update `UNSUPPORTED_FUTURE_VERSION` to Spark `3.2.0` from `3.1.0`.
However, if anyone sees a problem with Spark 3.1.1, please comment.
### What type of PR is it?
Improvement
### What is the Jira issue?
https://issues.apache.org/jira/browse/ZEPPELIN-5273
https://issues.apache.org/jira/browse/ZEPPELIN-5278
### How should this be tested?
Configure SPARK_HOME env variable to point Spark 3.1.1 binary and run Spark APIs, such as
```
%spark
println(sc.version)
sc.parallelize(1 to 10).count
```
### Questions:
* Does the licenses files need update? no
* Is there breaking changes for older versions? no
* Does this needs documentation? no
Author: Lee moon soo <le...@gmail.com>
Closes #4077 from Leemoonsoo/ZEPPELIN-5273 and squashes the following commits:
0b82eded2 [Lee moon soo] add spark*Test31 file, update spark test version 3.0.1->3.0.2, 2.4.4->2.4.7, remove spark test versions not available on spark download page
6252d3623 [Lee moon soo] 3.0.1 -> 3.1.1
5676f0923 [Lee moon soo] update unsupported future version
---
spark/pom.xml | 2 +-
.../org/apache/zeppelin/spark/SparkVersion.java | 3 +-
spark/spark3-shims/pom.xml | 2 +-
.../integration/SparkIntegrationTest16.java | 40 ----------------------
.../integration/SparkIntegrationTest20.java | 40 ----------------------
.../integration/SparkIntegrationTest22.java | 40 ----------------------
.../integration/SparkIntegrationTest23.java | 40 ----------------------
.../integration/SparkIntegrationTest24.java | 2 +-
.../integration/SparkIntegrationTest30.java | 4 +--
...tionTest21.java => SparkIntegrationTest31.java} | 23 +++++++++++--
.../integration/ZeppelinSparkClusterTest20.java | 40 ----------------------
.../integration/ZeppelinSparkClusterTest21.java | 40 ----------------------
.../integration/ZeppelinSparkClusterTest22.java | 40 ----------------------
.../integration/ZeppelinSparkClusterTest23.java | 40 ----------------------
.../integration/ZeppelinSparkClusterTest24.java | 2 +-
.../integration/ZeppelinSparkClusterTest30.java | 4 +--
...Test16.java => ZeppelinSparkClusterTest31.java} | 8 ++---
17 files changed, 34 insertions(+), 336 deletions(-)
diff --git a/spark/pom.xml b/spark/pom.xml
index 38c2a24..ac4a2dc 100644
--- a/spark/pom.xml
+++ b/spark/pom.xml
@@ -187,7 +187,7 @@
<profile>
<id>spark-3.0</id>
<properties>
- <spark.version>3.0.1</spark.version>
+ <spark.version>3.1.1</spark.version>
<protobuf.version>2.5.0</protobuf.version>
<py4j.version>0.10.9</py4j.version>
</properties>
diff --git a/spark/spark-shims/src/main/scala/org/apache/zeppelin/spark/SparkVersion.java b/spark/spark-shims/src/main/scala/org/apache/zeppelin/spark/SparkVersion.java
index ec80740..0ad1a35 100644
--- a/spark/spark-shims/src/main/scala/org/apache/zeppelin/spark/SparkVersion.java
+++ b/spark/spark-shims/src/main/scala/org/apache/zeppelin/spark/SparkVersion.java
@@ -33,9 +33,10 @@ public class SparkVersion {
public static final SparkVersion SPARK_2_3_1 = SparkVersion.fromVersionString("2.3.1");
public static final SparkVersion SPARK_2_4_0 = SparkVersion.fromVersionString("2.4.0");
public static final SparkVersion SPARK_3_1_0 = SparkVersion.fromVersionString("3.1.0");
+ public static final SparkVersion SPARK_3_2_0 = SparkVersion.fromVersionString("3.2.0");
public static final SparkVersion MIN_SUPPORTED_VERSION = SPARK_1_6_0;
- public static final SparkVersion UNSUPPORTED_FUTURE_VERSION = SPARK_3_1_0;
+ public static final SparkVersion UNSUPPORTED_FUTURE_VERSION = SPARK_3_2_0;
private int version;
private int majorVersion;
diff --git a/spark/spark3-shims/pom.xml b/spark/spark3-shims/pom.xml
index c9a4f35..eb5f5b6 100644
--- a/spark/spark3-shims/pom.xml
+++ b/spark/spark3-shims/pom.xml
@@ -34,7 +34,7 @@
<properties>
<scala.binary.version>2.12</scala.binary.version>
- <spark.version>3.0.1</spark.version>
+ <spark.version>3.1.1</spark.version>
</properties>
<dependencies>
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest16.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest16.java
deleted file mode 100644
index 6574ed6..0000000
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest16.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.integration;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.List;
-
-@RunWith(value = Parameterized.class)
-public class SparkIntegrationTest16 extends SparkIntegrationTest{
-
- public SparkIntegrationTest16(String sparkVersion, String hadoopVersion) {
- super(sparkVersion, hadoopVersion);
- }
-
- @Parameterized.Parameters
- public static List<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {"1.6.3", "2.6"}
- });
- }
-
-}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest20.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest20.java
deleted file mode 100644
index b9c7cb0..0000000
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest20.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.integration;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.List;
-
-@RunWith(value = Parameterized.class)
-public class SparkIntegrationTest20 extends SparkIntegrationTest{
-
- public SparkIntegrationTest20(String sparkVersion, String hadoopVersion) {
- super(sparkVersion, hadoopVersion);
- }
-
- @Parameterized.Parameters
- public static List<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {"2.0.2", "2.7"}
- });
- }
-
-}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest22.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest22.java
deleted file mode 100644
index cddd2a7..0000000
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest22.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.integration;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.List;
-
-@RunWith(value = Parameterized.class)
-public class SparkIntegrationTest22 extends SparkIntegrationTest{
-
- public SparkIntegrationTest22(String sparkVersion, String hadoopVersion) {
- super(sparkVersion, hadoopVersion);
- }
-
- @Parameterized.Parameters
- public static List<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {"2.2.2", "2.7"}
- });
- }
-
-}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest23.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest23.java
deleted file mode 100644
index 834e3d8..0000000
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest23.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.integration;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.List;
-
-@RunWith(value = Parameterized.class)
-public class SparkIntegrationTest23 extends SparkIntegrationTest{
-
- public SparkIntegrationTest23(String sparkVersion, String hadoopVersion) {
- super(sparkVersion, hadoopVersion);
- }
-
- @Parameterized.Parameters
- public static List<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {"2.3.2", "2.7"}
- });
- }
-
-}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest24.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest24.java
index 6920c20..48d3185 100644
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest24.java
+++ b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest24.java
@@ -33,7 +33,7 @@ public class SparkIntegrationTest24 extends SparkIntegrationTest{
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"2.4.4", "2.7"}
+ {"2.4.7", "2.7"}
});
}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest30.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest30.java
index ed58aaf..76cd0c9 100644
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest30.java
+++ b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest30.java
@@ -34,8 +34,8 @@ public class SparkIntegrationTest30 extends SparkIntegrationTest {
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"3.0.1", "2.7"},
- {"3.0.1", "3.2"}
+ {"3.0.2", "2.7"},
+ {"3.0.2", "3.2"}
});
}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest21.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest31.java
similarity index 52%
rename from zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest21.java
rename to zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest31.java
index 5f0fdfc..26362ba 100644
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest21.java
+++ b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/SparkIntegrationTest31.java
@@ -17,6 +17,7 @@
package org.apache.zeppelin.integration;
+import org.apache.zeppelin.interpreter.InterpreterSetting;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -24,17 +25,33 @@ import java.util.Arrays;
import java.util.List;
@RunWith(value = Parameterized.class)
-public class SparkIntegrationTest21 extends SparkIntegrationTest{
+public class SparkIntegrationTest31 extends SparkIntegrationTest {
- public SparkIntegrationTest21(String sparkVersion, String hadoopVersion) {
+ public SparkIntegrationTest31(String sparkVersion, String hadoopVersion) {
super(sparkVersion, hadoopVersion);
}
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"2.1.3", "2.7"}
+ {"3.1.1", "2.7"},
+ {"3.1.1", "3.2"}
});
}
+ @Override
+ protected void setUpSparkInterpreterSetting(InterpreterSetting interpreterSetting) {
+ // spark3 doesn't support yarn-client and yarn-cluster any more, use
+ // spark.master and spark.submit.deployMode instead
+ String sparkMaster = interpreterSetting.getJavaProperties().getProperty("spark.master");
+ if (sparkMaster.equals("yarn-client")) {
+ interpreterSetting.setProperty("spark.master", "yarn");
+ interpreterSetting.setProperty("spark.submit.deployMode", "client");
+ } else if (sparkMaster.equals("yarn-cluster")){
+ interpreterSetting.setProperty("spark.master", "yarn");
+ interpreterSetting.setProperty("spark.submit.deployMode", "cluster");
+ } else if (sparkMaster.startsWith("local")) {
+ interpreterSetting.setProperty("spark.submit.deployMode", "client");
+ }
+ }
}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest20.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest20.java
deleted file mode 100644
index be2b5c6..0000000
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest20.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.integration;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.List;
-
-@RunWith(value = Parameterized.class)
-public class ZeppelinSparkClusterTest20 extends ZeppelinSparkClusterTest {
-
- public ZeppelinSparkClusterTest20(String sparkVersion, String hadoopVersion) throws Exception {
- super(sparkVersion, hadoopVersion);
- }
-
-
- @Parameterized.Parameters
- public static List<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {"2.0.2", "2.7"}
- });
- }
-}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest21.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest21.java
deleted file mode 100644
index c127312..0000000
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest21.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.integration;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.List;
-
-@RunWith(value = Parameterized.class)
-public class ZeppelinSparkClusterTest21 extends ZeppelinSparkClusterTest {
-
- public ZeppelinSparkClusterTest21(String sparkVersion, String hadoopVersion) throws Exception {
- super(sparkVersion, hadoopVersion);
- }
-
-
- @Parameterized.Parameters
- public static List<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {"2.1.3", "2.7"}
- });
- }
-}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest22.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest22.java
deleted file mode 100644
index d7a63af..0000000
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest22.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.integration;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.List;
-
-@RunWith(value = Parameterized.class)
-public class ZeppelinSparkClusterTest22 extends ZeppelinSparkClusterTest {
-
- public ZeppelinSparkClusterTest22(String sparkVersion, String hadoopVersion) throws Exception {
- super(sparkVersion, hadoopVersion);
- }
-
-
- @Parameterized.Parameters
- public static List<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {"2.2.2", "2.7"}
- });
- }
-}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest23.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest23.java
deleted file mode 100644
index 7b15af7..0000000
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest23.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.zeppelin.integration;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-import java.util.Arrays;
-import java.util.List;
-
-@RunWith(value = Parameterized.class)
-public class ZeppelinSparkClusterTest23 extends ZeppelinSparkClusterTest {
-
- public ZeppelinSparkClusterTest23(String sparkVersion, String hadoopVersion) throws Exception {
- super(sparkVersion, hadoopVersion);
- }
-
-
- @Parameterized.Parameters
- public static List<Object[]> data() {
- return Arrays.asList(new Object[][]{
- {"2.3.2", "2.7"}
- });
- }
-}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest24.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest24.java
index e1f05ff..d4ae3c7 100644
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest24.java
+++ b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest24.java
@@ -33,7 +33,7 @@ public class ZeppelinSparkClusterTest24 extends ZeppelinSparkClusterTest {
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"2.4.4", "2.7"}
+ {"2.4.7", "2.7"}
});
}
}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest30.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest30.java
index 097217a..a1131d4 100644
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest30.java
+++ b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest30.java
@@ -33,8 +33,8 @@ public class ZeppelinSparkClusterTest30 extends ZeppelinSparkClusterTest {
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"3.0.1", "2.7"},
- {"3.0.1", "3.2"}
+ {"3.0.2", "2.7"},
+ {"3.0.2", "3.2"}
});
}
}
diff --git a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest16.java b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest31.java
similarity index 87%
rename from zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest16.java
rename to zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest31.java
index 777c166..10ca4d9 100644
--- a/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest16.java
+++ b/zeppelin-interpreter-integration/src/test/java/org/apache/zeppelin/integration/ZeppelinSparkClusterTest31.java
@@ -24,17 +24,17 @@ import java.util.Arrays;
import java.util.List;
@RunWith(value = Parameterized.class)
-public class ZeppelinSparkClusterTest16 extends ZeppelinSparkClusterTest {
+public class ZeppelinSparkClusterTest31 extends ZeppelinSparkClusterTest {
- public ZeppelinSparkClusterTest16(String sparkVersion, String hadoopVersion) throws Exception {
+ public ZeppelinSparkClusterTest31(String sparkVersion, String hadoopVersion) throws Exception {
super(sparkVersion, hadoopVersion);
}
-
@Parameterized.Parameters
public static List<Object[]> data() {
return Arrays.asList(new Object[][]{
- {"1.6.3", "2.6"}
+ {"3.1.1", "2.7"},
+ {"3.1.1", "3.2"}
});
}
}