Skip to content

Commit 747d3bf

Browse files
committed
Fix some dependency issues
1 parent 95a8d35 commit 747d3bf

File tree

7 files changed

+34
-33
lines changed

7 files changed

+34
-33
lines changed

LICENSE-binary

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -219,27 +219,27 @@ 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
at.yawk.lz4:lz4-java:1.10.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
@@ -290,8 +290,8 @@ com.bugsnag:bugsnag:3.7.2
290290
EPL 1.0
291291
------------
292292
com.h2database:h2-mvstore:2.1.212
293-
ch.qos.logback:logback-classic:1.3.14
294-
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
295295

296296

297297
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/).

iotdb-core/datanode/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,10 +173,6 @@
173173
<groupId>net.java.dev.jna</groupId>
174174
<artifactId>jna-platform</artifactId>
175175
</dependency>
176-
<dependency>
177-
<groupId>io.jsonwebtoken</groupId>
178-
<artifactId>jjwt-api</artifactId>
179-
</dependency>
180176
<dependency>
181177
<groupId>org.eclipse.milo</groupId>
182178
<artifactId>stack-core</artifactId>

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/protocol/thrift/impl/ClientRPCServiceImpl.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@
171171
import org.apache.iotdb.service.rpc.thrift.TSyncTransportMetaInfo;
172172

173173
import io.airlift.units.Duration;
174-
import io.jsonwebtoken.lang.Strings;
175174
import org.apache.commons.lang3.StringUtils;
176175
import org.apache.thrift.TException;
177176
import org.apache.tsfile.block.column.Column;
@@ -1151,7 +1150,7 @@ public TSExecuteStatementResp executeGroupByQueryIntervalQuery(TSGroupByQueryInt
11511150

11521151
String database = req.getDatabase();
11531152
if (StringUtils.isEmpty(database)) {
1154-
String[] splits = Strings.split(req.getDevice(), "\\.");
1153+
String[] splits = req.getDevice().split("\\.");
11551154
database = String.format("%s.%s", splits[0], splits[1]);
11561155
}
11571156
String deviceId = req.getDevice();

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/OpenIdAuthorizer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,11 @@ public String getIoTDBUserName(String token) {
194194
private Claims validateToken(String token) {
195195
return Jwts.parser()
196196
// Basically ignore the Expiration Date, if there is any???
197-
.setAllowedClockSkewSeconds(Long.MAX_VALUE / 1000)
198-
// .setSigningKey(DatatypeConverter.parseBase64Binary(secret))
199-
.setSigningKey(providerKey)
200-
.parseClaimsJws(token)
201-
.getBody();
197+
.clockSkewSeconds(Long.MAX_VALUE / 1000)
198+
.verifyWith(providerKey)
199+
.build()
200+
.parseSignedClaims(token)
201+
.getPayload();
202202
}
203203

204204
private String getUsername(Claims claims) {

pom.xml

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
<argLine/>
6161
<awaitility.version>4.2.0</awaitility.version>
6262
<boost.include.dir/>
63+
<bouncycastle.version>1.81</bouncycastle.version>
6364
<!-- This was the last version to support Java 8 -->
6465
<caffeine.version>2.9.3</caffeine.version>
6566
<cglib.version>3.3.0</cglib.version>
@@ -86,7 +87,7 @@
8687
<fusesource-mqtt-client.version>1.16</fusesource-mqtt-client.version>
8788
<!-- JDK1.8 only support google java format 1.7-->
8889
<google.java.format.version>1.22.0</google.java.format.version>
89-
<gson.version>2.10.1</gson.version>
90+
<gson.version>2.13.1</gson.version>
9091
<guava.version>32.1.2-jre</guava.version>
9192
<!-- This was the last version to support Java 8 -->
9293
<h2.version>2.2.224</h2.version>
@@ -110,7 +111,7 @@
110111
<jersey.version>2.40</jersey.version>
111112
<!-- This was the last version to support Java 8 -->
112113
<jetty.version>9.4.57.v20241219</jetty.version>
113-
<jjwt.version>0.11.5</jjwt.version>
114+
<jjwt.version>0.12.7</jjwt.version>
114115
<jline.version>3.26.2</jline.version>
115116
<jna.version>5.14.0</jna.version>
116117
<json-smart.version>2.5.2</json-smart.version>
@@ -311,7 +312,12 @@
311312
<dependency>
312313
<groupId>org.bouncycastle</groupId>
313314
<artifactId>bcprov-jdk18on</artifactId>
314-
<version>1.78</version>
315+
<version>${bouncycastle.version}</version>
316+
</dependency>
317+
<dependency>
318+
<groupId>org.bouncycastle</groupId>
319+
<artifactId>bcpkix-jdk18on</artifactId>
320+
<version>${bouncycastle.version}</version>
315321
</dependency>
316322
<dependency>
317323
<groupId>commons-io</groupId>

0 commit comments

Comments
 (0)