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

Author: imback82

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

@@ -150,7 +150,8 @@ private void BuildSparkCmd(out string filename, out string args)
             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 @@ private void BuildSparkCmd(out string filename, out string args)
         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.x/pom.xml renamed to 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>