This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 89b291af4b7 Fix some dependency issues
89b291af4b7 is described below
commit 89b291af4b79b01f08dd1abddf8c09ab7bcf2a81
Author: Haonan <[email protected]>
AuthorDate: Tue Aug 19 09:41:17 2025 +0800
Fix some dependency issues
---
LICENSE-binary | 59 +++++++++++-----------
NOTICE | 2 +-
NOTICE-binary | 2 +-
iotdb-core/datanode/pom.xml | 4 --
.../protocol/thrift/impl/ClientRPCServiceImpl.java | 3 +-
.../plan/relational/planner/RelationPlanner.java | 2 +-
.../InformationSchemaTableScanMatcher.java | 2 +-
iotdb-core/metrics/interface/pom.xml | 1 -
.../commons/auth/authorizer/OpenIdAuthorizer.java | 10 ++--
pom.xml | 12 +++--
10 files changed, 49 insertions(+), 48 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index c088b00d7f3..6b599b42482 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -219,27 +219,27 @@ commons-cli:commons-cli:1.5.0
commons-codec:commons-codec:1.16.1
org.apache.commons:commons-collections4:4.4
commons-io:commons-io:2.14.0
-org.apache.commons:commons-lang3:3.13.0
+org.apache.commons:commons-lang3:3.18.0
com.nimbusds:content-type:2.2
-com.google.code.gson:gson:2.10.1
+com.google.code.gson:gson:2.13.1
com.google.guava.guava:32.1.2-jre
-com.fasterxml.jackson.core:jackson-annotations:2.15.4
-com.fasterxml.jackson.core:jackson-core:2.15.4
-com.fasterxml.jackson.core:jackson-databind:2.15.4
+com.fasterxml.jackson.core:jackson-annotations:2.16.2
+com.fasterxml.jackson.core:jackson-core:2.16.2
+com.fasterxml.jackson.core:jackson-databind:2.16.2
jakarta.inject:jakarta.inject:2.6.1
org.lz4:lz4-java:1.8.0
com.github.stephenc.jcip:jcip-annotations:1.0-1
com.github.ben-manes.caffeine:caffeine:2.9.3
-org.eclipse.jetty:jetty-http:9.4.56.v20240826
-org.eclipse.jetty:jetty-io:9.4.56.v20240826
-org.eclipse.jetty:jetty-security:9.4.56.v20240826
-org.eclipse.jetty:jetty-server:9.4.56.v20240826
-org.eclipse.jetty:jetty-servlet:9.4.56.v20240826
-org.eclipse.jetty:jetty-util:9.4.56.v20240826
-io.jsonwebtoken:jjwt-api:0.11.5
-io.jsonwebtoken:jjwt-impl:0.11.5
-io.jsonwebtoken:jjwt-jackson:0.11.5
-net.minidev:json-smart:2.5.0
+org.eclipse.jetty:jetty-http:9.4.57.v20241219
+org.eclipse.jetty:jetty-io:9.4.57.v20241219
+org.eclipse.jetty:jetty-security:9.4.57.v20241219
+org.eclipse.jetty:jetty-server:9.4.57.v20241219
+org.eclipse.jetty:jetty-servlet:9.4.57.v20241219
+org.eclipse.jetty:jetty-util:9.4.57.v20241219
+io.jsonwebtoken:jjwt-api:0.12.7
+io.jsonwebtoken:jjwt-impl:0.12.7
+io.jsonwebtoken:jjwt-jackson:0.12.7
+net.minidev:json-smart:2.5.2
com.google.code.findbugs:jsr305:3.0.2
com.nimbusds:lang-tag:1.7
com.librato.metrics:librato-java:2.1.0
@@ -247,18 +247,19 @@ org.apache.thrift:libthrift:0.14.1
io.dropwizard.metrics:metrics-core:4.2.19
io.dropwizard.metrics:metrics-jvm:3.2.2
com.librato.metrics:metrics-librato:5.1.0
-de.fraunhofer.iosb.io.moquette:moquette-broker:0.17
-io.netty:netty-buffer:4.1.110.Final
-io.netty:netty-codec:4.1.110.Final
-io.netty:netty-codec-http:4.1.110.Final
-io.netty:netty-codec-mqtt:4.1.110.Final
-io.netty:netty-common:4.1.110.Final
-io.netty:netty-handler:4.1.110.Final
-io.netty:netty-resolver:4.1.110.Final
-io.netty:netty-transport:4.1.110.Final
-io.netty:netty-transport-native-epoll:4.1.110.Final:linux-x86_64
-io.netty:netty-transport-native-unix-common:4.1.110.Final
-com.nimbusds:nimbus-jose-jwt:9.37.3
+com.github.moquette-io.moquette:moquette-broker:0.18
+io.netty:netty-buffer:4.1.119.Final
+io.netty:netty-codec:4.1.119.Final
+io.netty:netty-codec-http:4.1.119.Final
+io.netty:netty-codec-mqtt:4.1.119.Final
+io.netty:netty-common:4.1.119.Final
+io.netty:netty-handler:4.1.119.Final
+io.netty:netty-resolver:4.1.119.Final
+io.netty:netty-transport:4.1.119.Final
+io.netty:netty-transport-native-epoll:4.1.119.Final:linux-aarch_64
+io.netty:netty-transport-native-epoll:4.1.119.Final:linux-x86_64
+io.netty:netty-transport-native-unix-common:4.1.119.Final
+com.nimbusds:nimbus-jose-jwt:9.37.4
com.nimbusds:oauth2-oidc-sdk:10.15
org.osgi:org.osgi.core:7.0.0
org.osgi:osgi.cmpn:7.0.0
@@ -289,8 +290,8 @@ com.bugsnag:bugsnag:3.7.2
EPL 1.0
------------
com.h2database:h2-mvstore:2.1.212
-ch.qos.logback:logback-classic:1.3.14
-ch.qos.logback:logback-core:1.3.14
+ch.qos.logback:logback-classic:1.3.15
+ch.qos.logback:logback-core:1.3.15
CDDL 1.1
diff --git a/NOTICE b/NOTICE
index 1e81e8bc0db..fa52a36987f 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
Apache IoTDB
-Copyright 2018-2024 The Apache Software Foundation.
+Copyright 2018-2025 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/NOTICE-binary b/NOTICE-binary
index 1e81e8bc0db..fa52a36987f 100644
--- a/NOTICE-binary
+++ b/NOTICE-binary
@@ -1,5 +1,5 @@
Apache IoTDB
-Copyright 2018-2024 The Apache Software Foundation.
+Copyright 2018-2025 The Apache Software Foundation.
This product includes software developed at
The Apache Software Foundation (http://www.apache.org/).
diff --git a/iotdb-core/datanode/pom.xml b/iotdb-core/datanode/pom.xml
index 5d5801a2158..ebb1b2807f1 100644
--- a/iotdb-core/datanode/pom.xml
+++ b/iotdb-core/datanode/pom.xml
@@ -183,10 +183,6 @@
<groupId>net.java.dev.jna</groupId>
<artifactId>jna-platform</artifactId>
</dependency>
- <dependency>
- <groupId>io.jsonwebtoken</groupId>
- <artifactId>jjwt-api</artifactId>
- </dependency>
<dependency>
<groupId>org.eclipse.milo</groupId>
<artifactId>stack-core</artifactId>
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
index 20cc3dd3c37..458ec796fd8 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java
@@ -184,7 +184,6 @@ import
org.apache.iotdb.service.rpc.thrift.TSyncIdentityInfo;
import org.apache.iotdb.service.rpc.thrift.TSyncTransportMetaInfo;
import io.airlift.units.Duration;
-import io.jsonwebtoken.lang.Strings;
import org.apache.commons.lang3.StringUtils;
import org.apache.thrift.TException;
import org.apache.tsfile.block.column.Column;
@@ -1277,7 +1276,7 @@ public class ClientRPCServiceImpl implements
IClientRPCServiceWithHandler {
String database = req.getDatabase();
if (StringUtils.isEmpty(database)) {
- String[] splits = Strings.split(req.getDevice(), "\\.");
+ String[] splits = req.getDevice().split("\\.");
database = String.format("%s.%s", splits[0], splits[1]);
}
IDeviceID deviceId = Factory.DEFAULT_FACTORY.create(req.getDevice());
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
index fed7e954d40..55f65db3d53 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/planner/RelationPlanner.java
@@ -139,9 +139,9 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
+import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.ImmutableList.toImmutableList;
import static com.google.common.collect.ImmutableSet.toImmutableSet;
-import static com.google.gson.internal.$Gson$Preconditions.checkArgument;
import static java.lang.String.format;
import static java.util.Objects.requireNonNull;
import static
org.apache.iotdb.commons.schema.table.InformationSchema.INFORMATION_DATABASE;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/InformationSchemaTableScanMatcher.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/InformationSchemaTableScanMatcher.java
index 0b8c820d50f..0f23cd61951 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/InformationSchemaTableScanMatcher.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/queryengine/plan/relational/planner/assertions/InformationSchemaTableScanMatcher.java
@@ -31,7 +31,7 @@ import java.util.Optional;
import java.util.Set;
import static com.google.common.base.MoreObjects.toStringHelper;
-import static com.google.gson.internal.$Gson$Preconditions.checkArgument;
+import static com.google.common.base.Preconditions.checkArgument;
import static
org.apache.iotdb.db.queryengine.plan.relational.planner.assertions.MatchResult.NO_MATCH;
public class InformationSchemaTableScanMatcher extends TableScanMatcher {
diff --git a/iotdb-core/metrics/interface/pom.xml
b/iotdb-core/metrics/interface/pom.xml
index 991724a7ac7..cb53d65b903 100644
--- a/iotdb-core/metrics/interface/pom.xml
+++ b/iotdb-core/metrics/interface/pom.xml
@@ -82,7 +82,6 @@
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec-http</artifactId>
- <version>4.1.119.Final</version>
</dependency>
<dependency>
<groupId>org.reactivestreams</groupId>
diff --git
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/OpenIdAuthorizer.java
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/OpenIdAuthorizer.java
index f540269e3cc..38199adf98f 100644
---
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/OpenIdAuthorizer.java
+++
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/OpenIdAuthorizer.java
@@ -194,11 +194,11 @@ public class OpenIdAuthorizer extends BasicAuthorizer {
private Claims validateToken(String token) {
return Jwts.parser()
// Basically ignore the Expiration Date, if there is any???
- .setAllowedClockSkewSeconds(Long.MAX_VALUE / 1000)
- // .setSigningKey(DatatypeConverter.parseBase64Binary(secret))
- .setSigningKey(providerKey)
- .parseClaimsJws(token)
- .getBody();
+ .clockSkewSeconds(Long.MAX_VALUE / 1000)
+ .verifyWith(providerKey)
+ .build()
+ .parseSignedClaims(token)
+ .getPayload();
}
private String getUsername(Claims claims) {
diff --git a/pom.xml b/pom.xml
index b58f90db5d4..cbe309852db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
<argLine/>
<awaitility.version>4.2.0</awaitility.version>
<boost.include.dir/>
+ <bouncycastle.version>1.81</bouncycastle.version>
<!-- This was the last version to support Java 8 -->
<caffeine.version>2.9.3</caffeine.version>
<cglib.version>3.3.0</cglib.version>
@@ -86,7 +87,7 @@
<fusesource-mqtt-client.version>1.16</fusesource-mqtt-client.version>
<!-- JDK1.8 only support google java format 1.7-->
<google.java.format.version>1.22.0</google.java.format.version>
- <gson.version>2.10.1</gson.version>
+ <gson.version>2.13.1</gson.version>
<guava.version>32.1.2-jre</guava.version>
<!-- This was the last version to support Java 8 -->
<h2.version>2.2.224</h2.version>
@@ -110,7 +111,7 @@
<jersey.version>2.40</jersey.version>
<!-- This was the last version to support Java 8 -->
<jetty.version>9.4.57.v20241219</jetty.version>
- <jjwt.version>0.11.5</jjwt.version>
+ <jjwt.version>0.12.7</jjwt.version>
<jline.version>3.26.2</jline.version>
<jna.version>5.14.0</jna.version>
<json-smart.version>2.5.2</json-smart.version>
@@ -311,7 +312,12 @@
<dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcprov-jdk18on</artifactId>
- <version>1.78</version>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk18on</artifactId>
+ <version>${bouncycastle.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
