This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new d9eadc5 [Feature] Support JDK 11 compiling (#1559)
d9eadc5 is described below
commit d9eadc594047a208555143624b2981b639bd169b
Author: Wenjun Ruan <[email protected]>
AuthorDate: Mon Mar 28 12:43:35 2022 +0800
[Feature] Support JDK 11 compiling (#1559)
* [Feature] Support JDK 11 compiling
* Add build with jdk 11 on ci
* Increase timeout
* Add build doc
* Add scala update doc
---
.github/workflows/backend.yml | 9 ++++++---
docs/en/developement/setup.md | 4 ++--
pom.xml | 14 +++++++++++---
seatunnel-config/seatunnel-config-shade/pom.xml | 4 ++++
seatunnel-dist/release-docs/licenses/LICENSE-spark.txt | 1 -
tools/dependencies/known-dependencies.txt | 1 -
6 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/backend.yml b/.github/workflows/backend.yml
index adf54eb..c5986bb 100644
--- a/.github/workflows/backend.yml
+++ b/.github/workflows/backend.yml
@@ -41,15 +41,18 @@ jobs:
build:
name: Build
runs-on: ubuntu-latest
- timeout-minutes: 30
+ strategy:
+ matrix:
+ java: ['8', '11']
+ timeout-minutes: 40
env:
MAVEN_OPTS: -Xmx2G -Xms2G
steps:
- uses: actions/checkout@v2
- - name: Set up JDK 1.8
+ - name: Set up JDK ${{ matrix.java }}
uses: actions/setup-java@v2
with:
- java-version: 8
+ java-version: ${{ matrix.java }}
distribution: 'adopt'
- name: Cache local Maven repository
uses: actions/cache@v2
diff --git a/docs/en/developement/setup.md b/docs/en/developement/setup.md
index b264409..866167d 100644
--- a/docs/en/developement/setup.md
+++ b/docs/en/developement/setup.md
@@ -12,8 +12,8 @@ Before we start talking about how to set up the environment,
we need to do some
have installed the following software:
* [Git](https://git-scm.com/book/en/v2/Getting-Started-Installing-Git)
installed.
-* [Java](https://www.java.com/en/download/) (only JDK 8 supported by now)
installed and `JAVA_HOME` set.
-* [Scala](https://www.scala-lang.org/download/2.11.8.html) (only scala 2.11.8
supported by now) installed.
+* [Java](https://www.java.com/en/download/) ( JDK8/JDK11 are supported by now)
installed and `JAVA_HOME` set.
+* [Scala](https://www.scala-lang.org/download/2.11.12.html) (only scala
2.11.12 supported by now) installed.
* [JetBrains IDEA](https://www.jetbrains.com/idea/) installed.
## Set Up
diff --git a/pom.xml b/pom.xml
index 7fdb317..a5a345c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -86,7 +86,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<java.version>1.8</java.version>
- <scala.version>2.11.8</scala.version>
+ <scala.version>2.11.12</scala.version>
<scala.binary.version>2.11</scala.binary.version>
<maven.compiler.source>${java.version}</maven.compiler.source>
<maven.compiler.target>${java.version}</maven.compiler.target>
@@ -541,6 +541,12 @@
<version>${iceberg.version}</version>
<scope>provided</scope>
</dependency>
+
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ <version>${scala.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -567,8 +573,10 @@
<artifactId>scala-maven-plugin</artifactId>
<version>${scala-maven-plugin.version}</version>
<configuration>
-
<scalaCompatVersion>${scala.binary.version}</scalaCompatVersion>
- <scalaVersion>${scala.version}</scalaVersion>
+ <args>
+ <arg>-nobootcp</arg>
+ <arg>-target:jvm-${java.version}</arg>
+ </args>
</configuration>
<executions>
<execution>
diff --git a/seatunnel-config/seatunnel-config-shade/pom.xml
b/seatunnel-config/seatunnel-config-shade/pom.xml
index c9d9159..922dd98 100644
--- a/seatunnel-config/seatunnel-config-shade/pom.xml
+++ b/seatunnel-config/seatunnel-config-shade/pom.xml
@@ -47,6 +47,10 @@
<artifactId>seatunnel-config-base</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.scala-lang</groupId>
+ <artifactId>scala-library</artifactId>
+ </dependency>
</dependencies>
<build>
diff --git a/seatunnel-dist/release-docs/licenses/LICENSE-spark.txt
b/seatunnel-dist/release-docs/licenses/LICENSE-spark.txt
index ec0b9f8..5e4e69b 100644
--- a/seatunnel-dist/release-docs/licenses/LICENSE-spark.txt
+++ b/seatunnel-dist/release-docs/licenses/LICENSE-spark.txt
@@ -254,7 +254,6 @@ The text of each license is also included at
licenses/LICENSE-[project].txt.
(BSD-like) Scala Actors library (org.scala-lang:scala-actors:2.11.8 -
http://www.scala-lang.org/)
(BSD-like) Scala Compiler (org.scala-lang:scala-compiler:2.11.8 -
http://www.scala-lang.org/)
(BSD-like) Scala Compiler (org.scala-lang:scala-reflect:2.11.8 -
http://www.scala-lang.org/)
- (BSD-like) Scala Library (org.scala-lang:scala-library:2.11.8 -
http://www.scala-lang.org/)
(BSD-like) Scalap (org.scala-lang:scalap:2.11.8 -
http://www.scala-lang.org/)
(BSD-style) scalacheck (org.scalacheck:scalacheck_2.11:1.10.0 -
http://www.scalacheck.org)
(BSD-style) spire (org.spire-math:spire_2.11:0.7.1 -
http://spire-math.org)
diff --git a/tools/dependencies/known-dependencies.txt
b/tools/dependencies/known-dependencies.txt
index cf1eb33..7072b43 100755
--- a/tools/dependencies/known-dependencies.txt
+++ b/tools/dependencies/known-dependencies.txt
@@ -574,7 +574,6 @@ retrofit-2.9.0.jar
rhino-1.7.11.jar
scala-compiler-2.11.12.jar
scala-library-2.11.12.jar
-scala-library-2.11.8.jar
scala-parser-combinators_2.11-1.0.4.jar
scala-parser-combinators_2.11-1.1.0.jar
scala-reflect-2.11.12.jar
