You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/07/23 02:09:49 UTC
[incubator-iotdb] 01/01: fix flink error and pom warning
This is an automated email from the ASF dual-hosted git repository.
hxd pushed a commit to branch for-releasing-0.10.1
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 8e91e8573aec869de47b234614bc0d976da70827
Author: xiangdong huang <sa...@gmail.com>
AuthorDate: Wed Jul 22 23:38:23 2020 +0800
fix flink error and pom warning
fix flink hadoop dependency conflict
fix spark core and sql dependency conflict
in spark-iotdb, fix spark-core and sql dependency conflict
in spark-iotdb, fix spark-sql and hadoop dependency conflict
in hive, fix findbugs dependency conflict
---
example/flink/pom.xml | 4 ++++
.../apache/iotdb/flink/DefaultIoTSerializationSchema.java | 2 +-
flink-tsfile-connector/pom.xml | 8 ++++++++
pom.xml | 7 +++++++
spark-iotdb-connector/pom.xml | 12 ++++++++++++
spark-tsfile/pom.xml | 4 ++++
6 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/example/flink/pom.xml b/example/flink/pom.xml
index 05bbce9..e790b72 100644
--- a/example/flink/pom.xml
+++ b/example/flink/pom.xml
@@ -42,6 +42,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
diff --git a/flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/DefaultIoTSerializationSchema.java b/flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/DefaultIoTSerializationSchema.java
index 941b5ef..f91700e 100644
--- a/flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/DefaultIoTSerializationSchema.java
+++ b/flink-iotdb-connector/src/main/java/org/apache/iotdb/flink/DefaultIoTSerializationSchema.java
@@ -25,7 +25,7 @@ import java.util.Map;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
/**
- * @inheritDoc The default implementation of IoTSerializationSchema. Gets info from a map struct.
+ * The default implementation of IoTSerializationSchema. Gets info from a map struct.
*/
public class DefaultIoTSerializationSchema implements IoTSerializationSchema<Map<String, String>> {
diff --git a/flink-tsfile-connector/pom.xml b/flink-tsfile-connector/pom.xml
index 2c6b667..2eba091 100644
--- a/flink-tsfile-connector/pom.xml
+++ b/flink-tsfile-connector/pom.xml
@@ -58,6 +58,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -71,6 +75,10 @@
<groupId>org.apache.commons</groupId>
<artifactId>commons-compress</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
</exclusions>
</dependency>
</dependencies>
diff --git a/pom.xml b/pom.xml
index 73cced2..6c3df55 100644
--- a/pom.xml
+++ b/pom.xml
@@ -449,6 +449,13 @@
<artifactId>mqtt-client</artifactId>
<version>1.12</version>
</dependency>
+ <!-- many dependencies (hadoop, spark, hive, flink) use findbugs but with different version...-->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <!-- spark uses the lastest version than hive, flink and hadoop-->
+ <version>3.0.2</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<dependencies>
diff --git a/spark-iotdb-connector/pom.xml b/spark-iotdb-connector/pom.xml
index 71344d1..f1cd348 100644
--- a/spark-iotdb-connector/pom.xml
+++ b/spark-iotdb-connector/pom.xml
@@ -65,11 +65,23 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
<artifactId>spark-core_2.11</artifactId>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.spark</groupId>
diff --git a/spark-tsfile/pom.xml b/spark-tsfile/pom.xml
index cfbbf22..0f40882 100644
--- a/spark-tsfile/pom.xml
+++ b/spark-tsfile/pom.xml
@@ -54,6 +54,10 @@
<groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>