Skip to content

Commit fd98737

Browse files
JackieTien97JackieTien97
authored
Delete concurrent-206 and checker-qual directly dependency
1 parent 9daaaa8 commit fd98737

File tree

26 files changed

+192
-244
lines changed

26 files changed

+192
-244
lines changed

‎dependencies.json‎

Lines changed: 164 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -1,167 +1,165 @@
11
{
2-
"dependencies": [
3-
"cglib:cglib",
4-
"ch.qos.logback:logback-classic",
5-
"ch.qos.logback:logback-core",
6-
"ch.qos.reload4j:reload4j",
7-
"com.digitalpetri.fsm:strict-machine",
8-
"com.digitalpetri.netty:netty-channel-fsm",
9-
"com.fasterxml.jackson.core:jackson-annotations",
10-
"com.fasterxml.jackson.core:jackson-core",
11-
"com.fasterxml.jackson.core:jackson-databind",
12-
"com.fasterxml.jackson.dataformat:jackson-dataformat-yaml",
13-
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
14-
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-base",
15-
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider",
16-
"com.fasterxml.jackson.module:jackson-module-jaxb-annotations",
17-
"com.github.ben-manes.caffeine:caffeine",
18-
"com.github.luben:zstd-jni",
19-
"com.github.stephenc.jcip:jcip-annotations",
20-
"com.github.wendykierp:JTransforms",
21-
"com.google.code.findbugs:jsr305",
22-
"com.google.code.gson:gson",
23-
"com.google.errorprone:error_prone_annotations",
24-
"com.google.guava:failureaccess",
25-
"com.google.guava:guava",
26-
"com.google.guava:listenablefuture",
27-
"com.google.j2objc:j2objc-annotations",
28-
"com.h2database:h2-mvstore",
29-
"com.lmax:disruptor",
30-
"com.nimbusds:content-type",
31-
"com.nimbusds:lang-tag",
32-
"com.nimbusds:nimbus-jose-jwt",
33-
"com.nimbusds:oauth2-oidc-sdk",
34-
"com.sun.istack:istack-commons-runtime",
35-
"com.zaxxer:HikariCP",
36-
"commons-cli:commons-cli",
37-
"commons-codec:commons-codec",
38-
"commons-io:commons-io",
39-
"commons-logging:commons-logging",
40-
"io.airlift:airline",
41-
"io.airlift:concurrent",
42-
"io.airlift:log",
43-
"io.airlift:units",
44-
"io.dropwizard.metrics:metrics-core",
45-
"io.jsonwebtoken:jjwt-api",
46-
"io.micrometer:micrometer-commons",
47-
"io.micrometer:micrometer-core",
48-
"io.micrometer:micrometer-observation",
49-
"com.github.moquette-io.moquette:moquette-broker",
50-
"io.netty:netty-buffer",
51-
"io.netty:netty-codec",
52-
"io.netty:netty-codec-dns",
53-
"io.netty:netty-codec-http",
54-
"io.netty:netty-codec-http2",
55-
"io.netty:netty-codec-mqtt",
56-
"io.netty:netty-codec-socks",
57-
"io.netty:netty-common",
58-
"io.netty:netty-handler",
59-
"io.netty:netty-handler-proxy",
60-
"io.netty:netty-resolver",
61-
"io.netty:netty-resolver-dns",
62-
"io.netty:netty-resolver-dns-classes-macos",
63-
"io.netty:netty-resolver-dns-native-macos",
64-
"io.netty:netty-tcnative-boringssl-static",
65-
"io.netty:netty-tcnative-classes",
66-
"io.netty:netty-transport",
67-
"io.netty:netty-transport-classes-epoll",
68-
"io.netty:netty-transport-native-epoll",
69-
"io.netty:netty-transport-native-unix-common",
70-
"io.netty:netty-transport-classes-kqueue",
71-
"io.netty:netty-transport-native-kqueue",
72-
"io.projectreactor:reactor-core",
73-
"io.projectreactor.netty:reactor-netty-core",
74-
"io.projectreactor.netty:reactor-netty-http",
75-
"io.swagger:swagger-annotations",
76-
"io.swagger:swagger-core",
77-
"io.swagger:swagger-jaxrs",
78-
"io.swagger:swagger-models",
79-
"jakarta.activation:jakarta.activation-api",
80-
"jakarta.annotation:jakarta.annotation-api",
81-
"jakarta.servlet:jakarta.servlet-api",
82-
"jakarta.validation:jakarta.validation-api",
83-
"jakarta.ws.rs:jakarta.ws.rs-api",
84-
"jakarta.xml.bind:jakarta.xml.bind-api",
85-
"net.java.dev.jna:jna",
86-
"net.java.dev.jna:jna-platform",
87-
"net.minidev:accessors-smart",
88-
"net.minidev:json-smart",
89-
"org.antlr:antlr4-runtime",
90-
"org.apache.commons:commons-collections4",
91-
"org.apache.commons:commons-csv",
92-
"org.apache.commons:commons-jexl3",
93-
"org.apache.commons:commons-lang3",
94-
"org.apache.commons:commons-math3",
95-
"org.apache.commons:commons-pool2",
96-
"org.apache.httpcomponents:httpclient",
97-
"org.apache.httpcomponents:httpcore",
98-
"com.timecho.ratis:ratis-client",
99-
"com.timecho.ratis:ratis-common",
100-
"com.timecho.ratis:ratis-grpc",
101-
"com.timecho.ratis:ratis-metrics-api",
102-
"com.timecho.ratis:ratis-proto",
103-
"com.timecho.ratis:ratis-server",
104-
"com.timecho.ratis:ratis-server-api",
105-
"org.apache.ratis:ratis-thirdparty-misc",
106-
"org.apache.thrift:libthrift",
107-
"org.apache.tsfile:common",
108-
"org.apache.tsfile:tsfile",
109-
"org.bouncycastle:bcpkix-jdk18on",
110-
"org.bouncycastle:bcprov-jdk18on",
111-
"org.bouncycastle:bcutil-jdk18on",
112-
"org.checkerframework:checker-qual",
113-
"org.eclipse.collections:eclipse-collections",
114-
"org.eclipse.collections:eclipse-collections-api",
115-
"org.eclipse.jetty:jetty-http",
116-
"org.eclipse.jetty:jetty-io",
117-
"org.eclipse.jetty:jetty-security",
118-
"org.eclipse.jetty:jetty-server",
119-
"org.eclipse.jetty:jetty-servlet",
120-
"org.eclipse.jetty:jetty-util",
121-
"org.eclipse.jetty:jetty-util-ajax",
122-
"org.eclipse.milo:bsd-core",
123-
"org.eclipse.milo:bsd-generator",
124-
"org.eclipse.milo:sdk-client",
125-
"org.eclipse.milo:sdk-core",
126-
"org.eclipse.milo:sdk-server",
127-
"org.eclipse.milo:stack-client",
128-
"org.eclipse.milo:stack-core",
129-
"org.eclipse.milo:stack-server",
130-
"org.fusesource.hawtbuf:hawtbuf",
131-
"org.fusesource.hawtdispatch:hawtdispatch",
132-
"org.fusesource.hawtdispatch:hawtdispatch-transport",
133-
"org.fusesource.mqtt-client:mqtt-client",
134-
"org.glassfish.hk2:hk2-api",
135-
"org.glassfish.hk2:hk2-locator",
136-
"org.glassfish.hk2:hk2-utils",
137-
"org.glassfish.hk2:osgi-resource-locator",
138-
"org.glassfish.hk2.external:aopalliance-repackaged",
139-
"org.glassfish.hk2.external:jakarta.inject",
140-
"org.glassfish.jaxb:jaxb-runtime",
141-
"org.glassfish.jaxb:txw2",
142-
"org.glassfish.jersey.containers:jersey-container-servlet-core",
143-
"org.glassfish.jersey.core:jersey-client",
144-
"org.glassfish.jersey.core:jersey-common",
145-
"org.glassfish.jersey.core:jersey-server",
146-
"org.glassfish.jersey.inject:jersey-hk2",
147-
"org.glassfish.jersey.media:jersey-media-multipart",
148-
"org.hdrhistogram:HdrHistogram",
149-
"org.java-websocket:Java-WebSocket",
150-
"org.javassist:javassist",
151-
"org.jline:jline",
152-
"org.jvnet.mimepull:mimepull",
153-
"org.latencyutils:LatencyUtils",
154-
"org.lz4:lz4-java",
155-
"org.ops4j.pax.jdbc:pax-jdbc-common",
156-
"org.osgi:osgi.cmpn",
157-
"org.osgi:osgi.core",
158-
"org.ow2.asm:asm",
159-
"org.reactivestreams:reactive-streams",
160-
"org.slf4j:slf4j-api",
161-
"org.slf4j:slf4j-reload4j",
162-
"org.tukaani:xz",
163-
"org.xerial.snappy:snappy-java",
164-
"org.yaml:snakeyaml",
165-
"pl.edu.icm:JLargeArrays"
166-
]
167-
}
2+
"dependencies": [
3+
"cglib:cglib",
4+
"ch.qos.logback:logback-classic",
5+
"ch.qos.logback:logback-core",
6+
"ch.qos.reload4j:reload4j",
7+
"com.digitalpetri.fsm:strict-machine",
8+
"com.digitalpetri.netty:netty-channel-fsm",
9+
"com.fasterxml.jackson.core:jackson-annotations",
10+
"com.fasterxml.jackson.core:jackson-core",
11+
"com.fasterxml.jackson.core:jackson-databind",
12+
"com.fasterxml.jackson.dataformat:jackson-dataformat-yaml",
13+
"com.fasterxml.jackson.datatype:jackson-datatype-jsr310",
14+
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-base",
15+
"com.fasterxml.jackson.jaxrs:jackson-jaxrs-json-provider",
16+
"com.fasterxml.jackson.module:jackson-module-jaxb-annotations",
17+
"com.github.ben-manes.caffeine:caffeine",
18+
"com.github.luben:zstd-jni",
19+
"com.github.moquette-io.moquette:moquette-broker",
20+
"com.github.stephenc.jcip:jcip-annotations",
21+
"com.github.wendykierp:JTransforms",
22+
"com.google.code.findbugs:jsr305",
23+
"com.google.code.gson:gson",
24+
"com.google.errorprone:error_prone_annotations",
25+
"com.google.guava:failureaccess",
26+
"com.google.guava:guava",
27+
"com.google.guava:listenablefuture",
28+
"com.google.j2objc:j2objc-annotations",
29+
"com.h2database:h2-mvstore",
30+
"com.lmax:disruptor",
31+
"com.nimbusds:content-type",
32+
"com.nimbusds:lang-tag",
33+
"com.nimbusds:nimbus-jose-jwt",
34+
"com.nimbusds:oauth2-oidc-sdk",
35+
"com.sun.istack:istack-commons-runtime",
36+
"com.timecho.ratis:ratis-client",
37+
"com.timecho.ratis:ratis-common",
38+
"com.timecho.ratis:ratis-grpc",
39+
"com.timecho.ratis:ratis-metrics-api",
40+
"com.timecho.ratis:ratis-proto",
41+
"com.timecho.ratis:ratis-server",
42+
"com.timecho.ratis:ratis-server-api",
43+
"com.zaxxer:HikariCP",
44+
"commons-cli:commons-cli",
45+
"commons-codec:commons-codec",
46+
"commons-io:commons-io",
47+
"commons-logging:commons-logging",
48+
"io.airlift:airline",
49+
"io.airlift:units",
50+
"io.dropwizard.metrics:metrics-core",
51+
"io.jsonwebtoken:jjwt-api",
52+
"io.micrometer:micrometer-commons",
53+
"io.micrometer:micrometer-core",
54+
"io.micrometer:micrometer-observation",
55+
"io.netty:netty-buffer",
56+
"io.netty:netty-codec",
57+
"io.netty:netty-codec-dns",
58+
"io.netty:netty-codec-http",
59+
"io.netty:netty-codec-http2",
60+
"io.netty:netty-codec-mqtt",
61+
"io.netty:netty-codec-socks",
62+
"io.netty:netty-common",
63+
"io.netty:netty-handler",
64+
"io.netty:netty-handler-proxy",
65+
"io.netty:netty-resolver",
66+
"io.netty:netty-resolver-dns",
67+
"io.netty:netty-resolver-dns-classes-macos",
68+
"io.netty:netty-resolver-dns-native-macos",
69+
"io.netty:netty-tcnative-boringssl-static",
70+
"io.netty:netty-tcnative-classes",
71+
"io.netty:netty-transport",
72+
"io.netty:netty-transport-classes-epoll",
73+
"io.netty:netty-transport-classes-kqueue",
74+
"io.netty:netty-transport-native-epoll",
75+
"io.netty:netty-transport-native-kqueue",
76+
"io.netty:netty-transport-native-unix-common",
77+
"io.projectreactor:reactor-core",
78+
"io.projectreactor.netty:reactor-netty-core",
79+
"io.projectreactor.netty:reactor-netty-http",
80+
"io.swagger:swagger-annotations",
81+
"io.swagger:swagger-core",
82+
"io.swagger:swagger-jaxrs",
83+
"io.swagger:swagger-models",
84+
"jakarta.activation:jakarta.activation-api",
85+
"jakarta.annotation:jakarta.annotation-api",
86+
"jakarta.servlet:jakarta.servlet-api",
87+
"jakarta.validation:jakarta.validation-api",
88+
"jakarta.ws.rs:jakarta.ws.rs-api",
89+
"jakarta.xml.bind:jakarta.xml.bind-api",
90+
"net.java.dev.jna:jna",
91+
"net.java.dev.jna:jna-platform",
92+
"net.minidev:accessors-smart",
93+
"net.minidev:json-smart",
94+
"org.antlr:antlr4-runtime",
95+
"org.apache.commons:commons-collections4",
96+
"org.apache.commons:commons-csv",
97+
"org.apache.commons:commons-jexl3",
98+
"org.apache.commons:commons-lang3",
99+
"org.apache.commons:commons-math3",
100+
"org.apache.commons:commons-pool2",
101+
"org.apache.httpcomponents:httpclient",
102+
"org.apache.httpcomponents:httpcore",
103+
"org.apache.ratis:ratis-thirdparty-misc",
104+
"org.apache.thrift:libthrift",
105+
"org.apache.tsfile:common",
106+
"org.apache.tsfile:tsfile",
107+
"org.bouncycastle:bcpkix-jdk18on",
108+
"org.bouncycastle:bcprov-jdk18on",
109+
"org.bouncycastle:bcutil-jdk18on",
110+
"org.checkerframework:checker-qual",
111+
"org.eclipse.collections:eclipse-collections",
112+
"org.eclipse.collections:eclipse-collections-api",
113+
"org.eclipse.jetty:jetty-http",
114+
"org.eclipse.jetty:jetty-io",
115+
"org.eclipse.jetty:jetty-security",
116+
"org.eclipse.jetty:jetty-server",
117+
"org.eclipse.jetty:jetty-servlet",
118+
"org.eclipse.jetty:jetty-util",
119+
"org.eclipse.jetty:jetty-util-ajax",
120+
"org.eclipse.milo:bsd-core",
121+
"org.eclipse.milo:bsd-generator",
122+
"org.eclipse.milo:sdk-client",
123+
"org.eclipse.milo:sdk-core",
124+
"org.eclipse.milo:sdk-server",
125+
"org.eclipse.milo:stack-client",
126+
"org.eclipse.milo:stack-core",
127+
"org.eclipse.milo:stack-server",
128+
"org.fusesource.hawtbuf:hawtbuf",
129+
"org.fusesource.hawtdispatch:hawtdispatch",
130+
"org.fusesource.hawtdispatch:hawtdispatch-transport",
131+
"org.fusesource.mqtt-client:mqtt-client",
132+
"org.glassfish.hk2:hk2-api",
133+
"org.glassfish.hk2:hk2-locator",
134+
"org.glassfish.hk2:hk2-utils",
135+
"org.glassfish.hk2:osgi-resource-locator",
136+
"org.glassfish.hk2.external:aopalliance-repackaged",
137+
"org.glassfish.hk2.external:jakarta.inject",
138+
"org.glassfish.jaxb:jaxb-runtime",
139+
"org.glassfish.jaxb:txw2",
140+
"org.glassfish.jersey.containers:jersey-container-servlet-core",
141+
"org.glassfish.jersey.core:jersey-client",
142+
"org.glassfish.jersey.core:jersey-common",
143+
"org.glassfish.jersey.core:jersey-server",
144+
"org.glassfish.jersey.inject:jersey-hk2",
145+
"org.glassfish.jersey.media:jersey-media-multipart",
146+
"org.hdrhistogram:HdrHistogram",
147+
"org.java-websocket:Java-WebSocket",
148+
"org.javassist:javassist",
149+
"org.jline:jline",
150+
"org.jvnet.mimepull:mimepull",
151+
"org.latencyutils:LatencyUtils",
152+
"org.lz4:lz4-java",
153+
"org.ops4j.pax.jdbc:pax-jdbc-common",
154+
"org.osgi:osgi.cmpn",
155+
"org.osgi:osgi.core",
156+
"org.ow2.asm:asm",
157+
"org.reactivestreams:reactive-streams",
158+
"org.slf4j:slf4j-api",
159+
"org.slf4j:slf4j-reload4j",
160+
"org.tukaani:xz",
161+
"org.xerial.snappy:snappy-java",
162+
"org.yaml:snakeyaml",
163+
"pl.edu.icm:JLargeArrays"
164+
]
165+
}

‎integration-test/src/test/java/org/apache/iotdb/subscription/it/SkipOnSetUpAndTearDownFailure.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
package org.apache.iotdb.subscription.it;
2121

22-
import org.checkerframework.checker.nullness.qual.NonNull;
2322
import org.junit.Assume;
2423
import org.junit.rules.TestRule;
2524
import org.junit.runner.Description;
@@ -38,7 +37,7 @@ public class SkipOnSetUpAndTearDownFailure implements TestRule {
3837
* @param tearDownMethodName Should be exactly the same as the method name decorated with @After.
3938
*/
4039
public SkipOnSetUpAndTearDownFailure(
41-
@NonNull final String setUpMethodName, @NonNull final String tearDownMethodName) {
40+
final String setUpMethodName, final String tearDownMethodName) {
4241
this.setUpMethodName = setUpMethodName;
4342
this.tearDownMethodName = tearDownMethodName;
4443
}

‎iotdb-core/datanode/pom.xml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -207,10 +207,6 @@
207207
<groupId>org.eclipse.milo</groupId>
208208
<artifactId>stack-server</artifactId>
209209
</dependency>
210-
<dependency>
211-
<groupId>org.checkerframework</groupId>
212-
<artifactId>checker-qual</artifactId>
213-
</dependency>
214210
<dependency>
215211
<groupId>org.eclipse.jetty</groupId>
216212
<artifactId>jetty-http</artifactId>
@@ -235,10 +231,6 @@
235231
<groupId>io.airlift</groupId>
236232
<artifactId>airline</artifactId>
237233
</dependency>
238-
<dependency>
239-
<groupId>io.airlift</groupId>
240-
<artifactId>concurrent</artifactId>
241-
</dependency>
242234
<dependency>
243235
<groupId>org.eclipse.jetty</groupId>
244236
<artifactId>jetty-server</artifactId>

‎iotdb-core/datanode/src/main/java/org/apache/iotdb/db/pipe/event/common/tablet/parser/TabletInsertionEventParser.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.apache.tsfile.write.record.Tablet;
4040
import org.apache.tsfile.write.schema.IMeasurementSchema;
4141
import org.apache.tsfile.write.schema.MeasurementSchema;
42-
import org.checkerframework.checker.nullness.qual.NonNull;
4342
import org.slf4j.Logger;
4443
import org.slf4j.LoggerFactory;
4544

@@ -426,12 +425,12 @@ private static List<Integer> generateFullRowIndexList(final int rowCount) {
426425
}
427426

428427
private static Object filterValueColumnsByRowIndexList(
429-
@NonNull final TSDataType type,
430-
@NonNull final Object originValueColumn,
431-
@NonNull final List<Integer> rowIndexList,
428+
final TSDataType type,
429+
final Object originValueColumn,
430+
final List<Integer> rowIndexList,
432431
final boolean isSingleOriginValueColumn,
433-
@NonNull final BitMap originNullValueColumnBitmap,
434-
@NonNull final BitMap nullValueColumnBitmap /* output parameters */) {
432+
final BitMap originNullValueColumnBitmap,
433+
final BitMap nullValueColumnBitmap /* output parameters */) {
435434
switch (type) {
436435
case INT32:
437436
{

0 commit comments

Comments
 (0)