Bump spark version to avoid vulnerabilities (pingcap#2544)

wanfangdata · Sep 22, 2022 · 3f09979 · 3f09979
1 parent 244267f
commit 3f09979
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -70,9 +70,13 @@
         <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>3.0.3</spark.version.compile>
-        <spark.version.test>3.0.3</spark.version.test>
+        <spark.version.compile>${spark3_0.version}</spark.version.compile>
+        <spark.version.test>${spark3_0.version}</spark.version.test>
         <spark.version.release>3.0</spark.version.release>
+        <spark3_0.version>3.0.3</spark3_0.version>
+        <spark3_1.version>3.1.3</spark3_1.version>
+        <spark3_2.version>3.2.2</spark3_2.version>
+        <spark3_3.version>3.3.0</spark3_3.version>
         <scala.binary.version>2.12</scala.binary.version>
         <scala.version>2.12.10</scala.version>
         <scala.version.release>2.12</scala.version.release>
@@ -181,8 +185,8 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
-                <spark.version.compile>3.1.3</spark.version.compile>
-                <spark.version.test>3.1.3</spark.version.test>
+                <spark.version.compile>${spark3_1.version}</spark.version.compile>
+                <spark.version.test>${spark3_1.version}</spark.version.test>
                 <spark.version.release>3.1</spark.version.release>
             </properties>
         </profile>
@@ -192,8 +196,8 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
-                <spark.version.compile>3.2.2</spark.version.compile>
-                <spark.version.test>3.2.2</spark.version.test>
+                <spark.version.compile>${spark3_2.version}</spark.version.compile>
+                <spark.version.test>${spark3_2.version}</spark.version.test>
                 <spark.version.release>3.2</spark.version.release>
             </properties>
         </profile>
@@ -203,8 +207,8 @@
                 <activeByDefault>false</activeByDefault>
             </activation>
             <properties>
-                <spark.version.compile>3.3.0</spark.version.compile>
-                <spark.version.test>3.3.0</spark.version.test>
+                <spark.version.compile>${spark3_3.version}</spark.version.compile>
+                <spark.version.test>${spark3_3.version}</spark.version.test>
                 <spark.version.release>3.3</spark.version.release>
             </properties>
         </profile>

diff --git a/spark-wrapper/spark-3.0/pom.xml b/spark-wrapper/spark-3.0/pom.xml
@@ -15,7 +15,7 @@
     <url>http://github.copm/pingcap/tispark</url>
 
     <properties>
-        <spark.version.wrapper>3.0.2</spark.version.wrapper>
+        <spark.version.wrapper>${spark3_0.version}</spark.version.wrapper>
     </properties>
 
     <dependencies>

diff --git a/spark-wrapper/spark-3.1/pom.xml b/spark-wrapper/spark-3.1/pom.xml
@@ -15,7 +15,7 @@
     <url>http://github.copm/pingcap/tispark</url>
 
     <properties>
-        <spark.version.wrapper>3.1.1</spark.version.wrapper>
+        <spark.version.wrapper>${spark3_1.version}</spark.version.wrapper>
     </properties>
 
     <dependencies>

diff --git a/spark-wrapper/spark-3.2/pom.xml b/spark-wrapper/spark-3.2/pom.xml
@@ -15,7 +15,7 @@
     <url>http://github.copm/pingcap/tispark</url>
 
     <properties>
-        <spark.version.wrapper>3.2.1</spark.version.wrapper>
+        <spark.version.wrapper>${spark3_2.version}</spark.version.wrapper>
     </properties>
 
     <dependencies>

diff --git a/spark-wrapper/spark-3.3/pom.xml b/spark-wrapper/spark-3.3/pom.xml
@@ -15,7 +15,7 @@
   <url>http://github.copm/pingcap/tispark</url>
 
   <properties>
-    <spark.version.wrapper>3.3.0</spark.version.wrapper>
+    <spark.version.wrapper>${spark3_3.version}</spark.version.wrapper>
   </properties>
 
   <dependencies>