You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by do...@apache.org on 2022/03/16 12:25:11 UTC

[incubator-inlong] branch master updated: [INLONG-2450][InLong] Update the dependency to fix the CVEs (#3171)

This is an automated email from the ASF dual-hosted git repository.

dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-inlong.git


The following commit(s) were added to refs/heads/master by this push:
     new 4e6cc9b  [INLONG-2450][InLong] Update the dependency to fix the CVEs (#3171)
4e6cc9b is described below

commit 4e6cc9b56796a0012bbea4453c198fbfad7d947b
Author: dockerzhang <do...@tencent.com>
AuthorDate: Wed Mar 16 20:25:04 2022 +0800

    [INLONG-2450][InLong] Update the dependency to fix the CVEs (#3171)
---
 inlong-audit/audit-sdk/pom.xml                                       | 1 -
 inlong-audit/pom.xml                                                 | 1 -
 inlong-manager/pom.xml                                               | 2 +-
 inlong-sort-standalone/pom.xml                                       | 1 -
 inlong-sort/pom.xml                                                  | 1 -
 inlong-tubemq/pom.xml                                                | 4 ++--
 inlong-tubemq/tubemq-connectors/tubemq-connector-flink/pom.xml       | 2 +-
 .../java/org/apache/flink/connectors/tubemq/TubemqTableSink.java     | 5 -----
 pom.xml                                                              | 2 ++
 9 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/inlong-audit/audit-sdk/pom.xml b/inlong-audit/audit-sdk/pom.xml
index e2ce9f2..0ff6f9f 100644
--- a/inlong-audit/audit-sdk/pom.xml
+++ b/inlong-audit/audit-sdk/pom.xml
@@ -35,7 +35,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <compiler.source>1.8</compiler.source>
         <compiler.target>1.8</compiler.target>
-        <netty.version>3.8.0.Final</netty.version>
         <junit.version>4.13</junit.version>
         <protobuf.version>2.5.0</protobuf.version>
         <commons.version>3.0</commons.version>
diff --git a/inlong-audit/pom.xml b/inlong-audit/pom.xml
index 979e2cc..0062a13 100644
--- a/inlong-audit/pom.xml
+++ b/inlong-audit/pom.xml
@@ -46,7 +46,6 @@
         <maven.compiler.target>8</maven.compiler.target>
         <flume.version>1.9.0</flume.version>
         <plugin.assembly.version>3.2.0</plugin.assembly.version>
-        <netty.version>3.8.0.Final</netty.version>
         <codec.version>1.15</codec.version>
         <servlet.version>2.5-20110124</servlet.version>
         <inlong-common.version>1.3.4</inlong-common.version>
diff --git a/inlong-manager/pom.xml b/inlong-manager/pom.xml
index 93ae79e..aaf3e7d 100644
--- a/inlong-manager/pom.xml
+++ b/inlong-manager/pom.xml
@@ -342,7 +342,7 @@
             <dependency>
                 <groupId>org.apache.hadoop</groupId>
                 <artifactId>hadoop-common</artifactId>
-                <version>2.6.0</version>
+                <version>${hadoop.version}</version>
             </dependency>
 
             <dependency>
diff --git a/inlong-sort-standalone/pom.xml b/inlong-sort-standalone/pom.xml
index 8c9330c..c1bd8d3 100644
--- a/inlong-sort-standalone/pom.xml
+++ b/inlong-sort-standalone/pom.xml
@@ -51,7 +51,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <compiler.source>1.8</compiler.source>
         <compiler.target>1.8</compiler.target>
-        <hadoop.version>2.10.1</hadoop.version>
         <hive.version>2.3.9</hive.version>
         <fastjson.version>1.2.79</fastjson.version>
         <simpleclient_httpserver.version>0.14.1</simpleclient_httpserver.version>
diff --git a/inlong-sort/pom.xml b/inlong-sort/pom.xml
index 74b4f51..498702c 100644
--- a/inlong-sort/pom.xml
+++ b/inlong-sort/pom.xml
@@ -58,7 +58,6 @@
         <flink.jackson.version>2.12.1-13.0</flink.jackson.version>
         <jsr.version>3.0.2</jsr.version>
         <snappy.version>1.1.4</snappy.version>
-        <hadoop.version>2.8.5</hadoop.version>
         <hive.version>2.3.8</hive.version>
         <pulsar.version>2.8.1</pulsar.version>
         <kafka.version>2.4.1</kafka.version>
diff --git a/inlong-tubemq/pom.xml b/inlong-tubemq/pom.xml
index 34f9bd7..2dfce99 100644
--- a/inlong-tubemq/pom.xml
+++ b/inlong-tubemq/pom.xml
@@ -205,7 +205,7 @@
             <dependency>
                 <groupId>io.netty</groupId>
                 <artifactId>netty</artifactId>
-                <version>3.8.0.Final</version>
+                <version>${netty.version}</version>
             </dependency>
             <dependency>
                 <groupId>com.google.protobuf</groupId>
@@ -250,7 +250,7 @@
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
-                <version>3.4.3</version>
+                <version>3.4.14</version>
                 <exclusions>
                     <exclusion>
                         <groupId>com.sun.jmx</groupId>
diff --git a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/pom.xml b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/pom.xml
index 39e2ea7..df1ee51 100644
--- a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/pom.xml
+++ b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/pom.xml
@@ -29,7 +29,7 @@
     <artifactId>tubemq-connector-flink</artifactId>
 
     <properties>
-        <flink.version>1.9.2</flink.version>
+        <flink.version>1.13.5</flink.version>
         <scala.binary.version>2.11</scala.binary.version>
     </properties>
 
diff --git a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSink.java b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSink.java
index e504dab..b49c47c 100644
--- a/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSink.java
+++ b/inlong-tubemq/tubemq-connectors/tubemq-connector-flink/src/main/java/org/apache/flink/connectors/tubemq/TubemqTableSink.java
@@ -82,11 +82,6 @@ public class TubemqTableSink implements AppendStreamTableSink<Row> {
     }
 
     @Override
-    public void emitDataStream(DataStream<Row> dataStream) {
-        consumeDataStream(dataStream);
-    }
-
-    @Override
     public DataStreamSink<?> consumeDataStream(DataStream<Row> dataStream) {
 
         final SinkFunction<Row> tubemqSinkFunction =
diff --git a/pom.xml b/pom.xml
index 11516b0..08ba32b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -117,7 +117,9 @@
         <logback.version>1.2.10</logback.version>
         <junit.version>4.13.2</junit.version>
         <je.version>7.3.7</je.version>
+        <hadoop.version>2.10.1</hadoop.version>
         <postgres.version>42.2.25</postgres.version>
+        <netty.version>3.10.6.Final</netty.version>
     </properties>
 
     <dependencyManagement>