Skip to content

Commit 1f2d2e3

Browse files
authored
Upgrade to JDK 17 (#546)
1 parent 9f5f57f commit 1f2d2e3

28 files changed

Lines changed: 47 additions & 42 deletions

File tree

.github/workflows/core-test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ jobs:
1414
uses: actions/checkout@v4
1515
with:
1616
path: iot-benchmark
17-
- name: Set java 8
17+
- name: Set java 17
1818
uses: actions/setup-java@v4
1919
with:
2020
distribution: 'zulu'
21-
java-version: 8
21+
java-version: 17
2222
- name: run core unit tests
2323
run: |
2424
cd ${{ github.workspace }}/iot-benchmark

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ jobs:
6262
fail-fast: false
6363
max-parallel: 20
6464
matrix:
65-
java_version: [ 8 ]
65+
java_version: [ 17 ]
6666
release_db: [ iotdb-1.3,iotdb-2.0,influxdb,influxdb-2.0,timescaledb,timescaledb-cluster ]
6767
steps:
6868
# set java

.github/workflows/release_history_commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
max-parallel: 20
1414
matrix:
15-
java_version: [ 8 ]
15+
java_version: [ 17 ]
1616
steps:
1717
# checkout iot-benchmark
1818
- name: Set the commit ID you want to release

.github/workflows/spotless.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,11 @@ jobs:
1414
uses: actions/checkout@v4
1515
with:
1616
path: iot-benchmark
17+
- name: Set java 17
18+
uses: actions/setup-java@v4
19+
with:
20+
distribution: 'zulu'
21+
java-version: 17
1722
- name: spotless-check
1823
run: |
1924
cd ${{ github.workspace }}/iot-benchmark

CLAUDE.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Spotless runs automatically during `validate` phase. On JDK <= 11, spotless is s
3434

3535
`.github/workflows/` runs on every push/PR to `master`:
3636

37-
- **`core-test.yml`**`mvn -B test -pl core` on JDK 8. Any new core unit test must pass here.
37+
- **`core-test.yml`**`mvn -B test -pl core` on JDK 17. Any new core unit test must pass here.
3838
- **`spotless.yml`**`mvn spotless:check`. Run `mvn spotless:apply` locally before pushing.
3939

4040
`main.yml` is a release-artifact build (matrix over `iotdb-1.3`, `iotdb-2.0`, `influxdb`, `influxdb-2.0`, `timescaledb`, `timescaledb-cluster`) triggered on master pushes, not a PR gate.
@@ -115,7 +115,7 @@ Key parameters:
115115

116116
## Code Style
117117

118-
- Java 8 source level
118+
- Java 17 source level
119119
- Google Java Format enforced by Spotless
120120
- Import order: `org.apache.iotdb`, default, `javax`, `java`, static
121121
- UNIX line endings

README-cn.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
IoT Benchmark
22
---
33
![](https://img.shields.io/badge/platform-MacOS%20%7C%20Linux%20%7C%20Windows-yellow.svg)
4-
![](https://img.shields.io/badge/java--language-1.8-blue.svg)
4+
![](https://img.shields.io/badge/java--language-17-blue.svg)
55

66
- [1. 概述](#1-概述)
77
- [2. 支持的数据库类型](#2-支持的数据库类型)
@@ -52,7 +52,7 @@ IoT Benchmark 是用来评估时序数据库、实时数据库在工业物联网
5252

5353
为了使用 IoT Benchmark,你需要拥有:
5454

55-
1. Java 8
55+
1. Java 17
5656
2. Maven:不建议使用镜像源,国内可以使用阿里云镜像源。
5757
3. 合适版本的数据库
5858

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
IoT Benchmark
22
---
33
![](https://img.shields.io/badge/platform-MacOS%20%7C%20Linux%20%7C%20Windows-yellow.svg)
4-
![](https://img.shields.io/badge/java--language-1.8-blue.svg)
4+
![](https://img.shields.io/badge/java--language-17-blue.svg)
55

66
You can also read [中文版本](README-cn.md).
77

@@ -55,7 +55,7 @@ Currently supports the following databases, versions and connection methods:
5555

5656
To use IoT Benchmark, you need:
5757

58-
1. Java 8
58+
1. Java 17
5959
2. Maven: It is not recommended to use the mirror source. You can use the Alibaba Cloud mirror source in China.
6060
3. The appropriate version of the database
6161

cnosdb/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This module uses IoT Benchmark to test CnosDB.
66

77
Before running the benchmark, prepare:
88

9-
1. Java 8
9+
1. Java 17
1010
2. Maven 3.6+
1111
3. A running CnosDB instance reachable from the benchmark machine
1212

cnosdb/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@
8484
</configuration>
8585
</execution>
8686
</executions>
87-
</plugin><plugin><groupId>org.apache.maven.plugins</groupId><artifactId>maven-compiler-plugin</artifactId><configuration><source>8</source><target>8</target></configuration></plugin>
87+
</plugin>
8888
</plugins>
8989
</build>
9090
</project>

docs/DeveloperGuide-cn.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ This module uses IoT Benchmark to test YourDB.
324324

325325
Before running the benchmark, prepare:
326326

327-
1. Java 8
327+
1. Java 17
328328
2. Maven 3.6+
329329
3. A running YourDB instance reachable from the benchmark machine
330330

0 commit comments

Comments
 (0)