bug fix

Author: scwf

bin/compute-classpath.cmd

@@ -72,8 +72,8 @@ for %%d in ("%datanucleus_dir%\datanucleus-*.jar") do (
 )
 set CLASSPATH=%CLASSPATH%;%datanucleus_jars%
 
-rem Exclude hive-beeline*.jar from uber jar, since beeline need the Implementation-Version
-rem from MANIFEST.MF.
+rem SPARK-4261: make right version info for beeline, copy hive-beeline*.jar to "lib_managed/jars/".
+rem Here add beeline jar to classpath.
 for %%d in ("%datanucleus_dir%\hive-beeline*.jar") do (
   set hivebeeline_jar=!hivebeeline_jar!;%%d
 )

bin/compute-classpath.sh

@@ -113,9 +113,9 @@ fi
 datanucleus_jars="$(find "$datanucleus_dir" 2>/dev/null | grep "datanucleus-.*\\.jar")"
 datanucleus_jars="$(echo "$datanucleus_jars" | tr "\n" : | sed s/:$//g)"
 
-# Exclude hive-beeline*.jar from uber jar, since beeline need the Implementation-Version
-# from MANIFEST.MF.
-hivebeeline_jar="$(find "$datanucleus_dir" 2>/dev/null | grep "hive-beeline*\\.jar")"
+# SPARK-4261: make right version info for beeline, copy hive-beeline*.jar to "lib_managed/jars/".
+# Here add beeline jar to classpath.
+hivebeeline_jar="$(find "$datanucleus_dir" 2>/dev/null | grep "hive-beeline-.*\\.jar")"
 
 if [ -n "$datanucleus_jars" ]; then
   hive_files=$("$JAR_CMD" -tf "$ASSEMBLY_JAR" org/apache/hadoop/hive/ql/exec 2>/dev/null)

sql/hive-thriftserver/pom.xml

@@ -95,7 +95,7 @@
           <skip>true</skip>
         </configuration>
       </plugin>
-      <!-- Deploy datanucleus jars to the spark/lib_managed/jars directory -->
+      <!-- Deploy hive-beeline jar to the spark/lib_managed/jars directory -->
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
@@ -108,13 +108,13 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <!-- basedir is spark/sql/hive/ -->
+              <!-- basedir is spark/sql/hive-thriftserver/ -->
               <outputDirectory>${basedir}/../../lib_managed/jars</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>false</overWriteSnapshots>
               <overWriteIfNewer>true</overWriteIfNewer>
               <includeGroupIds>org.spark-project.hive</includeGroupIds>
-              <includeClassifiers>hive-beeline</includeClassifiers>
+              <includeArtifactIds>hive-beeline</includeArtifactIds>
             </configuration>
           </execution>
         </executions>