Skip to content

Commit e47fa92

Browse files
authored
[To dev/1.3] Upgrade minimum JDK to 17 and migrate JavaX to Jakarta (#18499)
1 parent 20c68ab commit e47fa92

68 files changed

Lines changed: 305 additions & 367 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/compile-check.yml‎

Lines changed: 0 additions & 52 deletions
This file was deleted.

‎.github/workflows/daily-it.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
fail-fast: false
2121
max-parallel: 20
2222
matrix:
23-
java: [ 8, 17 ]
23+
java: [ 17 ]
2424
runs-on: [self-hosted, iotdb]
2525
# group: self-hosted
2626
# labels: iotdb

‎.github/workflows/daily-ut.yml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,27 @@ env:
1313
MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3
1414
MAVEN_ARGS: --batch-mode --no-transfer-progress
1515
DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
16+
JDK_VERSION: 17
1617

1718
jobs:
1819
unit-test:
1920
strategy:
2021
fail-fast: false
2122
max-parallel: 15
2223
matrix:
23-
java: [ 8 ]
24-
os: [ ubuntu-latest, windows-latest ]
24+
os: [ ubuntu-latest, macos-latest, windows-latest ]
2525
it_task: [ 'others', 'datanode' ]
26-
include:
27-
- java: 17
28-
os: macos-latest
29-
it_task: 'datanode'
30-
- java: 17
31-
os: macos-latest
32-
it_task: 'others'
3326
runs-on: ${{ matrix.os }}
3427

3528
steps:
3629
- uses: actions/checkout@v4
37-
- name: Set up JDK ${{ matrix.java }}
30+
- name: Set up JDK ${{ env.JDK_VERSION }}
3831
uses: actions/setup-java@v4
3932
with:
4033
distribution: corretto
41-
java-version: ${{ matrix.java }}
34+
java-version: ${{ env.JDK_VERSION }}
35+
env:
36+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4237
- name: Cache Maven packages
4338
uses: actions/cache@v4
4439
with:

‎.github/workflows/multi-language-client.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ jobs:
5151

5252
steps:
5353
- uses: actions/checkout@v4
54+
- name: Set up JDK 17
55+
uses: actions/setup-java@v4
56+
with:
57+
distribution: corretto
58+
java-version: 17
5459
- name: Install CPP Dependencies (Ubuntu)
5560
if: runner.os == 'Linux'
5661
shell: bash
@@ -136,6 +141,11 @@ jobs:
136141
with:
137142
token: ${{secrets.GITHUB_TOKEN}}
138143
submodules: recursive
144+
- name: Set up JDK 17
145+
uses: actions/setup-java@v4
146+
with:
147+
distribution: corretto
148+
java-version: 17
139149
- name: Cache Maven packages
140150
uses: actions/cache@v4
141151
with:
@@ -166,6 +176,11 @@ jobs:
166176
with:
167177
python-version: ${{ matrix.python }}
168178
- uses: actions/checkout@v4
179+
- name: Set up JDK 17
180+
uses: actions/setup-java@v4
181+
with:
182+
distribution: corretto
183+
java-version: 17
169184
- name: Cache Maven packages
170185
uses: actions/cache@v4
171186
with:

‎.github/workflows/sonar-codecov.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ jobs:
6464
if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'apache/iotdb' || github.event_name == 'push'
6565
steps:
6666
- uses: actions/checkout@v4
67-
- name: Set up JDK 17
67+
- name: Set up JDK 21
6868
uses: actions/setup-java@v4
6969
with:
7070
distribution: corretto
71-
java-version: 17
71+
java-version: 21
7272
- name: Cache Maven packages
7373
uses: actions/cache@v4
7474
with:

‎Jenkinsfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pipeline {
3434

3535
tools {
3636
maven 'maven_3_latest'
37-
jdk 'jdk_11_latest'
37+
jdk 'jdk_17_latest'
3838
}
3939

4040
options {

‎LICENSE-binary‎

Lines changed: 31 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -225,15 +225,24 @@ com.google.guava.guava:32.1.2-jre
225225
com.fasterxml.jackson.core:jackson-annotations:2.16.2
226226
com.fasterxml.jackson.core:jackson-core:2.16.2
227227
com.fasterxml.jackson.core:jackson-databind:2.16.2
228-
jakarta.inject:jakarta.inject:2.6.1
228+
com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-base:2.16.2
229+
com.fasterxml.jackson.jakarta.rs:jackson-jakarta-rs-json-provider:2.16.2
230+
com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.16.2
231+
io.swagger.core.v3:swagger-annotations-jakarta:2.2.50
232+
io.swagger.core.v3:swagger-core-jakarta:2.2.50
233+
io.swagger.core.v3:swagger-integration-jakarta:2.2.50
234+
io.swagger.core.v3:swagger-jaxrs2-jakarta:2.2.50
235+
io.swagger.core.v3:swagger-models-jakarta:2.2.50
236+
jakarta.inject:jakarta.inject-api:2.0.1
229237
at.yawk.lz4:lz4-java:1.10.0
230238
com.github.ben-manes.caffeine:caffeine:2.9.3
231-
org.eclipse.jetty:jetty-http:9.4.58.v20250814
232-
org.eclipse.jetty:jetty-io:9.4.58.v20250814
233-
org.eclipse.jetty:jetty-security:9.4.58.v20250814
234-
org.eclipse.jetty:jetty-server:9.4.58.v20250814
235-
org.eclipse.jetty:jetty-servlet:9.4.58.v20250814
236-
org.eclipse.jetty:jetty-util:9.4.58.v20250814
239+
org.eclipse.jetty:jetty-http:12.0.36
240+
org.eclipse.jetty:jetty-io:12.0.36
241+
org.eclipse.jetty:jetty-security:12.0.36
242+
org.eclipse.jetty:jetty-server:12.0.36
243+
org.eclipse.jetty:jetty-session:12.0.36
244+
org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.36
245+
org.eclipse.jetty:jetty-util:12.0.36
237246
com.google.code.findbugs:jsr305:3.0.2
238247
com.librato.metrics:librato-java:2.1.0
239248
org.apache.thrift:libthrift:0.23.0
@@ -261,7 +270,7 @@ io.airlift.airline:0.9
261270

262271
BSD 3-Clause
263272
------------
264-
org.antlr:antlr-runtime:4.9.3
273+
org.antlr:antlr4-runtime:4.9.3
265274
org.ow2.asm:asm:9.3
266275
org.jline:jline:3.26.2
267276

@@ -275,19 +284,29 @@ MIT License
275284
------------
276285
org.slf4j:slf4j-api:2.0.9
277286
com.bugsnag:bugsnag:3.7.2
287+
io.github.classgraph:classgraph:4.8.184
278288

279289

280290
EPL 1.0
281291
------------
282292
com.h2database:h2-mvstore:2.1.212
283-
ch.qos.logback:logback-classic:1.3.15
284-
ch.qos.logback:logback-core:1.3.15
293+
294+
295+
EPL 2.0
296+
------------
297+
ch.qos.logback:logback-classic:1.5.34
298+
ch.qos.logback:logback-core:1.5.34
299+
jakarta.annotation:jakarta.annotation-api:3.0.0
300+
jakarta.servlet:jakarta.servlet-api:6.0.0
301+
302+
EDL 1.0
303+
------------
304+
jakarta.activation:jakarta.activation-api:2.1.0
305+
jakarta.xml.bind:jakarta.xml.bind-api:3.0.1
285306

286307

287308
CDDL 1.1
288309
------------
289-
jakarta.annotation:jakarta.annotation-api:1.3.5
290-
jakarta.servlet:jakarta.servlet-api:4.0.4
291310
javax.xml.bind:jaxb-api:2.4.0-b180725.0427
292311
org.glassfish.jaxb:jaxb-runtime:2.3.6
293312

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
![](https://github-size-badge.herokuapp.com/apache/iotdb.svg)
2929
![](https://img.shields.io/github/downloads/apache/iotdb/total.svg)
3030
![](https://img.shields.io/badge/platform-win%20%7C%20macos%20%7C%20linux-yellow.svg)
31-
![](https://img.shields.io/badge/java--language-1.8%20%7C%2011%20%7C%2017-blue.svg)
31+
![](https://img.shields.io/badge/java--language-17+-blue.svg)
3232
[![IoTDB Website](https://img.shields.io/website-up-down-green-red/https/shields.io.svg?label=iotdb-website)](https://iotdb.apache.org/)
3333
[![Maven Version](https://maven-badges.herokuapp.com/maven-central/org.apache.iotdb/iotdb-parent/badge.svg)](http://search.maven.org/#search|gav|1|g:"org.apache.iotdb")
3434
[![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-Ready--to--Code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/apache/iotdb)
@@ -89,7 +89,7 @@ This short guide will walk you through the basic process of using IoTDB. For a m
8989

9090
To use IoTDB, you need to have:
9191

92-
1. Java >= 1.8 (1.8, 11 to 17 are verified. Please make sure the environment path has been set accordingly).
92+
1. Java >= 17 (17 to 25 are verified. Please make sure the environment path has been set accordingly).
9393
2. Maven >= 3.6 (If you want to compile and install IoTDB from source code).
9494
3. Set the max open files num as 65535 to avoid the "too many open files" error.
9595
4. (Optional) Set the somaxconn as 65535 to avoid "connection reset" error when the system is under high load.

‎README_ZH.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
![](https://github-size-badge.herokuapp.com/apache/iotdb.svg)
2929
![](https://img.shields.io/github/downloads/apache/iotdb/total.svg)
3030
![](https://img.shields.io/badge/platform-win%20%7C%20macos%20%7C%20linux-yellow.svg)
31-
![](https://img.shields.io/badge/java--language-1.8%20%7C%2011%20%7C%2017-blue.svg)
31+
![](https://img.shields.io/badge/java--language-17+-blue.svg)
3232
[![Language grade: Java](https://img.shields.io/lgtm/grade/java/g/apache/iotdb.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/apache/iotdb/context:java)
3333
[![IoTDB Website](https://img.shields.io/website-up-down-green-red/https/shields.io.svg?label=iotdb-website)](https://iotdb.apache.org/)
3434
[![Maven Version](https://maven-badges.herokuapp.com/maven-central/org.apache.iotdb/iotdb-parent/badge.svg)](http://search.maven.org/#search|gav|1|g:"org.apache.iotdb")
@@ -86,7 +86,7 @@ IoTDB的主要特点如下:
8686
## 环境准备
8787

8888
要使用IoTDB,您需要:
89-
1. Java >= 1.8 (目前 1.8、11 到 17 已经被验证可用。请确保环变量境路径已正确设置)。
89+
1. Java >= 17 (目前 17 到 25 已经被验证可用。请确保环变量境路径已正确设置)。
9090
2. Maven >= 3.6 (如果希望从源代码编译和安装IoTDB)。
9191
3. 设置 max open files 为 65535,以避免"too many open files"错误。
9292
4. (可选) 将 somaxconn 设置为 65535 以避免系统在高负载时出现 "connection reset" 错误。

‎example/jdbc/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<artifactId>jdbc-example</artifactId>
3030
<name>IoTDB: Example: JDBC</name>
3131
<properties>
32-
<maven.compiler.source>1.7</maven.compiler.source>
33-
<maven.compiler.target>1.7</maven.compiler.target>
32+
<maven.compiler.source>17</maven.compiler.source>
33+
<maven.compiler.target>17</maven.compiler.target>
3434
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
3535
</properties>
3636
<dependencies>

0 commit comments

Comments
 (0)