diff --git a/pom.xml b/pom.xml
index b95f72f8a5c69..1b719883eefd0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2974,7 +2974,7 @@
               <arg>-deprecation</arg>
               <arg>-feature</arg>
               <arg>-explaintypes</arg>
-              <arg>-target:17</arg>
+              <arg>-release:17</arg>
               <arg>-Wconf:cat=deprecation:wv,any:e</arg>
               <arg>-Wunused:imports</arg>
               <arg>-Wconf:cat=scaladoc:wv</arg>
@@ -3016,7 +3016,7 @@
             <javacArgs>
               <javacArg>-source</javacArg>
               <javacArg>${java.version}</javacArg>
-              <javacArg>-target</javacArg>
+              <javacArg>-release</javacArg>
               <javacArg>${java.version}</javacArg>
               <javacArg>-Xlint:all,-serial,-path,-try</javacArg>
             </javacArgs>
diff --git a/project/SparkBuild.scala b/project/SparkBuild.scala
index bcfac15ffdde6..c733b86d92b63 100644
--- a/project/SparkBuild.scala
+++ b/project/SparkBuild.scala
@@ -326,7 +326,7 @@ object SparkBuild extends PomBuild {
     ),
 
     (Compile / scalacOptions) ++= Seq(
-      s"-target:${javaVersion.value}",
+      s"-release:${javaVersion.value}",
       "-sourcepath", (ThisBuild / baseDirectory).value.getAbsolutePath  // Required for relative source links in scaladoc
     ),