From 9b6ec58e2aaf9b60bb23837fee99a2eb367802fa Mon Sep 17 00:00:00 2001
From: Cheng Pan <chengpan@apache.org>
Date: Wed, 17 Aug 2022 22:27:43 +0800
Subject: [PATCH] Add profile for Spark 3.2/3.3 (#380)

---
 .github/workflows/maven.yml |  2 ++
 README.md                   | 12 +++++-----
 dev/check-spark-3.2.sh      |  5 ++++
 dev/check-spark-3.3.sh      |  5 ++++
 pom.xml                     | 48 +++++++++++++++++++++++++++++++++++++
 5 files changed, 66 insertions(+), 6 deletions(-)
 create mode 100755 dev/check-spark-3.2.sh
 create mode 100755 dev/check-spark-3.3.sh

diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 7cec307f6..d948f44a1 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -21,6 +21,8 @@ jobs:
           - '2.4'
           - '3.0'
           - '3.1'
+          - '3.2'
+          - '3.3'
     steps:
     - uses: actions/checkout@v2
     - name: Setup JDK ${{ matrix.java }}
diff --git a/README.md b/README.md
index 59bfa0f64..b6b6eec1e 100644
--- a/README.md
+++ b/README.md
@@ -44,12 +44,12 @@ RSS Worker's slot count is decided by `rss.worker.numSlots` or`rss.worker.flush.
 RSS worker's slot count decreases when a partition is allocated and increments when a partition is freed.
 
 ## Build
-RSS supports Spark 2.4/3.0/3.1 and only tested under Java 8.
+RSS supports Spark 2.4/3.0/3.1/3.2/3.3 and only tested under Java 8.
 
 Build for Spark
-`
-./dev/make-distribution.sh -Pspark-2.4/-Pspark-3.0/-Pspark-3.1 -Plog4j-1/-Plog4j-2
-`
+```
+./dev/make-distribution.sh -Pspark-2.4/-Pspark-3.0/-Pspark-3.1/-Pspark-3.2/Spark-3.3 -Plog4j-1/-Plog4j-2
+```
 
 package rss-${project.version}-bin-release.tgz will be generated.
 
@@ -67,9 +67,9 @@ Build procedure will create a compressed package.
 
 ### Compatibility
 RSS server is compatible with all supported Spark versions.
-You can run different Spark versions with the same RSS server. It doesn't matter whether RSS server is compiled with -Pspark-2.4/3.0/3.1.
+You can run different Spark versions with the same RSS server. It doesn't matter whether RSS server is compiled with -Pspark-2.4/3.0/3.1/3.2/3.3.
 However, RSS client must be consistent with the version of the Spark.
-For example, if you are running Spark 2.4, you must compile RSS client with -Pspark-2.4; if you are running Spark 3.0, you must compile RSS client with -Pspark-3.0.
+For example, if you are running Spark 2.4, you must compile RSS client with -Pspark-2.4; if you are running Spark 3.2, you must compile RSS client with -Pspark-3.2.
 
 ## Usage
 RSS supports HA mode deployment.
diff --git a/dev/check-spark-3.2.sh b/dev/check-spark-3.2.sh
new file mode 100755
index 000000000..2d066aaa9
--- /dev/null
+++ b/dev/check-spark-3.2.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+RSS_HOME="$(cd "`dirname "$0"`/.."; pwd)"
+
+$RSS_HOME/dev/check.sh -Pspark-3.2 -Plog4j-1
diff --git a/dev/check-spark-3.3.sh b/dev/check-spark-3.3.sh
new file mode 100755
index 000000000..a1ff896c3
--- /dev/null
+++ b/dev/check-spark-3.3.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+RSS_HOME="$(cd "`dirname "$0"`/.."; pwd)"
+
+$RSS_HOME/dev/check.sh -Pspark-3.3 -Plog4j-2
diff --git a/pom.xml b/pom.xml
index 54cb93808..8eaa7c27f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -630,6 +630,54 @@
       </dependencies>
     </profile>
 
+    <profile>
+      <id>spark-3.2</id>
+      <properties>
+        <jackson.version>2.12.3</jackson.version>
+        <jackson.databind.version>2.12.3</jackson.databind.version>
+        <scala.version>2.12.15</scala.version>
+        <scala.binary.version>2.12</scala.binary.version>
+        <spark.version>3.2.2</spark.version>
+        <rss.shuffle.manager>shuffle-manager-3</rss.shuffle.manager>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+          <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+          <version>${jackson.databind.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
+    <profile>
+      <id>spark-3.3</id>
+      <properties>
+        <jackson.version>2.13.3</jackson.version>
+        <jackson.databind.version>2.13.3</jackson.databind.version>
+        <scala.version>2.12.15</scala.version>
+        <scala.binary.version>2.12</scala.binary.version>
+        <spark.version>3.3.0</spark.version>
+        <rss.shuffle.manager>shuffle-manager-3</rss.shuffle.manager>
+      </properties>
+      <dependencies>
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+          <version>${jackson.version}</version>
+        </dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+          <version>${jackson.databind.version}</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
     <profile>
       <id>log4j-1</id>
       <dependencies>