Merge branch 'develop' of https://git.mesalab.cn/galaxy/platform/groot-stream into develop

# Conflicts:
#	pom.xml

2 files changed, 226 insertions, 203 deletions

diff --git a/groot-bootstrap/pom.xml b/groot-bootstrap/pom.xml
index ff30067..e9aaf28 100644
--- a/groot-bootstrap/pom.xml
+++ b/groot-bootstrap/pom.xml
@@ -1,161 +1,184 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.geedgenetworks</groupId>
-        <artifactId>groot-stream</artifactId>
-        <version>${revision}</version>
-    </parent>
-
-    <artifactId>groot-bootstrap</artifactId>
-    <name>Groot : Bootstrap </name>
-
-    <properties>
-        <scope>compile</scope>
-    </properties>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>com.geedgenetworks</groupId>
-            <artifactId>groot-common</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.geedgenetworks</groupId>
-            <artifactId>groot-core</artifactId>
-            <version>${revision}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.geedgenetworks</groupId>
-            <artifactId>connector-kafka</artifactId>
-            <version>${revision}</version>
-            <scope>${scope}</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.geedgenetworks</groupId>
-            <artifactId>connector-clickhouse</artifactId>
-            <version>${revision}</version>
-            <scope>${scope}</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.geedgenetworks</groupId>
-            <artifactId>connector-ipfix-collector</artifactId>
-            <version>${revision}</version>
-            <scope>${scope}</scope>
-        </dependency>
-
-
-        <dependency>
-            <groupId>com.geedgenetworks</groupId>
-            <artifactId>format-json</artifactId>
-            <version>${revision}</version>
-            <scope>${scope}</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.geedgenetworks</groupId>
-            <artifactId>format-protobuf</artifactId>
-            <version>${revision}</version>
-            <scope>${scope}</scope>
-        </dependency>
-
-        <!--  Idea debug dependencies -->
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-clients_${scala.version}</artifactId>
-            <version>${flink.version}</version>
-            <scope>${scope}</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-planner-blink_${scala.version}</artifactId>
-            <version>${flink.version}</version>
-            <scope>${scope}</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-json</artifactId>
-            <version>${flink.version}</version>
-            <scope>${scope}</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-runtime-web_${scala.version}</artifactId>
-            <version>${flink.version}</version>
-            <scope>${scope}</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-table-api-java-bridge_${scala.version}</artifactId>
-            <version>${flink.version}</version>
-            <scope>${scope}</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-runtime_${scala.version}</artifactId>
-            <version>${flink.version}</version>
-            <scope>${scope}</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-streaming-java_${scala.version}</artifactId>
-            <version>${flink.version}</version>
-            <scope>${scope}</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.typesafe</groupId>
-            <artifactId>config</artifactId>
-            <scope>${scope}</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.hbase</groupId>
-            <artifactId>hbase-client</artifactId>
-            <scope>${scope}</scope>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>log4j-over-slf4j</artifactId>
-                </exclusion>
-
-            </exclusions>
-        </dependency>
-
-
-        <dependency>
-            <groupId>org.apache.flink</groupId>
-            <artifactId>flink-test-utils_${scala.version}</artifactId>
-            <version>${flink.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>com.beust</groupId>
-            <artifactId>jcommander</artifactId>
-        </dependency>
-
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-    </build>
-
-</project>
+<?xml version="1.0" encoding="UTF-8"?>

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">

+    <modelVersion>4.0.0</modelVersion>

+    <parent>

+        <groupId>com.geedgenetworks</groupId>

+        <artifactId>groot-stream</artifactId>

+        <version>${revision}</version>

+    </parent>

+

+    <artifactId>groot-bootstrap</artifactId>

+    <name>Groot : Bootstrap </name>

+

+    <properties>

+        <!--<scope>compile</scope>

+        <scope>provided</scope>-->

+        <scope>provided</scope>

+    </properties>

+

+    <dependencies>

+        <dependency>

+            <groupId>org.apache.logging.log4j</groupId>

+            <artifactId>log4j-slf4j-impl</artifactId>

+            <scope>${scope}</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.logging.log4j</groupId>

+            <artifactId>log4j-api</artifactId>

+            <scope>${scope}</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.logging.log4j</groupId>

+            <artifactId>log4j-core</artifactId>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>commons-logging</groupId>

+            <artifactId>commons-logging</artifactId>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>com.geedgenetworks</groupId>

+            <artifactId>groot-common</artifactId>

+            <version>${revision}</version>

+        </dependency>

+

+        <dependency>

+            <groupId>com.geedgenetworks</groupId>

+            <artifactId>groot-core</artifactId>

+            <version>${revision}</version>

+        </dependency>

+

+        <dependency>

+            <groupId>com.geedgenetworks</groupId>

+            <artifactId>connector-kafka</artifactId>

+            <version>${revision}</version>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>com.geedgenetworks</groupId>

+            <artifactId>connector-clickhouse</artifactId>

+            <version>${revision}</version>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>com.geedgenetworks</groupId>

+            <artifactId>connector-ipfix-collector</artifactId>

+            <version>${revision}</version>

+            <scope>${scope}</scope>

+        </dependency>

+

+

+        <dependency>

+            <groupId>com.geedgenetworks</groupId>

+            <artifactId>format-json</artifactId>

+            <version>${revision}</version>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>com.geedgenetworks</groupId>

+            <artifactId>format-protobuf</artifactId>

+            <version>${revision}</version>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <!--  Idea debug dependencies -->

+        <dependency>

+            <groupId>org.apache.flink</groupId>

+            <artifactId>flink-clients_${scala.version}</artifactId>

+            <version>${flink.version}</version>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.flink</groupId>

+            <artifactId>flink-table-planner-blink_${scala.version}</artifactId>

+            <version>${flink.version}</version>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.flink</groupId>

+            <artifactId>flink-json</artifactId>

+            <version>${flink.version}</version>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.flink</groupId>

+            <artifactId>flink-runtime-web_${scala.version}</artifactId>

+            <version>${flink.version}</version>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.flink</groupId>

+            <artifactId>flink-table-api-java-bridge_${scala.version}</artifactId>

+            <version>${flink.version}</version>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.flink</groupId>

+            <artifactId>flink-runtime_${scala.version}</artifactId>

+            <version>${flink.version}</version>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.flink</groupId>

+            <artifactId>flink-streaming-java_${scala.version}</artifactId>

+            <version>${flink.version}</version>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>com.typesafe</groupId>

+            <artifactId>config</artifactId>

+            <scope>${scope}</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>org.apache.hbase</groupId>

+            <artifactId>hbase-client</artifactId>

+            <scope>${scope}</scope>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.slf4j</groupId>

+                    <artifactId>slf4j-log4j12</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.slf4j</groupId>

+                    <artifactId>log4j-over-slf4j</artifactId>

+                </exclusion>

+

+            </exclusions>

+        </dependency>

+

+

+        <dependency>

+            <groupId>org.apache.flink</groupId>

+            <artifactId>flink-test-utils_${scala.version}</artifactId>

+            <version>${flink.version}</version>

+            <scope>test</scope>

+        </dependency>

+

+        <dependency>

+            <groupId>com.beust</groupId>

+            <artifactId>jcommander</artifactId>

+        </dependency>

+

+

+    </dependencies>

+

+    <build>

+        <finalName>${project.artifactId}</finalName>

+    </build>

+

+</project>

diff --git a/groot-bootstrap/src/main/resources/log4j2.properties b/groot-bootstrap/src/main/resources/log4j2.properties
index 2dc1b8c..43bd6da 100644
--- a/groot-bootstrap/src/main/resources/log4j2.properties
+++ b/groot-bootstrap/src/main/resources/log4j2.properties
@@ -1,42 +1,42 @@
-################################################################################
-#  Licensed to the Apache Software Foundation (ASF) under one
-#  or more contributor license agreements.  See the NOTICE file
-#  distributed with this work for additional information
-#  regarding copyright ownership.  The ASF licenses this file
-#  to you under the Apache License, Version 2.0 (the
-#  "License"); you may not use this file except in compliance
-#  with the License.  You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-#  Unless required by applicable law or agreed to in writing, software
-#  distributed under the License is distributed on an "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#  See the License for the specific language governing permissions and
-# limitations under the License.
-################################################################################
-
-rootLogger.level = INFO
-
-rootLogger.appenderRef.consoleStdout.ref = consoleStdoutAppender
-rootLogger.appenderRef.consoleStderr.ref = consoleStderrAppender
-
-appender.consoleStdout.name = consoleStdoutAppender
-appender.consoleStdout.type = CONSOLE
-appender.consoleStdout.target = SYSTEM_OUT
-appender.consoleStdout.layout.type = PatternLayout
-appender.consoleStdout.layout.pattern = %d{yyyy-MM-dd HH:mm:ss,SSS} %-5p %c - %m%n
-appender.consoleStdout.filter.acceptLtWarn.type = ThresholdFilter
-appender.consoleStdout.filter.acceptLtWarn.level = WARN
-appender.consoleStdout.filter.acceptLtWarn.onMatch = DENY
-appender.consoleStdout.filter.acceptLtWarn.onMismatch = ACCEPT
-
-appender.consoleStderr.name = consoleStderrAppender
-appender.consoleStderr.type = CONSOLE
-appender.consoleStderr.target = SYSTEM_ERR
-appender.consoleStderr.layout.type = PatternLayout
-appender.consoleStderr.layout.pattern = %d{yyyy-MM-dd HH:mm:ss,SSS} %-5p %c - %m%n
-appender.consoleStderr.filter.acceptGteWarn.type = ThresholdFilter
-appender.consoleStderr.filter.acceptGteWarn.level = WARN
-appender.consoleStderr.filter.acceptGteWarn.onMatch = ACCEPT
-appender.consoleStderr.filter.acceptGteWarn.onMismatch = DENY
+################################################################################

+#  Licensed to the Apache Software Foundation (ASF) under one

+#  or more contributor license agreements.  See the NOTICE file

+#  distributed with this work for additional information

+#  regarding copyright ownership.  The ASF licenses this file

+#  to you under the Apache License, Version 2.0 (the

+#  "License"); you may not use this file except in compliance

+#  with the License.  You may obtain a copy of the License at

+#

+#      http://www.apache.org/licenses/LICENSE-2.0

+#

+#  Unless required by applicable law or agreed to in writing, software

+#  distributed under the License is distributed on an "AS IS" BASIS,

+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+#  See the License for the specific language governing permissions and

+# limitations under the License.

+################################################################################

+

+rootLogger.level = INFO

+

+rootLogger.appenderRef.consoleStdout.ref = consoleStdoutAppender

+rootLogger.appenderRef.consoleStderr.ref = consoleStderrAppender

+

+appender.consoleStdout.name = consoleStdoutAppender

+appender.consoleStdout.type = CONSOLE

+appender.consoleStdout.target = SYSTEM_OUT

+appender.consoleStdout.layout.type = PatternLayout

+appender.consoleStdout.layout.pattern = %d{yyyy-MM-dd HH:mm:ss,SSS} %-5p %c [%t] - %m%n

+appender.consoleStdout.filter.acceptLtWarn.type = ThresholdFilter

+appender.consoleStdout.filter.acceptLtWarn.level = WARN

+appender.consoleStdout.filter.acceptLtWarn.onMatch = DENY

+appender.consoleStdout.filter.acceptLtWarn.onMismatch = ACCEPT

+

+appender.consoleStderr.name = consoleStderrAppender

+appender.consoleStderr.type = CONSOLE

+appender.consoleStderr.target = SYSTEM_ERR

+appender.consoleStderr.layout.type = PatternLayout

+appender.consoleStderr.layout.pattern = %d{yyyy-MM-dd HH:mm:ss,SSS} %-5p %c [%t] - %m%n

+appender.consoleStderr.filter.acceptGteWarn.type = ThresholdFilter

+appender.consoleStderr.filter.acceptGteWarn.level = WARN

+appender.consoleStderr.filter.acceptGteWarn.onMatch = ACCEPT

+appender.consoleStderr.filter.acceptGteWarn.onMismatch = DENY