This is an automated email from the ASF dual-hosted git repository.
chengpan pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi.git
The following commit(s) were added to refs/heads/master by this push:
new d8b83c7c3b [KYUUBI #6603] Upgrade Scala version from 2.13.8 to 2.13.14
d8b83c7c3b is described below
commit d8b83c7c3bcb29bbbd126756c19f66bb726d7769
Author: dupeng <[email protected]>
AuthorDate: Fri Aug 23 12:19:27 2024 +0800
[KYUUBI #6603] Upgrade Scala version from 2.13.8 to 2.13.14
# :mag: Description
## Issue References ๐
To support Java 21, the Scala version needs to be upgraded to 2.13.11 or
above.
## Types of changes :bookmark:
- [ ] 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 :coffin:
#### Behavior With This Pull Request :tada:
#### 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 <[email protected]>
Co-authored-by: Cheng Pan <[email protected]>
Co-authored-by: Perl Du <[email protected]>
Co-authored-by: Cheng Pan <[email protected]>
Signed-off-by: Cheng Pan <[email protected]>
---
.github/workflows/master.yml | 1 +
.../kyuubi/server/metadata/jdbc/JDBCMetadataStore.scala | 3 ++-
pom.xml | 12 ++++++++++--
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 0d1385a46e..c80e387cb7 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -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()
diff --git
a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStore.scala
b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStore.scala
index cb6671adeb..5ae534f832 100644
---
a/kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStore.scala
+++
b/kyuubi-server/src/main/scala/org/apache/kyuubi/server/metadata/jdbc/JDBCMetadataStore.scala
@@ -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(", ")
diff --git a/pom.xml b/pom.xml
index 519d5d7593..d02d8c4769 100644
--- a/pom.xml
+++ b/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>
