This is an automated email from the ASF dual-hosted git repository. exceptionfactory pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git
commit c21c0e27ebb91d6f49a1dfea079d778b0c6e359c Author: exceptionfactory <[email protected]> AuthorDate: Wed Jun 14 15:59:25 2023 -0500 NIFI-11635 Upgraded IoTDB from 1.0.1 to 1.1.1 - Excluded transitive test dependencies to avoid SNAPSHOT versions Signed-off-by: Pierre Villard <[email protected]> This closes #7382. (cherry picked from commit 4638d2e2515e1c6da99947c451dfcd15abbf601f) --- .../nifi-iotdb-bundle/nifi-iotdb-processors/pom.xml | 10 ++++++++++ .../main/java/org/apache/nifi/processors/QueryIoTDBRecord.java | 2 +- nifi-nar-bundles/nifi-iotdb-bundle/pom.xml | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/nifi-nar-bundles/nifi-iotdb-bundle/nifi-iotdb-processors/pom.xml b/nifi-nar-bundles/nifi-iotdb-bundle/nifi-iotdb-processors/pom.xml index 21a56177ba..b837b57e8d 100644 --- a/nifi-nar-bundles/nifi-iotdb-bundle/nifi-iotdb-processors/pom.xml +++ b/nifi-nar-bundles/nifi-iotdb-bundle/nifi-iotdb-processors/pom.xml @@ -82,6 +82,11 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> </exclusion> + <!-- Exclude IoTDB Consensus to avoid SNAPSHOT versions of Apache Ratis --> + <exclusion> + <groupId>org.apache.iotdb</groupId> + <artifactId>iotdb-consensus</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -95,6 +100,11 @@ <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> </exclusion> + <!-- Exclude IoTDB Consensus to avoid SNAPSHOT versions of Apache Ratis --> + <exclusion> + <groupId>org.apache.iotdb</groupId> + <artifactId>iotdb-consensus</artifactId> + </exclusion> </exclusions> </dependency> <dependency> diff --git a/nifi-nar-bundles/nifi-iotdb-bundle/nifi-iotdb-processors/src/main/java/org/apache/nifi/processors/QueryIoTDBRecord.java b/nifi-nar-bundles/nifi-iotdb-bundle/nifi-iotdb-processors/src/main/java/org/apache/nifi/processors/QueryIoTDBRecord.java index 023b46980c..691687ecdb 100755 --- a/nifi-nar-bundles/nifi-iotdb-bundle/nifi-iotdb-processors/src/main/java/org/apache/nifi/processors/QueryIoTDBRecord.java +++ b/nifi-nar-bundles/nifi-iotdb-bundle/nifi-iotdb-processors/src/main/java/org/apache/nifi/processors/QueryIoTDBRecord.java @@ -16,7 +16,7 @@ */ package org.apache.nifi.processors; -import org.apache.iotdb.session.SessionDataSet; +import org.apache.iotdb.isession.SessionDataSet; import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType; import org.apache.iotdb.tsfile.read.common.Field; import org.apache.iotdb.tsfile.read.common.RowRecord; diff --git a/nifi-nar-bundles/nifi-iotdb-bundle/pom.xml b/nifi-nar-bundles/nifi-iotdb-bundle/pom.xml index a6a754376e..0f0d8891e1 100644 --- a/nifi-nar-bundles/nifi-iotdb-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-iotdb-bundle/pom.xml @@ -31,7 +31,7 @@ </modules> <properties> - <iotdb.sdk.version>1.0.1</iotdb.sdk.version> + <iotdb.sdk.version>1.1.1</iotdb.sdk.version> </properties> <dependencyManagement>
