Skip to content

[SPARK-56488][BUILD][3.5] Bump Scala 2.13 to 2.13.9 on branch-3.5 #55394

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
devin-petersohn wants to merge 1 commit into
base: branch-3.5
Choose a base branch
from
Open

[SPARK-56488][BUILD][3.5] Bump Scala 2.13 to 2.13.9 on branch-3.5 #55394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3678,8 +3678,16 @@
<profile>
<id>scala-2.13</id>
<properties>
<scala.version>2.13.8</scala.version>
<scala.version>2.13.9</scala.version>
<scala.binary.version>2.13</scala.binary.version>
<!--
SPARK-56488: Clear maven.compiler.target to prevent scala-maven-plugin
from auto-converting it into scalac -release 8. With Scala >= 2.13.9,
the plugin maps target to -release, but -release 8 uses ct.sym which hides
sun.* packages needed by Spark at compile time.
-->
<maven.compiler.source />
<maven.compiler.target />
</properties>
<build>
<pluginManagement>
Expand All @@ -3693,7 +3701,6 @@
<arg>-deprecation</arg>
<arg>-feature</arg>
<arg>-explaintypes</arg>
<arg>-target:jvm-1.8</arg>
<arg>-Wconf:cat=deprecation:wv,any:e</arg>
<arg>-Wunused:imports</arg>
<!--
Expand Down
2 changes: 1 addition & 1 deletion sql/core/src/main/scala/org/apache/spark/sql/execution/command/tables.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1056,7 +1056,7 @@ trait ShowCreateTableCommandBase extends SQLConfHelper {
metadata
.comment
.map("COMMENT '" + escapeSingleQuotedString(_) + "'\n")
.foreach(builder.append)
.foreach(s => builder.append(s))
}

protected def showTableProperties(metadata: CatalogTable, builder: StringBuilder): Unit = {
Expand Down
6 changes: 3 additions & 3 deletions ...re/src/main/scala/org/apache/spark/sql/execution/datasources/v2/ShowCreateTableExec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ case class ShowCreateTableExec(
private def showTableUsing(table: Table, builder: StringBuilder): Unit = {
Option(table.properties.get(TableCatalog.PROP_PROVIDER))
.map("USING " + escapeSingleQuotedString(_) + "\n")
.foreach(builder.append)
.foreach(s => builder.append(s))
}

private def showTableOptions(
Expand Down Expand Up @@ -123,7 +123,7 @@ case class ShowCreateTableExec(
if (isManagedOption.isEmpty || !isManagedOption.get.equalsIgnoreCase("true")) {
Option(table.properties.get(TableCatalog.PROP_LOCATION))
.map("LOCATION '" + escapeSingleQuotedString(_) + "'\n")
.foreach(builder.append)
.foreach(s => builder.append(s))
}
}

Expand All @@ -150,7 +150,7 @@ case class ShowCreateTableExec(
private def showTableComment(table: Table, builder: StringBuilder): Unit = {
Option(table.properties.get(TableCatalog.PROP_COMMENT))
.map("COMMENT '" + escapeSingleQuotedString(_) + "'\n")
.foreach(builder.append)
.foreach(s => builder.append(s))
}

private def concatByMultiLines(iter: Iterable[String]): String = {
Expand Down