diff --git a/.github/workflows/compile-check.yml b/.github/workflows/compile-check.yml index e54c438..7827828 100644 --- a/.github/workflows/compile-check.yml +++ b/.github/workflows/compile-check.yml @@ -47,4 +47,4 @@ jobs: - name: Compiler Test shell: bash run: | - mvn clean package -P with-integration-tests -ntp + mvn clean verify -P with-integration-tests -ntp diff --git a/iotdb-collector/collector-core/pom.xml b/iotdb-collector/collector-core/pom.xml index c29937e..7d9c42d 100644 --- a/iotdb-collector/collector-core/pom.xml +++ b/iotdb-collector/collector-core/pom.xml @@ -59,12 +59,6 @@ org.apache.tsfile tsfile - 2.1.0-250325-SNAPSHOT - - - org.apache.iotdb - tsfile - 1.3.2 jakarta.servlet @@ -106,22 +100,10 @@ com.lmax disruptor - - org.java-websocket - Java-WebSocket - org.apache.commons commons-lang3 - - org.apache.commons - commons-collections4 - - - org.apache.commons - commons-pool2 - org.apache.iotdb iotdb-thrift-commons @@ -134,14 +116,6 @@ org.apache.iotdb iotdb-session - - net.java.dev.jna - jna - - - net.java.dev.jna - jna-platform - org.apache.thrift libthrift @@ -150,30 +124,10 @@ com.google.guava guava - - org.eclipse.milo - stack-core - - - org.eclipse.milo - sdk-core - - - org.eclipse.milo - stack-server - - - org.eclipse.milo - sdk-server - org.apache.tsfile common - - io.moquette - moquette-broker - com.google.code.findbugs jsr305 @@ -198,6 +152,10 @@ com.github.ben-manes.caffeine caffeine + + commons-codec + commons-codec + @@ -217,9 +175,11 @@ + ch.qos.logback:logback-classic org.eclipse.jetty:jetty-http org.eclipse.jetty:jetty-util org.glassfish.jersey.inject:jersey-hk2 + org.xerial:sqlite-jdbc diff --git a/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/persistence/TaskPersistence.java b/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/persistence/TaskPersistence.java index b911fe1..573f5b4 100644 --- a/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/persistence/TaskPersistence.java +++ b/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/persistence/TaskPersistence.java @@ -22,9 +22,9 @@ import org.apache.iotdb.collector.config.TaskRuntimeOptions; import org.apache.iotdb.collector.runtime.task.TaskStateEnum; import org.apache.iotdb.collector.service.RuntimeService; -import org.apache.iotdb.tsfile.utils.PublicBAOS; -import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils; +import org.apache.tsfile.utils.PublicBAOS; +import org.apache.tsfile.utils.ReadWriteIOUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeGZIPCompressor.java b/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeGZIPCompressor.java index 7fbfc34..38c844e 100644 --- a/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeGZIPCompressor.java +++ b/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeGZIPCompressor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.collector.plugin.builtin.sink.compressor; -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.compress.IUnCompressor; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.compress.IUnCompressor; +import org.apache.tsfile.file.metadata.enums.CompressionType; import java.io.IOException; diff --git a/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeLZ4Compressor.java b/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeLZ4Compressor.java index 725b15e..9f441d8 100644 --- a/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeLZ4Compressor.java +++ b/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeLZ4Compressor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.collector.plugin.builtin.sink.compressor; -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.compress.IUnCompressor; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.compress.IUnCompressor; +import org.apache.tsfile.file.metadata.enums.CompressionType; import java.io.IOException; diff --git a/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeLZMA2Compressor.java b/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeLZMA2Compressor.java index 2fd459c..6910579 100644 --- a/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeLZMA2Compressor.java +++ b/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeLZMA2Compressor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.collector.plugin.builtin.sink.compressor; -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.compress.IUnCompressor; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.compress.IUnCompressor; +import org.apache.tsfile.file.metadata.enums.CompressionType; import java.io.IOException; diff --git a/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeSnappyCompressor.java b/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeSnappyCompressor.java index 101b445..996f95d 100644 --- a/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeSnappyCompressor.java +++ b/iotdb-collector/collector-core/src/main/java/org/apache/iotdb/collector/plugin/builtin/sink/compressor/PipeSnappyCompressor.java @@ -19,9 +19,9 @@ package org.apache.iotdb.collector.plugin.builtin.sink.compressor; -import org.apache.iotdb.tsfile.compress.ICompressor; -import org.apache.iotdb.tsfile.compress.IUnCompressor; -import org.apache.iotdb.tsfile.file.metadata.enums.CompressionType; +import org.apache.tsfile.compress.ICompressor; +import org.apache.tsfile.compress.IUnCompressor; +import org.apache.tsfile.file.metadata.enums.CompressionType; import java.io.IOException; diff --git a/pom.xml b/pom.xml index 467cb7a..ef373b3 100644 --- a/pom.xml +++ b/pom.xml @@ -41,8 +41,6 @@ - 2.0.1-beta - 2.0.1 1.7 206 @@ -186,7 +184,7 @@ 0.14.1 9.0.86 - 2.1.0-250219-SNAPSHOT + 2.0.2 1.9 0.11.1 1.5.5-5