Update spark to 2.3.4 and 2.4.4 (pingcap#1115)

zhaohehuhu · Sep 23, 2019 · c6bd464 · c6bd464
1 parent fc2acb4
commit c6bd464
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/docs/userguide.md b/docs/userguide.md
@@ -92,7 +92,7 @@ Download [Apache Spark](https://spark.apache.org/downloads.html).
 
 + For the Standalone mode without Hadoop support, use Spark **2.3.x/2.4.x** and any version of pre-build with Apache Hadoop 2.x with Hadoop dependencies.
 
-+ If you need to use the Hadoop cluster, choose the corresponding Hadoop version. You can also build Spark from the [Spark 2.3 source code](https://spark.apache.org/docs/2.3.3/building-spark.html) or [Spark 2.4 source code](https://spark.apache.org/docs/2.4.1/building-spark.html) to match the previous version of the official Hadoop 2.6.
++ If you need to use the Hadoop cluster, choose the corresponding Hadoop version. You can also build Spark from the [Spark 2.3 source code](https://spark.apache.org/docs/2.3.4/building-spark.html) or [Spark 2.4 source code](https://spark.apache.org/docs/2.4.4/building-spark.html) to match the previous version of the official Hadoop 2.6.
 
 > **Note:**
 >

diff --git a/pom.xml b/pom.xml
@@ -64,8 +64,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <protobuf.version>3.1.0</protobuf.version>
-        <spark.version.compile>2.3.3</spark.version.compile>
-        <spark.version.test>2.4.3</spark.version.test>
+        <spark.version.compile>2.3.4</spark.version.compile>
+        <spark.version.test>2.4.4</spark.version.test>
         <scala.binary.version>2.11</scala.binary.version>
         <scala.version>2.11.12</scala.version>
         <scalatest.version>3.0.4</scalatest.version>

diff --git a/spark-wrapper/spark-2.3/pom.xml b/spark-wrapper/spark-2.3/pom.xml
@@ -14,6 +14,10 @@
     <name>TiSpark Project Spark Wrapper Spark-2.3</name>
     <url>http://github.copm/pingcap/tispark</url>
 
+    <properties>
+        <spark.version.wrapper>2.3.4</spark.version.wrapper>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.pingcap.tispark</groupId>
@@ -23,17 +27,17 @@
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-core_${scala.binary.version}</artifactId>
-            <version>2.3.3</version>
+            <version>${spark.version.wrapper}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
-            <version>2.3.3</version>
+            <version>${spark.version.wrapper}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-sql_${scala.binary.version}</artifactId>
-            <version>2.3.3</version>
+            <version>${spark.version.wrapper}</version>
         </dependency>
     </dependencies>
 

diff --git a/spark-wrapper/spark-2.4/pom.xml b/spark-wrapper/spark-2.4/pom.xml
@@ -14,6 +14,10 @@
     <name>TiSpark Project Spark Wrapper Spark-2.4</name>
     <url>http://github.copm/pingcap/tispark</url>
 
+    <properties>
+        <spark.version.wrapper>2.4.4</spark.version.wrapper>
+    </properties>
+
     <dependencies>
         <dependency>
             <groupId>com.pingcap.tispark</groupId>
@@ -23,17 +27,17 @@
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-core_${scala.binary.version}</artifactId>
-            <version>2.4.3</version>
+            <version>${spark.version.wrapper}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-catalyst_${scala.binary.version}</artifactId>
-            <version>2.4.3</version>
+            <version>${spark.version.wrapper}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.spark</groupId>
             <artifactId>spark-sql_${scala.binary.version}</artifactId>
-            <version>2.4.3</version>
+            <version>${spark.version.wrapper}</version>
         </dependency>
     </dependencies>