Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .github/workflows/code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@ jobs:

steps:
- uses: actions/checkout@v6
- name: Set up JDK 17
uses: actions/setup-java@v5
with:
distribution: corretto
java-version: 17
- name: Cache Maven packages
uses: actions/cache@v5
with:
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/unit-test-cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,12 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v6

- name: Set up JDK 17
uses: actions/setup-java@v5
with:
distribution: corretto
java-version: 17

# Setup caching of the artifacts in the .m2 directory, so they don't have to
# all be downloaded again for every build.
- name: Cache Maven packages
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit-test-java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
fail-fast: false
max-parallel: 15
matrix:
java: [ 8, 17, 25 ]
java: [ 17, 21, 25 ]
os: [ ubuntu-latest, macos-latest, windows-latest ]
runs-on: ${{ matrix.os }}

Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/unit-test-python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,12 @@ jobs:
with:
python-version: ${{ matrix.python-version }}

- name: Set up JDK 17
uses: actions/setup-java@v5
with:
distribution: corretto
java-version: 17

# Setup caching of the artifacts in the .m2 directory, so they don't have to
# all be downloaded again for every build.
- name: Cache Maven packages
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ pipeline {

tools {
maven 'maven_3_latest'
jdk 'jdk_11_latest'
jdk 'jdk_17_latest'
}

options {
Expand Down
2 changes: 1 addition & 1 deletion docs/src/UserGuide/develop/QuickStart/QuickStart.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

## Dependencies

- JDK >=1.8
- JDK >=17
- Maven >=3.6

## Installation Method
Expand Down
2 changes: 1 addition & 1 deletion docs/src/zh/UserGuide/develop/QuickStart/QuickStart.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

## 依赖

- JDK >=1.8
- JDK >=17
- Maven >=3.6

## 安装
Expand Down
2 changes: 1 addition & 1 deletion java/CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Code generation: FreeMarker templates in `tsfile/src/main/codegen/` generate typ

## Code Style

- **Formatter**: Spotless with Google Java Format 1.28.0 (Spotless requires Java 17+ to run but the project targets Java 8 bytecode)
- **Formatter**: Spotless with Google Java Format 1.28.0 (the project targets Java 17 bytecode)
- **Checkstyle**: Google style variant in root `checkstyle.xml`, 100 char line limit
- **Import order**: `org.apache.tsfile`, `javax`, `java`, static imports

Expand Down
3 changes: 1 addition & 2 deletions java/examples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>8</source>
<target>8</target>
<release>17</release>
</configuration>
</plugin>
<plugin>
Expand Down
33 changes: 20 additions & 13 deletions java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,12 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
<version>2.0.16</version>
<version>2.0.17</version>
</dependency>
<dependency>
<groupId>org.antlr</groupId>
<artifactId>antlr4-runtime</artifactId>
<!-- This was the last version to support Java 8 -->
<version>4.9.3</version>
<version>4.13.2</version>
</dependency>
<dependency>
<groupId>junit</groupId>
Expand All @@ -83,8 +82,7 @@
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<!-- This was the last version to support Java 8 -->
<version>1.3.16</version>
<version>1.5.32</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Expand All @@ -94,18 +92,17 @@
<dependency>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-hadoop</artifactId>
<!-- This was the last version to support Java 8 -->
<version>1.14.4</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
<version>3.3.6</version>
<version>3.4.2</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-mapreduce-client-core</artifactId>
<version>3.3.6</version>
<version>3.4.2</version>
</dependency>
<dependency>
<groupId>org.apache.arrow</groupId>
Expand All @@ -131,7 +128,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
<version>27.0-jre</version>
<version>33.5.0-jre</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
Expand All @@ -141,22 +138,32 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
<version>1.21</version>
<version>1.28.0</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
<version>3.18.0</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.20.0</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.17.0</version>
<version>2.18.6</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-core</artifactId>
<version>2.17.0</version>
<version>2.18.6</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-annotations</artifactId>
<version>2.17.0</version>
<version>2.18.6</version>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
3 changes: 1 addition & 2 deletions java/tools/README-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

构建 Java 版的 TsFile Tools,必须要安装以下依赖:

1. Java >= 1.8 (1.8, 11 到 17 都经过验证. 请确保设置了环境变量).
1. Java >= 17. 请确保设置了环境变量.
2. Maven >= 3.6 (如果要从源代码编译TsFile).


Expand Down Expand Up @@ -229,4 +229,3 @@ arrow2tsfile.bat --source .\data\arrow --target .\output --fail_dir .\failed
- 多批次:`{源文件名}_1.tsfile`、`{源文件名}_2.tsfile`、...
- 表名与输出文件名相互独立——表名来自 schema 或 `--table_name`,文件名来自源文件。


2 changes: 1 addition & 1 deletion java/tools/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@

To build the Java version of TsFile Tools, you must have the following dependencies installed:

1. Java >= 1.8 (1.8, 11 to 17 are verified. Make sure the environment variable is set).
1. Java >= 17. Make sure the environment variable is set.
2. Maven >= 3.6 (if you are compiling TsFile from source).

### Build with Maven
Expand Down
2 changes: 1 addition & 1 deletion java/tsfile/README-zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@

构建 Java 版的 TsFile,必须要安装以下依赖:

1. Java >= 1.8 (1.8, 11 到 17 都经过验证. 请确保设置了环境变量).
1. Java >= 17. 请确保设置了环境变量.
2. Maven >= 3.6.3 (如果要从源代码编译TsFile).


Expand Down
2 changes: 1 addition & 1 deletion java/tsfile/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ Read TsFile Example

To build TsFile with Java, you need to have:

1. Java >= 1.8 (1.8, 11 to 17 are verified. Please make sure the environment path has been set accordingly).
1. Java >= 17. Please make sure the environment path has been set accordingly.
2. Maven >= 3.6.3 (If you want to compile TsFile from source code).


Expand Down
38 changes: 12 additions & 26 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@
<packaging>pom</packaging>
<name>Apache TsFile Project Parent POM</name>
<properties>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<maven.compiler.release>17</maven.compiler.release>
<argLine />
<spotless.skip>false</spotless.skip>
<cmake.version>3.30.2-b1</cmake.version>
Expand Down Expand Up @@ -194,7 +195,7 @@
<plugin>
<groupId>org.antlr</groupId>
<artifactId>antlr4-maven-plugin</artifactId>
<version>4.9.3</version>
<version>4.13.2</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Expand Down Expand Up @@ -229,7 +230,7 @@
</plugin>
<!--
Strange things usually happen if you run with a too low Java version.
This plugin not only checks the minimum java version of 1.8, but also
This plugin not only checks the minimum java version of 17, but also
checks all dependencies (and transitive dependencies) for reported CVEs.
-->
<plugin>
Expand Down Expand Up @@ -289,16 +290,16 @@
<fail>true</fail>
</configuration>
</execution>
<!-- Ensure dependencies are compatible with Java 8 -->
<!-- Ensure dependencies are compatible with Java 17 -->
<execution>
<id>enforce-java8-compatability</id>
<id>enforce-java17-compatibility</id>
<goals>
<goal>enforce</goal>
</goals>
<configuration>
<rules>
<enforceBytecodeVersion>
<maxJdkVersion>1.8</maxJdkVersion>
<maxJdkVersion>17</maxJdkVersion>
</enforceBytecodeVersion>
</rules>
</configuration>
Expand All @@ -315,7 +316,7 @@
<fail>true</fail>
<rules>
<requireJavaVersion>
<version>1.8.0</version>
<version>[17,)</version>
</requireJavaVersion>
<banVulnerable implementation="org.sonatype.ossindex.maven.enforcer.BanVulnerableDependencies">
<excludeCoordinates>
Expand Down Expand Up @@ -616,15 +617,13 @@
</modules>
</profile>
<profile>
<id>.java-9-and-above</id>
<id>.java-17-and-above</id>
<activation>
<jdk>[9,)</jdk>
<jdk>[17,)</jdk>
</activation>
<properties>
<!-- TODO: This seems to break the build on everything above Java 8 -->
<maven.compiler.release>8</maven.compiler.release>
<!--
Add argLine for Java 9 and above, due to
Add argLine for Java 17 and above, due to
[JEP 260: Encapsulate Most Internal APIs],
[JEP 396: Strongly Encapsulate JDK Internals by Default],
[JEP 403: Strongly Encapsulate JDK Internals]
Expand All @@ -644,19 +643,6 @@
]]></argLine>
</properties>
</profile>
<!-- Current version of spotless cannot support JDK17 below -->
<profile>
<id>.java-17-below</id>
<activation>
<jdk>(,17)</jdk>
</activation>
<properties>
<!-- This was the last version to support Java 8, Just for run -->
<spotless.version>2.27.1</spotless.version>
<!-- To avoid format conflicts -->
<spotless.skip>true</spotless.skip>
</properties>
</profile>
<!-- Profile for linux x86_64 (mainly Intel Processors) (Self-Enabling) -->
<profile>
<id>.os-linux-x86_64</id>
Expand Down
Loading