Update microsoft-spark JARs to include Scala version (#728)

src/csharp/Microsoft.Spark.E2ETest/SparkFixture.cs

@@ -150,7 +150,8 @@ namespace Microsoft.Spark.E2ETest
             string scalaDir = Path.Combine(curDir, "..", "..", "..", "..", "..", "src", "scala");
             string jarDir = Path.Combine(scalaDir, jarPrefix, "target");
             string assemblyVersion = Assembly.GetExecutingAssembly().GetName().Version.ToString(3);
-            string jar = Path.Combine(jarDir, $"{jarPrefix}-{assemblyVersion}.jar");
+            string scalaVersion = (SparkSettings.Version.Major == 3) ? "2.12" : "2.11";
+            string jar = Path.Combine(jarDir, $"{jarPrefix}_{scalaVersion}-{assemblyVersion}.jar");
 
             if (!File.Exists(jar))
             {
@@ -180,7 +181,7 @@ namespace Microsoft.Spark.E2ETest
         private string GetJarPrefix()
         {
             Version sparkVersion = SparkSettings.Version;
-            return $"microsoft-spark-{sparkVersion.Major}.{sparkVersion.Minor}.x";
+            return $"microsoft-spark-{sparkVersion.Major}-{sparkVersion.Minor}";
         }
     }
 

src/scala/microsoft-spark-2-3/pom.xml

@@ -6,7 +6,7 @@
     <artifactId>microsoft-spark</artifactId>
     <version>${microsoft-spark.version}</version>
   </parent>
-  <artifactId>microsoft-spark-2.3.x</artifactId>
+  <artifactId>microsoft-spark-2-3_2.11</artifactId>
   <inceptionYear>2019</inceptionYear>
   <properties>
     <encoding>UTF-8</encoding>

src/scala/microsoft-spark-2-4/pom.xml

@@ -6,7 +6,7 @@
     <artifactId>microsoft-spark</artifactId>
     <version>${microsoft-spark.version}</version>
   </parent>
-  <artifactId>microsoft-spark-2.4.x</artifactId>
+  <artifactId>microsoft-spark-2-4_2.11</artifactId>
   <inceptionYear>2019</inceptionYear>
   <properties>
     <encoding>UTF-8</encoding>

src/scala/microsoft-spark-3-0/pom.xml

@@ -6,7 +6,7 @@
     <artifactId>microsoft-spark</artifactId>
     <version>${microsoft-spark.version}</version>
   </parent>
-  <artifactId>microsoft-spark-3.0.x</artifactId>
+  <artifactId>microsoft-spark-3-0_2.12</artifactId>
   <inceptionYear>2019</inceptionYear>
   <properties>
     <encoding>UTF-8</encoding>

src/scala/pom.xml

@@ -11,9 +11,9 @@
   </properties>
 
   <modules>
-    <module>microsoft-spark-2.3.x</module>
-    <module>microsoft-spark-2.4.x</module>
-    <module>microsoft-spark-3.0.x</module>
+    <module>microsoft-spark-2-3</module>
+    <module>microsoft-spark-2-4</module>
+    <module>microsoft-spark-3-0</module>
   </modules>
 
   <pluginRepositories>