Skip to content
Merged
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
59 changes: 30 additions & 29 deletions LICENSE-binary
Original file line number Diff line number Diff line change
Expand Up @@ -219,46 +219,47 @@ 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
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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion NOTICE
Original file line number Diff line number Diff line change
@@ -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/).
Expand Down
2 changes: 1 addition & 1 deletion NOTICE-binary
Original file line number Diff line number Diff line change
@@ -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/).
Expand Down
4 changes: 0 additions & 4 deletions iotdb-core/datanode/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@
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;
Expand Down Expand Up @@ -1277,7 +1276,7 @@ public TSExecuteStatementResp executeGroupByQueryIntervalQuery(TSGroupByQueryInt

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());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,9 @@
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
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 {
Expand Down
1 change: 0 additions & 1 deletion iotdb-core/metrics/interface/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -194,11 +194,11 @@ public String getIoTDBUserName(String token) {
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) {
Expand Down
12 changes: 9 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand All @@ -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>
Expand Down Expand Up @@ -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>
Expand Down
Loading