Skip to content

Commit 0ca36a8

Browse files
committed
Merge branch 'master' into zjt/save_encrypt
# Conflicts: # iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java # pom.xml
2 parents fdac886 + 72a11f3 commit 0ca36a8

188 files changed

Lines changed: 5587 additions & 1905 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/cluster-it-1c1d1a.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@ jobs:
3434
AINode:
3535
strategy:
3636
fail-fast: false
37-
max-parallel: 15
37+
max-parallel: 1
3838
matrix:
3939
os: [ ubuntu-latest ]
40-
runs-on: ${{ matrix.os }}
40+
runs-on: [self-hosted, gpu]
4141

4242
steps:
4343
- uses: actions/checkout@v4
@@ -50,7 +50,7 @@ jobs:
5050
mvn clean verify \
5151
-P with-integration-tests \
5252
-DskipUTs \
53-
-DintegrationTest.forkCount=2 \
53+
-DintegrationTest.forkCount=1 \
5454
-pl integration-test \
5555
-am \
5656
-PAIClusterIT

.github/workflows/cluster-it-1c3d.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Set up JDK ${{ matrix.java }}
4646
uses: actions/setup-java@v4
4747
with:
48-
distribution: liberica
48+
distribution: oracle
4949
java-version: ${{ matrix.java }}
5050
- name: IT/UT Test
5151
shell: bash

.github/workflows/daily-it.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
- name: Set up JDK ${{ matrix.java }}
3030
uses: actions/setup-java@v4
3131
with:
32-
distribution: liberica
32+
distribution: corretto
3333
java-version: ${{ matrix.java }}
3434
- name: IT/UT Test
3535
shell: bash
@@ -61,7 +61,7 @@ jobs:
6161
- name: Set up JDK
6262
uses: actions/setup-java@v4
6363
with:
64-
distribution: liberica
64+
distribution: corretto
6565
java-version: ${{ matrix.java }}
6666
- name: IT/UT Test
6767
shell: bash

.github/workflows/table-cluster-it-1c3d.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
- name: Set up JDK ${{ matrix.java }}
4646
uses: actions/setup-java@v4
4747
with:
48-
distribution: liberica
48+
distribution: oracle
4949
java-version: ${{ matrix.java }}
5050
- name: IT/UT Test
5151
shell: bash

LICENSE-binary

Lines changed: 30 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -219,46 +219,47 @@ commons-cli:commons-cli:1.5.0
219219
commons-codec:commons-codec:1.16.1
220220
org.apache.commons:commons-collections4:4.4
221221
commons-io:commons-io:2.14.0
222-
org.apache.commons:commons-lang3:3.13.0
222+
org.apache.commons:commons-lang3:3.18.0
223223
com.nimbusds:content-type:2.2
224-
com.google.code.gson:gson:2.10.1
224+
com.google.code.gson:gson:2.13.1
225225
com.google.guava.guava:32.1.2-jre
226-
com.fasterxml.jackson.core:jackson-annotations:2.15.4
227-
com.fasterxml.jackson.core:jackson-core:2.15.4
228-
com.fasterxml.jackson.core:jackson-databind:2.15.4
226+
com.fasterxml.jackson.core:jackson-annotations:2.16.2
227+
com.fasterxml.jackson.core:jackson-core:2.16.2
228+
com.fasterxml.jackson.core:jackson-databind:2.16.2
229229
jakarta.inject:jakarta.inject:2.6.1
230230
org.lz4:lz4-java:1.8.0
231231
com.github.stephenc.jcip:jcip-annotations:1.0-1
232232
com.github.ben-manes.caffeine:caffeine:2.9.3
233-
org.eclipse.jetty:jetty-http:9.4.56.v20240826
234-
org.eclipse.jetty:jetty-io:9.4.56.v20240826
235-
org.eclipse.jetty:jetty-security:9.4.56.v20240826
236-
org.eclipse.jetty:jetty-server:9.4.56.v20240826
237-
org.eclipse.jetty:jetty-servlet:9.4.56.v20240826
238-
org.eclipse.jetty:jetty-util:9.4.56.v20240826
239-
io.jsonwebtoken:jjwt-api:0.11.5
240-
io.jsonwebtoken:jjwt-impl:0.11.5
241-
io.jsonwebtoken:jjwt-jackson:0.11.5
242-
net.minidev:json-smart:2.5.0
233+
org.eclipse.jetty:jetty-http:9.4.57.v20241219
234+
org.eclipse.jetty:jetty-io:9.4.57.v20241219
235+
org.eclipse.jetty:jetty-security:9.4.57.v20241219
236+
org.eclipse.jetty:jetty-server:9.4.57.v20241219
237+
org.eclipse.jetty:jetty-servlet:9.4.57.v20241219
238+
org.eclipse.jetty:jetty-util:9.4.57.v20241219
239+
io.jsonwebtoken:jjwt-api:0.12.7
240+
io.jsonwebtoken:jjwt-impl:0.12.7
241+
io.jsonwebtoken:jjwt-jackson:0.12.7
242+
net.minidev:json-smart:2.5.2
243243
com.google.code.findbugs:jsr305:3.0.2
244244
com.nimbusds:lang-tag:1.7
245245
com.librato.metrics:librato-java:2.1.0
246246
org.apache.thrift:libthrift:0.14.1
247247
io.dropwizard.metrics:metrics-core:4.2.19
248248
io.dropwizard.metrics:metrics-jvm:3.2.2
249249
com.librato.metrics:metrics-librato:5.1.0
250-
de.fraunhofer.iosb.io.moquette:moquette-broker:0.17
251-
io.netty:netty-buffer:4.1.110.Final
252-
io.netty:netty-codec:4.1.110.Final
253-
io.netty:netty-codec-http:4.1.110.Final
254-
io.netty:netty-codec-mqtt:4.1.110.Final
255-
io.netty:netty-common:4.1.110.Final
256-
io.netty:netty-handler:4.1.110.Final
257-
io.netty:netty-resolver:4.1.110.Final
258-
io.netty:netty-transport:4.1.110.Final
259-
io.netty:netty-transport-native-epoll:4.1.110.Final:linux-x86_64
260-
io.netty:netty-transport-native-unix-common:4.1.110.Final
261-
com.nimbusds:nimbus-jose-jwt:9.37.3
250+
com.github.moquette-io.moquette:moquette-broker:0.18
251+
io.netty:netty-buffer:4.1.119.Final
252+
io.netty:netty-codec:4.1.119.Final
253+
io.netty:netty-codec-http:4.1.119.Final
254+
io.netty:netty-codec-mqtt:4.1.119.Final
255+
io.netty:netty-common:4.1.119.Final
256+
io.netty:netty-handler:4.1.119.Final
257+
io.netty:netty-resolver:4.1.119.Final
258+
io.netty:netty-transport:4.1.119.Final
259+
io.netty:netty-transport-native-epoll:4.1.119.Final:linux-aarch_64
260+
io.netty:netty-transport-native-epoll:4.1.119.Final:linux-x86_64
261+
io.netty:netty-transport-native-unix-common:4.1.119.Final
262+
com.nimbusds:nimbus-jose-jwt:9.37.4
262263
com.nimbusds:oauth2-oidc-sdk:10.15
263264
org.osgi:org.osgi.core:7.0.0
264265
org.osgi:osgi.cmpn:7.0.0
@@ -289,8 +290,8 @@ com.bugsnag:bugsnag:3.7.2
289290
EPL 1.0
290291
------------
291292
com.h2database:h2-mvstore:2.1.212
292-
ch.qos.logback:logback-classic:1.3.14
293-
ch.qos.logback:logback-core:1.3.14
293+
ch.qos.logback:logback-classic:1.3.15
294+
ch.qos.logback:logback-core:1.3.15
294295

295296

296297
CDDL 1.1

NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache IoTDB
2-
Copyright 2018-2024 The Apache Software Foundation.
2+
Copyright 2018-2025 The Apache Software Foundation.
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).

NOTICE-binary

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache IoTDB
2-
Copyright 2018-2024 The Apache Software Foundation.
2+
Copyright 2018-2025 The Apache Software Foundation.
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).

0 commit comments

Comments
 (0)