Skip to content

Upgrade Scala version from 2.13.8 to 2.13.14 #6603

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

Closed
wants to merge 7 commits into from
Closed

Upgrade Scala version from 2.13.8 to 2.13.14 #6603

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
54b0f4d
upgrade scala version to 2.13.11
dupen01 Aug 9, 2024
99a1cc4
upgrade scala version to 2.13.14
dupen01 Aug 9, 2024
364eea0
upgrade maven.plugin.silencer.version from 1.7.13 to 1.7.17
dupen01 Aug 9, 2024
582de9b
ignore org.jline.terminal.impl.ffm.*
dupen01 Aug 9, 2024
d5b6797
Update pom.xml
pan3793 Aug 9, 2024
13c11bf
add ignoreClasses comments
dupen01 Aug 12, 2024
541f860
exclude SparkLocalClusterTest
pan3793 Aug 22, 2024
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
1 change: 1 addition & 0 deletions .github/workflows/master.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ jobs:
run: |
TEST_MODULES="!externals/kyuubi-flink-sql-engine,!integration-tests/kyuubi-flink-it"
./build/mvn clean install ${MVN_OPT} -pl ${TEST_MODULES} -am \
-Dmaven.plugin.scalatest.exclude.tags=org.scalatest.tags.Slow,org.apache.kyuubi.tags.SparkLocalClusterTest \
-Pscala-${{ matrix.scala }} -Pjava-${{ matrix.java }} -Pspark-${{ matrix.spark }}
- name: Upload test logs
if: failure()
Expand Down
3 changes: 2 additions & 1 deletion kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStore.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,8 @@ class JDBCMetadataStore(conf: KyuubiConf) extends MetadataStore with Logging {
hikariConfig.setPoolName("jdbc-metadata-store-pool")

@VisibleForTesting
implicit private[kyuubi] val hikariDataSource = new HikariDataSource(hikariConfig)
implicit private[kyuubi] val hikariDataSource: HikariDataSource =
new HikariDataSource(hikariConfig)
private val mapper = new ObjectMapper().registerModule(DefaultScalaModule)

private val terminalStates = OperationState.terminalStates.map(x => s"'$x'").mkString(", ")
Expand Down
12 changes: 10 additions & 2 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@
<maven.plugin.jacoco.version>0.8.11</maven.plugin.jacoco.version>
<maven.plugin.scalastyle.version>1.0.0</maven.plugin.scalastyle.version>
<maven.plugin.shade.version>3.5.2</maven.plugin.shade.version>
<maven.plugin.silencer.version>1.7.13</maven.plugin.silencer.version>
<maven.plugin.silencer.version>1.7.17</maven.plugin.silencer.version>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why we have to update the silencer version?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

each version of silencer has a strictly supported Scala version list, it's common to update with Scala version together
https://mvnrepository.com/artifact/com.github.ghik/silencer-plugin

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cool. SGTM. Thanks for the explanation.

<!-- MSOURCES-121 breaks creating source artifacts for shaded modules,
we should skip upgrading until MSOURCES-141 gets fixed. -->
<maven.plugin.source.version>3.2.1</maven.plugin.source.version>
Expand Down Expand Up @@ -1853,6 +1853,14 @@
<enforceBytecodeVersion>
<maxJdkVersion>${java.version}</maxJdkVersion>
<ignoredScopes>test</ignoredScopes>
<ignoreClasses>
<!--
The package `org.jline.terminal.impl.ffm.*` contains some class files
that are not compatible with JDK17 (only JDK21 is supported).
However, it will not cause problems for use. See: https://github.com/scala/bug/issues/12994
-->
<ignoreClass>org.jline.terminal.impl.ffm.*</ignoreClass>
</ignoreClasses>
</enforceBytecodeVersion>
</rules>
<fail>true</fail>
Expand Down Expand Up @@ -1931,7 +1939,7 @@
<id>scala-2.13</id>
<properties>
<scala.binary.version>2.13</scala.binary.version>
<scala.version>2.13.8</scala.version>
<scala.version>2.13.14</scala.version>
<spark.archive.scala.suffix>-scala${scala.binary.version}</spark.archive.scala.suffix>
</properties>
</profile>
Expand Down
Loading