[KYUUBI #6603] Upgrade Scala version from 2.13.8 to 2.13.14
# 🔍 Description ## Issue References 🔗 To support Java 21, the Scala version needs to be upgraded to 2.13.11 or above. ## Types of changes 🔖 - [ ] Bugfix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds functionality) - [ ] Breaking change (fix or feature that would cause existing functionality to change) ## Test Plan 🧪 #### Behavior Without This Pull Request ⚰️ #### Behavior With This Pull Request 🎉 #### Related Unit Tests --- # Checklist 📝 - [ ] This patch was not authored or co-authored using [Generative Tooling](https://www.apache.org/legal/generative-tooling.html) **Be nice. Be informative.** Closes #6603 from dupen01/scala213. Closes #6603 541f86054 [Cheng Pan] exclude SparkLocalClusterTest 13c11bf52 [Perl Du] add ignoreClasses comments d5b67971b [Cheng Pan] Update pom.xml 582de9b90 [dupeng] ignore org.jline.terminal.impl.ffm.* 364eea00c [dupeng] upgrade maven.plugin.silencer.version from 1.7.13 to 1.7.17 99a1cc40a [dupeng] upgrade scala version to 2.13.14 54b0f4d3f [dupeng] upgrade scala version to 2.13.11 Lead-authored-by: dupeng <dunett@163.com> Co-authored-by: Cheng Pan <pan3793@gmail.com> Co-authored-by: Perl Du <34719039+dupen01@users.noreply.github.com> Co-authored-by: Cheng Pan <chengpan@apache.org> Signed-off-by: Cheng Pan <chengpan@apache.org>
This commit is contained in:
parent
96ec1323ac
commit
d8b83c7c3b
1
.github/workflows/master.yml
vendored
1
.github/workflows/master.yml
vendored
@ -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()
|
||||
|
||||
@ -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(", ")
|
||||
|
||||
12
pom.xml
12
pom.xml
@ -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>
|
||||
<!-- 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>
|
||||
@ -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>
|
||||
@ -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>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user