Skip to content

Commit 5a1d6bd

Browse files
HTHouHTHou
committed
[To dev/1.3] Prepare release 1.3.3 (#14057)
1 parent 3352847 commit 5a1d6bd

File tree

4 files changed

+403
-88
lines changed

4 files changed

+403
-88
lines changed

‎LICENSE‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -204,23 +204,16 @@
204204
APACHE IOTDB SUBCOMPONENTS
205205
--------------------------------------------------------------------------------
206206

207-
The following class is copied from maven-wrapper (https://github.com/takari/maven-wrapper),
208-
which is under Apache License 2.0:
209-
210-
mvnw files from https://github.com/apache/maven-wrapper Apache 2.0
211-
212-
--------------------------------------------------------------------------------
213-
214207
The following files include code modified from Apache HBase project.
215208

216-
./iotdb-core/confignode/src/main/java/org/apache/iotdb/procedure/Procedure.java
217-
./iotdb-core/confignode/src/main/java/org/apache/iotdb/procedure/ProcedureExecutor.java
218-
./iotdb-core/confignode/src/main/java/org/apache/iotdb/procedure/StateMachineProcedure.java
219-
./iotdb-core/confignode/src/main/java/org/apache/iotdb/procedure/TimeoutExecutorThread.java
220-
./iotdb-core/confignode/src/main/java/org/apache/iotdb/procedure/StoppableThread.java
209+
./iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/Procedure.java
210+
./iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/ProcedureExecutor.java
211+
./iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/StateMachineProcedure.java
212+
./iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/TimeoutExecutorThread.java
213+
./iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/procedure/StoppableThread.java
221214

222215
Project page: https://github.com/apache/hbase
223-
License: http://www.apache.org/licenses/LICENSE-2.0
216+
License: https://github.com/apache/hbase/blob/master/LICENSE.txt
224217

225218
--------------------------------------------------------------------------------
226219

@@ -242,30 +235,32 @@ License: https://github.com/ggalmazor/lt_downsampling_java8/blob/main/LICENSE
242235

243236
The following files include code modified from Micrometer project.
244237

245-
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmClassLoaderMetrics
246-
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmCompileMetrics
247-
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmGcMetrics
248-
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmMemoryMetrics
249-
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmThreadMetrics
250-
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/logback/LogbackMetrics
251-
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/JvmUtils
238+
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/jvm/JvmClassLoaderMetrics.java
239+
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/jvm/JvmCompileMetrics.java
240+
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/jvm/JvmGcMetrics.java
241+
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/jvm/JvmMemoryMetrics.java
242+
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/jvm/JvmThreadMetrics.java
243+
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/metricsets/JvmUtils.java
244+
./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/logback/logback/LogbackMetrics.java
252245

253246
Copyright: 2017 VMware
254247
Project page: https://github.com/micrometer-metrics/micrometer
255248
License: https://github.com/micrometer-metrics/micrometer/blob/main/LICENSE
256249

257250
--------------------------------------------------------------------------------
258251

259-
The following files include code modified from Trino project(https://github.com/trinodb/trino),
260-
which is under Apache License 2.0:
252+
The following files include code modified from Trino project.
261253

262254
./iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/QueryState.java
263255
./iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/StateMachine.java
264256
./iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java
265257
./iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceState.java
266258
./iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceStateMachine.java
267259
./iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java
268-
./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/*
260+
261+
Trino is open source software licensed under the Apache License 2.0 and supported by the Trino Software Foundation.
262+
Project page: https://github.com/trinodb/trino
263+
License: https://github.com/trinodb/trino/blob/master/LICENSE
269264

270265
--------------------------------------------------------------------------------
271266

@@ -274,4 +269,4 @@ The following files include code modified from Apache Kafka project.
274269
./iotdb-client/session/src/main/java/org/apache/iotdb/session/subscription/util/PollTimer.java
275270

276271
Project page: https://github.com/apache/kafka
277-
License: http://www.apache.org/licenses/LICENSE-2.0
272+
License: https://github.com/apache/kafka/blob/trunk/LICENSE

‎LICENSE-binary‎

Lines changed: 56 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -215,96 +215,90 @@ following license. See licenses/ for text of these licenses.
215215

216216
Apache Software Foundation License 2.0
217217
--------------------------------------
218-
commons-cli:commons-cli:1.3.1
219-
commons-codec:commons-codec:1.13
218+
commons-cli:commons-cli:1.5.0
219+
commons-codec:commons-codec:1.16.1
220220
org.apache.commons:commons-collections4:4.4
221-
commons-io:commons-io:2.5
222-
org.apache.commons:commons-lang3:3.8.1
223-
commons-lang:commons-lang:2.6
224-
com.nimbusds:content-type:2.0
225-
com.google.code.gson:gson:2.8.6
221+
commons-io:commons-io:2.14.0
222+
org.apache.commons:commons-lang3:3.13.0
223+
com.nimbusds:content-type:2.2
224+
com.google.code.gson:gson:2.10.1
226225
com.google.guava.guava:32.1.2-jre
227-
com.fasterxml.jackson.core:jackson-annotations:2.10.0
228-
com.fasterxml.jackson.core:jackson-core:2.10.0
229-
com.fasterxml.jackson.core:jackson-databind:2.10.0
230-
javax.inject:javax.inject:1
231-
net.jpountz.lz4:1.3.0
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
229+
jakarta.inject:jakarta.inject:2.6.1
230+
org.lz4:lz4-java:1.8.0
232231
com.github.stephenc.jcip:jcip-annotations:1.0-1
233-
com.github.ben-manes.caffeine:caffeine:2.9.1
234-
org.eclipse.jetty:jetty-http:9.4.24.v20191120
235-
org.eclipse.jetty:jetty-io:9.4.24.v20191120
236-
org.eclipse.jetty:jetty-security:9.4.24.v20191120
237-
org.eclipse.jetty:jetty-server:9.4.24.v20191120
238-
org.eclipse.jetty:jetty-servlet:9.4.24.v20191120
239-
org.eclipse.jetty:jetty-util:9.4.24.v20191120
240-
org.eclipse.jetty:jetty-webapp:9.4.24.v20191120
241-
org.eclipse.jetty:jetty-xml:9.4.24.v20191120
242-
io.jsonwebtoken:jjwt-api:0.10.7
243-
io.jsonwebtoken:jjwt-impl:0.10.7
244-
io.jsonwebtoken:jjwt-jackson:0.10.7
245-
net.minidev:json-smart:2.3
232+
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
246243
com.google.code.findbugs:jsr305:3.0.2
247-
com.nimbusds:lang-tag:1.4.4
244+
com.nimbusds:lang-tag:1.7
248245
com.librato.metrics:librato-java:2.1.0
249246
org.apache.thrift:libthrift:0.14.1
250-
io.dropwizard.metrics:metrics-core:3.2.6
251-
io.dropwizard.metrics:metrics-json:3.2.6
252-
io.dropwizard.metrics:metrics-jvm:3.2.6
247+
io.dropwizard.metrics:metrics-core:4.2.19
248+
io.dropwizard.metrics:metrics-jvm:3.2.2
253249
com.librato.metrics:metrics-librato:5.1.0
254-
de.fraunhofer.iosb.io.moquette:moquette-broker:0.14.3
255-
io.netty:netty-buffer:4.1.53.Final
256-
io.netty:netty-codec:4.1.53.Final
257-
io.netty:netty-codec-http:4.1.53.Final
258-
io.netty:netty-codec-mqtt:4.1.53.Final
259-
io.netty:netty-common:4.1.53.Final
260-
io.netty:netty-handler:4.1.53.Final
261-
io.netty:netty-resolver:4.1.53.Final
262-
io.netty:netty-transport:4.1.53.Final
263-
io.netty:netty-transport-native-epoll:4.1.53.Final:linux-x86_64
264-
io.netty:netty-transport-native-unix-common:4.1.53.Final
265-
com.nimbusds:nimbus-jose-jwt:8.14.1
266-
com.nimbusds:oauth2-oidc-sdk:8.3
267-
org.osgi:org.osgi.core:6.0.0
268-
org.osgi:osgi.cmpn:6.0.0
269-
org.ops4j.pax.jdbc:pax-jdbc-common:1.4.5
270-
org.xerial.snappy:snappy-java:1.1.8.4
271-
io.airlift.airline:0.8
272-
net.minidev:accessors-smart:1.2
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
262+
com.nimbusds:oauth2-oidc-sdk:10.15
263+
org.osgi:org.osgi.core:7.0.0
264+
org.osgi:osgi.cmpn:7.0.0
265+
org.ops4j.pax.jdbc:pax-jdbc-common:1.5.6
266+
org.xerial.snappy:snappy-java:1.1.10.5
267+
io.airlift.airline:0.9
268+
net.minidev:accessors-smart:2.5.0
273269

274270

275271
BSD 3-Clause
276272
------------
277-
org.antlr:antlr-runtime:4.8-1
278-
org.ow2.asm:asm:5.0.4
279-
org.jline:jline:3.21.0
273+
org.antlr:antlr-runtime:4.9.3
274+
org.ow2.asm:asm:9.3
275+
org.jline:jline:3.26.2
280276

281277

282278
BSD 2-Clause
283279
------------
284-
com.github.luben:zstd-jni:1.5.4-2
280+
com.github.luben:zstd-jni:1.5.6-3
285281

286282

287283
MIT License
288284
------------
289-
org.slf4j:slf4j-api
290-
me.tongfei:progressbar:0.7.3
291-
com.bugsnag:bugsnag:3.6.1
292-
org.slf4j:jcl-over-slf4j:1.7.25
285+
org.slf4j:slf4j-api:2.0.9
286+
com.bugsnag:bugsnag:3.7.2
293287

294288

295289
EPL 1.0
296290
------------
297-
com.h2database:h2-mvstore:1.4.199
298-
ch.qos.logback:logback-classic:1.2.10
299-
ch.qos.logback:logback-core:1.2.10
291+
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
300294

301295

302296
CDDL 1.1
303297
------------
304-
javax.annotation:javax.annotation-api:1.3.2
305-
javax.servlet:javax.servlet-api:3.1.0
298+
jakarta.annotation:jakarta.annotation-api:1.3.5
299+
jakarta.servlet:jakarta.servlet-api:4.0.4
306300
javax.xml.bind:jaxb-api:2.4.0-b180725.0427
307-
org.glassfish.jaxb:jaxb-runtime:2.4.0-b180725.0644
301+
org.glassfish.jaxb:jaxb-runtime:2.3.6
308302

309303

310304
Public Domain

0 commit comments

Comments
 (0)