diff --git a/core/src/test/resources/TestHelloV2.jar b/core/src/test/resources/TestHelloV2_2.12.jar similarity index 100% rename from core/src/test/resources/TestHelloV2.jar rename to core/src/test/resources/TestHelloV2_2.12.jar diff --git a/core/src/test/resources/TestHelloV2_2.13.jar b/core/src/test/resources/TestHelloV2_2.13.jar new file mode 100644 index 0000000000000..6dee8fcd9c957 Binary files /dev/null and b/core/src/test/resources/TestHelloV2_2.13.jar differ diff --git a/core/src/test/resources/TestHelloV3.jar b/core/src/test/resources/TestHelloV3_2.12.jar similarity index 100% rename from core/src/test/resources/TestHelloV3.jar rename to core/src/test/resources/TestHelloV3_2.12.jar diff --git a/core/src/test/resources/TestHelloV3_2.13.jar b/core/src/test/resources/TestHelloV3_2.13.jar new file mode 100644 index 0000000000000..0c292e7d81ad7 Binary files /dev/null and b/core/src/test/resources/TestHelloV3_2.13.jar differ diff --git a/core/src/test/scala/org/apache/spark/executor/ClassLoaderIsolationSuite.scala b/core/src/test/scala/org/apache/spark/executor/ClassLoaderIsolationSuite.scala index 33c1baccd7298..72ee0e96fd014 100644 --- a/core/src/test/scala/org/apache/spark/executor/ClassLoaderIsolationSuite.scala +++ b/core/src/test/scala/org/apache/spark/executor/ClassLoaderIsolationSuite.scala @@ -17,21 +17,31 @@ package org.apache.spark.executor +import scala.util.Properties + import org.apache.spark.{JobArtifactSet, LocalSparkContext, SparkConf, SparkContext, SparkFunSuite} import org.apache.spark.util.Utils class ClassLoaderIsolationSuite extends SparkFunSuite with LocalSparkContext { + + private val scalaVersion = Properties.versionNumberString + .split("\\.") + .take(2) + .mkString(".") + val jar1 = Thread.currentThread().getContextClassLoader.getResource("TestUDTF.jar").toString // package com.example // object Hello { def test(): Int = 2 } // case class Hello(x: Int, y: Int) - val jar2 = Thread.currentThread().getContextClassLoader.getResource("TestHelloV2.jar").toString + val jar2 = Thread.currentThread().getContextClassLoader + .getResource(s"TestHelloV2_$scalaVersion.jar").toString // package com.example // object Hello { def test(): Int = 3 } // case class Hello(x: String) - val jar3 = Thread.currentThread().getContextClassLoader.getResource("TestHelloV3.jar").toString + val jar3 = Thread.currentThread().getContextClassLoader + .getResource(s"TestHelloV3_$scalaVersion.jar").toString test("Executor classloader isolation with JobArtifactSet") { sc = new SparkContext(new SparkConf().setAppName("test").setMaster("local"))