Skip to content
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

Jump to bottom

[Core][jdk17] Support jdk17 #7086

Open
wants to merge 56 commits into
base: dev
Choose a base branch
from
Open

[Core][jdk17] Support jdk17 #7086

Show file tree
Hide file tree
Changes from 51 commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
eed6f1a
1
Jun 30, 2024
c8cbcba
1
Jul 11, 2024
9ea4e6a
1
Jul 12, 2024
01b2606
1
Jul 12, 2024
1c5e9f1
1
Jul 12, 2024
919a3d9
1
Jul 12, 2024
8c71e08
Merge remote-tracking branch 'upstream/dev' into upgrade-1
Jul 12, 2024
b2153ca
Merge branch 'upgrade-1' into jdk17
Jul 12, 2024
76adc38
1
Jul 12, 2024
4afcc47
1
liugddx Jul 13, 2024
d6ec68d
1
liugddx Jul 13, 2024
41fc615
1
liugddx Jul 14, 2024
1ed9e93
1
liugddx Jul 14, 2024
1e72321
1
liugddx Jul 14, 2024
d502478
1
liugddx Jul 14, 2024
adc337e
1
liugddx Jul 14, 2024
85cfe75
1
liugddx Jul 14, 2024
b04c449
1
liugddx Jul 14, 2024
93c6817
1
liugddx Jul 14, 2024
0ff5dd9
1
liugddx Jul 14, 2024
21154d3
1
liugddx Jul 14, 2024
84c8c2f
1
Jul 15, 2024
a1ec356
1
Jul 15, 2024
82c6400
1
Jul 15, 2024
7201c36
1
Jul 15, 2024
575bef4
1
Jul 15, 2024
b6185af
1
Jul 15, 2024
97567b5
Merge remote-tracking branch 'upstream/dev' into jdk17
Jul 15, 2024
eb20539
1
Jul 15, 2024
1c4ba4b
1
Jul 15, 2024
68754a8
1
Jul 15, 2024
b9a080f
1
Jul 15, 2024
e5c872d
1
Jul 15, 2024
39e93e7
1
Jul 15, 2024
7a0d1c8
1
Jul 15, 2024
1520770
1
Jul 15, 2024
7a5ff10
1
Jul 15, 2024
ce7258f
1
Jul 15, 2024
af0c076
1
Jul 15, 2024
9b8acd8
1
Jul 15, 2024
ae87fd5
1
Jul 15, 2024
083ff53
1
Jul 15, 2024
8e1a2db
1
Jul 16, 2024
00eff65
Merge remote-tracking branch 'upstream/dev' into jdk17
Jul 16, 2024
057884f
1
Jul 16, 2024
b9c4a00
1
Jul 16, 2024
8621cd9
1
Jul 16, 2024
9681275
1
Jul 16, 2024
8bea308
1
Jul 16, 2024
a2ab07a
1
Jul 16, 2024
393a4c1
1
Jul 17, 2024
47605e3
1
Jul 17, 2024
6d4d167
1
Jul 17, 2024
b4f0160
1
Jul 17, 2024
801431a
Merge branch 'dev' into jdk17
liugddx Jul 22, 2024
49ce69c
1
Jul 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
66 changes: 33 additions & 33 deletions .github/workflows/backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,7 +274,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest', 'windows-latest' ]
timeout-minutes: 60
steps:
Expand All @@ -297,7 +297,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand Down Expand Up @@ -328,7 +328,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand Down Expand Up @@ -359,7 +359,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand Down Expand Up @@ -390,7 +390,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand Down Expand Up @@ -420,7 +420,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 120
steps:
Expand Down Expand Up @@ -450,7 +450,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand Down Expand Up @@ -480,7 +480,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand Down Expand Up @@ -511,7 +511,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand Down Expand Up @@ -542,7 +542,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 45
steps:
Expand All @@ -565,7 +565,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 45
steps:
Expand Down Expand Up @@ -598,7 +598,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -622,7 +622,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -646,7 +646,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -673,7 +673,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -700,7 +700,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -727,7 +727,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 150
steps:
Expand All @@ -754,7 +754,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -781,7 +781,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -808,7 +808,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -835,7 +835,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -861,7 +861,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -887,7 +887,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -911,7 +911,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -935,7 +935,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -959,7 +959,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -985,7 +985,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -1009,7 +1009,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -1032,7 +1032,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -1055,7 +1055,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -1078,7 +1078,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -1102,7 +1102,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -1128,7 +1128,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '17' ]
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/schedule_backend.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '11' ,'17']
os: [ 'ubuntu-latest', 'windows-latest' ]
timeout-minutes: 90
steps:
Expand All @@ -126,7 +126,7 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
java: [ '8', '11' ]
java: [ '8', '11' ,'17']
os: [ 'ubuntu-latest' ]
timeout-minutes: 90
steps:
Expand Down
4 changes: 2 additions & 2 deletions .mvn/wrapper/maven-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
# specific language governing permissions and limitations
# under the License.

distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.4/apache-maven-3.8.4-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar
distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.8.6/apache-maven-3.8.6-bin.zip
wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar
27 changes: 26 additions & 1 deletion config/seatunnel-env.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,29 @@ REM Home directory of spark distribution.
if "%SPARK_HOME%" == "" set "SPARK_HOME=C:\Program Files\spark"

REM Home directory of flink distribution.
if "%FLINK_HOME%" == "" set "FLINK_HOME=C:\Program Files\flink"
if "%FLINK_HOME%" == "" set "FLINK_HOME=C:\Program Files\flink"

REM Initialize JAVA_OPTS to avoid unbound variable error.
if not defined JAVA_OPTS (
set "JAVA_OPTS="
)

REM Function to check if the current Java version is 17 or higher.
for /f "tokens=2 delims==" %%v in ('java -XshowSettings:properties -version 2>&1 ^| findstr "java.version"') do (
set "java_version=%%v"
)
for /f "tokens=1 delims=." %%v in ("%java_version%") do (
set "java_major_version=%%v"
)

REM Set JAVA_OPTS if Java version is 17 or newer.
if %java_major_version% geq 17 (
if defined JAVA_OPTS (
set "JAVA_OPTS=%JAVA_OPTS% --add-exports=java.base/sun.net.util=ALL-UNNAMED --add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-exports=java.security.jgss/sun.security.krb5=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"
) else (
set "JAVA_OPTS=--add-exports=java.base/sun.net.util=ALL-UNNAMED --add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-exports=java.security.jgss/sun.security.krb5=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"
)
)

REM Export JAVA_OPTS
set JAVA_OPTS
23 changes: 23 additions & 0 deletions config/seatunnel-env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,26 @@
SPARK_HOME=${SPARK_HOME:-/opt/spark}
# Home directory of flink distribution.
FLINK_HOME=${FLINK_HOME:-/opt/flink}

# Initialize JAVA_OPTS to avoid unbound variable error.
JAVA_OPTS=${JAVA_OPTS:-}

# Function to check if the current Java version is 17 or higher.
is_java_17_or_newer() {
java_version_output=$(java -version 2>&1)
if [[ $java_version_output == *"version \""* ]]; then
java_version=$(echo $java_version_output | awk -F '"' '/version/ {print $2}')
java_major_version=$(echo $java_version | cut -d'.' -f1)
if [[ "$java_major_version" -ge 17 ]]; then
return 0
fi
fi
return 1
}

# Set JAVA_OPTS if Java version is 17 or newer.
if is_java_17_or_newer; then
JAVA_OPTS="$JAVA_OPTS --add-exports=java.base/sun.net.util=ALL-UNNAMED --add-exports=java.rmi/sun.rmi.registry=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED --add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED --add-exports=java.security.jgss/sun.security.krb5=ALL-UNNAMED --add-opens=java.base/java.lang=ALL-UNNAMED --add-opens=java.base/java.net=ALL-UNNAMED --add-opens=java.base/java.io=ALL-UNNAMED --add-opens=java.base/java.nio=ALL-UNNAMED --add-opens=java.base/sun.nio.ch=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.base/java.time=ALL-UNNAMED --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.util.concurrent=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED --add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"
fi

export JAVA_OPTS
2 changes: 1 addition & 1 deletion docs/en/connector-v2/sink/Hive.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Write data to Hive.

In order to use this connector, You must ensure your spark/flink cluster already integrated hive. The tested hive version is 2.3.9.

If you use SeaTunnel Engine, You need put seatunnel-hadoop3-3.1.4-uber.jar and hive-exec-3.1.3.jar and libfb303-0.9.3.jar in $SEATUNNEL_HOME/lib/ dir.
If you use SeaTunnel Engine, You need put seatunnel-hadoop3-3.3.4-uber.jar and hive-exec-3.1.3.jar and libfb303-0.9.3.jar in $SEATUNNEL_HOME/lib/ dir.
:::

## Key features
Expand Down
Loading
Loading