diff --git a/build/kyuubi-build-info b/build/kyuubi-build-info index 3917c701c..87c39e0ba 100755 --- a/build/kyuubi-build-info +++ b/build/kyuubi-build-info @@ -22,14 +22,18 @@ mkdir -p "$EXTRA_RESOURCE_DIR" BUILD_INFO="$EXTRA_RESOURCE_DIR"/kyuubi-version-info.properties echo_build_properties() { - echo kyuubi_version=$1 - echo spark_version=$2 + echo kyuubi_version="$2" + echo java_version="$3" + echo scala_version="$4" + echo spark_version="$5" + echo hive_version="$6" + echo hadoop_version="$7" echo user="$USER" - echo jar=kyuubi-server-$1.jar + echo jar=kyuubi-server-$2.jar echo revision=$(git rev-parse HEAD) echo branch=$(git rev-parse --abbrev-ref HEAD) echo date=$(date -u +%Y-%m-%dT%H:%M:%SZ) echo url=$(git config --get remote.origin.url) } -echo_build_properties $2 $3 > "$BUILD_INFO" +echo_build_properties "$@" > "$BUILD_INFO" diff --git a/kyuubi-common/pom.xml b/kyuubi-common/pom.xml index 9140f6f8f..54a3390c7 100644 --- a/kyuubi-common/pom.xml +++ b/kyuubi-common/pom.xml @@ -92,7 +92,11 @@ + + + + @@ -109,7 +113,11 @@ + + + + diff --git a/kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala b/kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala index d6b21ecbf..585b11ebf 100644 --- a/kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala +++ b/kyuubi-common/src/main/scala/org/apache/kyuubi/package.scala @@ -38,7 +38,11 @@ package object kyuubi { } val version: String = props.getProperty("kyuubi_version", unknown) + val java_version: String = props.getProperty("java_version", unknown) + val scala_version: String = props.getProperty("scala_version", unknown) val sparkVersion: String = props.getProperty("spark_version", unknown) + val hive_version: String = props.getProperty("hive_version", unknown) + val hadoop_version: String = props.getProperty("hadoop_version", unknown) val branch: String = props.getProperty("branch", unknown) val revision: String = props.getProperty("revision", unknown) val user: String = props.getProperty("user", unknown) @@ -47,7 +51,11 @@ package object kyuubi { } val KYUUBI_VERSION: String = BuildInfo.version + val JAVA_COMPILE_VERSION: String = BuildInfo.java_version + val SCALA_COMPILE_VERSION: String = BuildInfo.scala_version val SPARK_COMPILE_VERSION: String = BuildInfo.sparkVersion + val HIVE_COMPILE_VERSION: String = BuildInfo.hive_version + val HADOOP_COMPILE_VERSION: String = BuildInfo.hadoop_version val BRANCH: String = BuildInfo.branch val REVISION: String = BuildInfo.revision val BUILD_USER: String = BuildInfo.user diff --git a/kyuubi-common/src/test/scala/org/apache/kyuubi/UtilsSuite.scala b/kyuubi-common/src/test/scala/org/apache/kyuubi/UtilsSuite.scala index 08edf8113..5a6bc98f5 100644 --- a/kyuubi-common/src/test/scala/org/apache/kyuubi/UtilsSuite.scala +++ b/kyuubi-common/src/test/scala/org/apache/kyuubi/UtilsSuite.scala @@ -30,11 +30,16 @@ class UtilsSuite extends KyuubiFunSuite { props.load(str) str.close() assert(props.getProperty("kyuubi_version") === KYUUBI_VERSION) + assert(props.getProperty("java_version") === JAVA_COMPILE_VERSION) + assert(props.getProperty("scala_version") === SCALA_COMPILE_VERSION) assert(props.getProperty("spark_version") === SPARK_COMPILE_VERSION) + assert(props.getProperty("hive_version") === HIVE_COMPILE_VERSION) + assert(props.getProperty("hadoop_version") === HADOOP_COMPILE_VERSION) assert(props.getProperty("branch") === BRANCH) assert(props.getProperty("revision") === REVISION) assert(props.getProperty("user") === BUILD_USER) assert(props.getProperty("url") === REPO_URL) + assert(props.getProperty("date") === BUILD_DATE) } test("string to seq") { diff --git a/kyuubi-main/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala b/kyuubi-main/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala index 9c65fed62..bb193e969 100644 --- a/kyuubi-main/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala +++ b/kyuubi-main/src/main/scala/org/apache/kyuubi/engine/spark/SparkProcessBuilder.scala @@ -23,6 +23,7 @@ import java.util.UUID import scala.collection.mutable.ArrayBuffer import org.apache.kyuubi.Logging +import org.apache.kyuubi.SPARK_COMPILE_VERSION import org.apache.kyuubi.engine.ProcessBuilderLike class SparkProcessBuilder( @@ -37,7 +38,7 @@ class SparkProcessBuilder( var sparkHome = conf.getOrElse("SPARK_HOME", System.getenv("SPARK_HOME")) if (sparkHome == null) { - sparkHome = "./externals/kyuubi-download/target/spark-3.0.0-bin-hadoop2.7" + sparkHome = s"./externals/kyuubi-download/target/spark-$SPARK_COMPILE_VERSION-bin-hadoop2.7" } val exec = Seq(sparkHome, "bin", "spark-submit").mkString(File.separator) diff --git a/kyuubi-server/pom.xml b/kyuubi-server/pom.xml index 27535388d..ac61ff3de 100644 --- a/kyuubi-server/pom.xml +++ b/kyuubi-server/pom.xml @@ -234,7 +234,11 @@ + + + + @@ -251,7 +255,11 @@ + + + +