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/04/12 05:21:45 UTC
[incubator-inlong] branch master updated: [INLONG-3622][InLong] Tidy up dependencies for all modules (#3634)
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 47cc56d9f [INLONG-3622][InLong] Tidy up dependencies for all modules (#3634)
47cc56d9f is described below
commit 47cc56d9fe67fd7234303aab9762e7281cea5e09
Author: baomingyu <ba...@163.com>
AuthorDate: Tue Apr 12 13:21:40 2022 +0800
[INLONG-3622][InLong] Tidy up dependencies for all modules (#3634)
---
inlong-agent/agent-core/pom.xml | 39 +-
inlong-agent/agent-docker/pom.xml | 2 +-
inlong-agent/agent-plugins/pom.xml | 99 +--
inlong-agent/pom.xml | 220 +-----
inlong-audit/audit-docker/pom.xml | 2 +-
inlong-common/pom.xml | 5 -
inlong-dashboard/pom.xml | 2 +-
inlong-dataproxy/dataproxy-docker/pom.xml | 2 +-
.../federation/TestPulsarProducerFederation.java | 3 +-
inlong-dataproxy/pom.xml | 44 +-
inlong-manager/manager-client-tools/pom.xml | 1 -
inlong-manager/manager-client/pom.xml | 4 -
inlong-manager/manager-dao/pom.xml | 2 +-
inlong-manager/manager-docker/pom.xml | 2 +-
inlong-manager/manager-service/pom.xml | 20 +-
inlong-manager/manager-test/pom.xml | 17 +-
.../org/apache/inlong/manager/test/BaseTest.java | 3 -
inlong-manager/manager-web/bin/startup.sh | 6 +-
inlong-manager/manager-web/pom.xml | 11 +-
.../manager-web/src/main/resources/log4j2.xml | 133 ++++
.../src/main/resources/logback-spring.xml | 135 ----
inlong-manager/pom.xml | 412 +----------
inlong-sdk/dataproxy-sdk/pom.xml | 83 +--
inlong-sdk/pom.xml | 34 -
inlong-sdk/sdk-common/pom.xml | 8 -
inlong-sdk/sort-sdk/pom.xml | 92 +--
inlong-sort-standalone/pom.xml | 1 -
.../sort-standalone-common/pom.xml | 6 -
.../sort-standalone-dist/pom.xml | 5 -
.../sort-standalone-source/pom.xml | 6 -
inlong-sort/pom.xml | 337 +--------
inlong-sort/sort-common/pom.xml | 17 +-
inlong-sort/sort-connectors/pom.xml | 17 -
inlong-sort/sort-core/pom.xml | 116 ++--
.../sort-formats/format-inlongmsg-base/pom.xml | 32 +-
inlong-sort/sort-formats/pom.xml | 19 +-
inlong-sort/sort-single-tenant/pom.xml | 33 +-
inlong-tubemq/pom.xml | 8 +-
inlong-tubemq/tubemq-connectors/pom.xml | 4 -
inlong-tubemq/tubemq-docker/pom.xml | 4 -
inlong-tubemq/tubemq-docker/tubemq-all/pom.xml | 2 +-
inlong-tubemq/tubemq-docker/tubemq-build/pom.xml | 2 +-
inlong-tubemq/tubemq-docker/tubemq-cpp/pom.xml | 2 +-
inlong-tubemq/tubemq-docker/tubemq-manager/pom.xml | 2 +-
inlong-tubemq/tubemq-manager/bin/start-manager.sh | 2 +-
inlong-tubemq/tubemq-manager/conf/log4j2.xml | 126 ++++
inlong-tubemq/tubemq-manager/conf/logback.xml | 69 --
inlong-tubemq/tubemq-manager/pom.xml | 94 ++-
.../tubemq-manager/sql/apache_tube_manager.sql | 1 +
inlong-tubemq/tubemq-server/pom.xml | 4 -
pom.xml | 770 ++++++++++++++++++++-
51 files changed, 1323 insertions(+), 1737 deletions(-)
diff --git a/inlong-agent/agent-core/pom.xml b/inlong-agent/agent-core/pom.xml
index 730c70934..5c91a5426 100755
--- a/inlong-agent/agent-core/pom.xml
+++ b/inlong-agent/agent-core/pom.xml
@@ -31,16 +31,16 @@
<dependencies>
<dependency>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- <scope>test</scope>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>agent-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <artifactId>awaitility</artifactId>
- <groupId>org.awaitility</groupId>
- <scope>test</scope>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>inlong-common</artifactId>
+ <version>${project.version}</version>
+ <scope>compile</scope>
</dependency>
-
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -49,29 +49,14 @@
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-servlet</artifactId>
</dependency>
-
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-util</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>agent-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>inlong-common</artifactId>
- <version>${project.version}</version>
- <scope>compile</scope>
- </dependency>
-
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient</artifactId>
@@ -89,8 +74,14 @@
<artifactId>akka-stream_2.11</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <artifactId>awaitility</artifactId>
+ <groupId>org.awaitility</groupId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/inlong-agent/agent-docker/pom.xml b/inlong-agent/agent-docker/pom.xml
index c9b9f4595..47eb86d2e 100644
--- a/inlong-agent/agent-docker/pom.xml
+++ b/inlong-agent/agent-docker/pom.xml
@@ -57,7 +57,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven.version}</version>
+ <version>${dockerfile.maven.version}</version>
<executions>
<execution>
<id>default</id>
diff --git a/inlong-agent/agent-plugins/pom.xml b/inlong-agent/agent-plugins/pom.xml
index 15828ecbb..bc94b5663 100644
--- a/inlong-agent/agent-plugins/pom.xml
+++ b/inlong-agent/agent-plugins/pom.xml
@@ -29,25 +29,24 @@
<modelVersion>4.0.0</modelVersion>
<name>Apache InLong - Agent Plugins</name>
- <properties>
- <powermock.version>2.0.2</powermock.version>
- <version.debezium>1.8.0.Final</version.debezium>
- </properties>
-
<dependencies>
<dependency>
- <artifactId>guava</artifactId>
- <groupId>com.google.guava</groupId>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>agent-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>agent-core</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-api</artifactId>
- <version>${version.debezium}</version>
</dependency>
<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-embedded</artifactId>
- <version>${version.debezium}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -58,38 +57,10 @@
<dependency>
<groupId>io.debezium</groupId>
<artifactId>debezium-connector-mysql</artifactId>
- <version>${version.debezium}</version>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>${powermock.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <artifactId>mockito-core</artifactId>
- <groupId>org.mockito</groupId>
- <scope>test</scope>
- <version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>${postgres.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>agent-core</artifactId>
- </dependency>
- <dependency>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
@@ -106,50 +77,56 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <artifactId>mockito-core</artifactId>
- <groupId>org.mockito</groupId>
- <scope>test</scope>
- </dependency>
-
<dependency>
<artifactId>awaitility</artifactId>
<groupId>org.awaitility</groupId>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client</artifactId>
- </dependency>
-
<dependency>
<artifactId>byte-buddy</artifactId>
<groupId>net.bytebuddy</groupId>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<scope>compile</scope>
</dependency>
-
<dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>agent-common</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.pulsar</groupId>
+ <artifactId>pulsar-client</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka_${flink.scala.binary.version}</artifactId>
- <version>${kafka.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ </dependency>
+ <dependency>
+ <artifactId>slf4j-api</artifactId>
+ <groupId>org.slf4j</groupId>
+ </dependency>
+ <dependency>
+ <artifactId>junit</artifactId>
+ <groupId>junit</groupId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <artifactId>mockito-core</artifactId>
+ <groupId>org.mockito</groupId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/inlong-agent/pom.xml b/inlong-agent/pom.xml
index 7609dd527..e178f8b2f 100644
--- a/inlong-agent/pom.xml
+++ b/inlong-agent/pom.xml
@@ -40,195 +40,11 @@
</modules>
<properties>
- <awaitility.version>4.0.3</awaitility.version>
- <bytebuddy.version>1.10.10</bytebuddy.version>
- <commons.io.version>2.11.0</commons.io.version>
- <common.lang3.version>3.10</common.lang3.version>
- <commons.cli.version>1.4</commons.cli.version>
- <dbutils.version>1.7</dbutils.version>
- <encoding>UTF-8</encoding>
- <gson.version>2.8.5</gson.version>
<guava.version>30.0-jre</guava.version>
- <jdk.version>1.8</jdk.version>
- <log4j2.version>2.17.1</log4j2.version>
- <mockito.version>2.23.0</mockito.version>
- <plugin.assembly.version>3.2.0</plugin.assembly.version>
- <slf4j.version>1.7.36</slf4j.version>
- <junit.version>4.13</junit.version>
- <common.lang.version>2.4</common.lang.version>
- <oro.version>2.0.8</oro.version>
- <avro.version>1.7.2</avro.version>
- <pulsar.version>2.6.2</pulsar.version>
- <snappy.version>1.1.8.4</snappy.version>
- <httpclient.version>4.5.13</httpclient.version>
- <fastjson.version>1.2.68</fastjson.version>
- <hippoclient.version>2.0.5</hippoclient.version>
- <jetty.version>9.4.44.v20210927</jetty.version>
- <rocksdb.version>6.14.6</rocksdb.version>
- <codec.version>1.15</codec.version>
- <prometheus.simpleclient.version>0.9.0</prometheus.simpleclient.version>
- <kafka.version>3.1.0</kafka.version>
- <jackson.version>2.13.1</jackson.version>
- <flink.scala.binary.version>2.13</flink.scala.binary.version>
- <akka.version>2.5.21</akka.version>
- <springcontext.version>5.3.13</springcontext.version>
</properties>
<dependencyManagement>
<dependencies>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
- <dependency>
- <groupId>com.typesafe.akka</groupId>
- <artifactId>akka-stream_2.11</artifactId>
- <version>${akka.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- <version>${springcontext.version}</version>
- </dependency>
- <dependency>
- <groupId>org.rocksdb</groupId>
- <artifactId>rocksdbjni</artifactId>
- <version>${rocksdb.version}</version>
- </dependency>
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>${snappy.version}</version>
- </dependency>
- <dependency>
- <artifactId>commons-dbutils</artifactId>
- <groupId>commons-dbutils</groupId>
- <version>${dbutils.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- <version>${avro.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro-ipc</artifactId>
- <version>${avro.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client</artifactId>
- <version>${pulsar.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
- <version>${slf4j.version}</version>
- </dependency>
- <dependency>
- <artifactId>guava</artifactId>
- <groupId>com.google.guava</groupId>
- <version>${guava.version}</version>
- </dependency>
-
- <dependency>
- <artifactId>gson</artifactId>
- <groupId>com.google.code.gson</groupId>
- <version>${gson.version}</version>
- </dependency>
-
- <dependency>
- <artifactId>commons-cli</artifactId>
- <groupId>commons-cli</groupId>
- <version>${commons.cli.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- <version>${common.lang.version}</version>
- </dependency>
-
- <dependency>
- <groupId>oro</groupId>
- <artifactId>oro</artifactId>
- <version>${oro.version}</version>
- </dependency>
- <dependency>
- <groupId>joda-time</groupId>
- <artifactId>joda-time</artifactId>
- <version>2.8.2</version>
- </dependency>
- <dependency>
- <groupId>org.ini4j</groupId>
- <artifactId>ini4j</artifactId>
- <version>0.5.1</version>
- </dependency>
-
- <dependency>
- <artifactId>commons-lang3</artifactId>
- <groupId>org.apache.commons</groupId>
- <version>${common.lang3.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <version>${jetty.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <version>${jetty.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- </dependency>
-
- <dependency>
- <artifactId>commons-io</artifactId>
- <groupId>commons-io</groupId>
- <version>${commons.io.version}</version>
- </dependency>
-
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
- </dependency>
-
- <dependency>
- <artifactId>junit</artifactId>
- <groupId>junit</groupId>
- <scope>test</scope>
- <version>${junit.version}</version>
- </dependency>
-
<dependency>
<artifactId>inlong-common</artifactId>
<groupId>org.apache.inlong</groupId>
@@ -250,39 +66,9 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <artifactId>mockito-core</artifactId>
- <groupId>org.mockito</groupId>
- <scope>test</scope>
- <version>${mockito.version}</version>
- </dependency>
- <dependency>
- <artifactId>byte-buddy</artifactId>
- <groupId>net.bytebuddy</groupId>
- <scope>test</scope>
- <version>${bytebuddy.version}</version>
- </dependency>
-
- <dependency>
- <artifactId>awaitility</artifactId>
- <groupId>org.awaitility</groupId>
- <scope>test</scope>
- <version>${awaitility.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient</artifactId>
- <version>${prometheus.simpleclient.version}</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_hotspot</artifactId>
- <version>${prometheus.simpleclient.version}</version>
- </dependency>
- <dependency>
- <groupId>io.prometheus</groupId>
- <artifactId>simpleclient_httpserver</artifactId>
- <version>${prometheus.simpleclient.version}</version>
+ <artifactId>guava</artifactId>
+ <groupId>com.google.guava</groupId>
+ <version>${guava.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
diff --git a/inlong-audit/audit-docker/pom.xml b/inlong-audit/audit-docker/pom.xml
index 1b55fc3b7..e7c53c9b7 100644
--- a/inlong-audit/audit-docker/pom.xml
+++ b/inlong-audit/audit-docker/pom.xml
@@ -47,7 +47,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven.version}</version>
+ <version>${dockerfile.maven.version}</version>
<executions>
<execution>
<id>default</id>
diff --git a/inlong-common/pom.xml b/inlong-common/pom.xml
index 9194ea559..e7e0e1b97 100644
--- a/inlong-common/pom.xml
+++ b/inlong-common/pom.xml
@@ -50,11 +50,6 @@
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
</dependency>
-<!-- <dependency>-->
-<!-- <groupId>commons-lang</groupId>-->
-<!-- <artifactId>commons-lang</artifactId>-->
-<!-- <version>${common.lang.version}</version>-->
-<!-- </dependency>-->
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
diff --git a/inlong-dashboard/pom.xml b/inlong-dashboard/pom.xml
index 0e8454952..577e7c610 100644
--- a/inlong-dashboard/pom.xml
+++ b/inlong-dashboard/pom.xml
@@ -78,7 +78,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven.version}</version>
+ <version>${dockerfile.maven.version}</version>
<executions>
<execution>
<id>default</id>
diff --git a/inlong-dataproxy/dataproxy-docker/pom.xml b/inlong-dataproxy/dataproxy-docker/pom.xml
index 0cbcaffad..67a13a108 100644
--- a/inlong-dataproxy/dataproxy-docker/pom.xml
+++ b/inlong-dataproxy/dataproxy-docker/pom.xml
@@ -46,7 +46,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven.version}</version>
+ <version>${dockerfile.maven.version}</version>
<executions>
<execution>
<id>default</id>
diff --git a/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/sink/pulsar/federation/TestPulsarProducerFederation.java b/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/sink/pulsar/federation/TestPulsarProducerFederation.java
index 5db519e90..952c6105e 100644
--- a/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/sink/pulsar/federation/TestPulsarProducerFederation.java
+++ b/inlong-dataproxy/dataproxy-source/src/test/java/org/apache/inlong/dataproxy/sink/pulsar/federation/TestPulsarProducerFederation.java
@@ -63,8 +63,7 @@ public class TestPulsarProducerFederation {
public static void setUp() {
Map<String, String> result = new ConcurrentHashMap<>();
try (InputStream inStream = TestPulsarFederationSink.class.getClassLoader().getResource(
- "dataproxy-pulsar.conf")
- .openStream()) {
+ "dataproxy-pulsar.conf").openStream()) {
MockUtils.mockMetricRegister();
Properties props = new Properties();
props.load(inStream);
diff --git a/inlong-dataproxy/pom.xml b/inlong-dataproxy/pom.xml
index b3345b4fc..e2c7d18e6 100644
--- a/inlong-dataproxy/pom.xml
+++ b/inlong-dataproxy/pom.xml
@@ -104,6 +104,10 @@
<groupId>org.mortbay.jetty</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client</artifactId>
@@ -112,11 +116,6 @@
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
@@ -125,21 +124,6 @@
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_httpserver</artifactId>
</dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-junit4</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-module-testng</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <scope>test</scope>
- </dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
@@ -156,6 +140,26 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-junit4</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-module-testng</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.powermock</groupId>
+ <artifactId>powermock-api-mockito2</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/inlong-manager/manager-client-tools/pom.xml b/inlong-manager/manager-client-tools/pom.xml
index 8be81875c..54f9e4335 100644
--- a/inlong-manager/manager-client-tools/pom.xml
+++ b/inlong-manager/manager-client-tools/pom.xml
@@ -38,7 +38,6 @@
<dependency>
<groupId>com.beust</groupId>
<artifactId>jcommander</artifactId>
- <version>${jcommander.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/inlong-manager/manager-client/pom.xml b/inlong-manager/manager-client/pom.xml
index 80e1289a6..5e7552872 100644
--- a/inlong-manager/manager-client/pom.xml
+++ b/inlong-manager/manager-client/pom.xml
@@ -93,11 +93,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
<configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
- <encoding>UTF-8</encoding>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
diff --git a/inlong-manager/manager-dao/pom.xml b/inlong-manager/manager-dao/pom.xml
index 9453a0ea4..49e5ce3f0 100644
--- a/inlong-manager/manager-dao/pom.xml
+++ b/inlong-manager/manager-dao/pom.xml
@@ -241,7 +241,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>${postgres.version}</version>
+ <version>${postgresql.version}</version>
</dependency>
</dependencies>
<configuration>
diff --git a/inlong-manager/manager-docker/pom.xml b/inlong-manager/manager-docker/pom.xml
index ac91990c1..e45751e03 100644
--- a/inlong-manager/manager-docker/pom.xml
+++ b/inlong-manager/manager-docker/pom.xml
@@ -49,7 +49,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven.version}</version>
+ <version>${dockerfile.maven.version}</version>
<executions>
<execution>
<id>default</id>
diff --git a/inlong-manager/manager-service/pom.xml b/inlong-manager/manager-service/pom.xml
index 057186fa1..07c8197d3 100644
--- a/inlong-manager/manager-service/pom.xml
+++ b/inlong-manager/manager-service/pom.xml
@@ -70,19 +70,11 @@
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
- </dependency>
-
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
</dependency>
+
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
@@ -91,6 +83,14 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/inlong-manager/manager-test/pom.xml b/inlong-manager/manager-test/pom.xml
index 012e99c9f..14e3cd07b 100644
--- a/inlong-manager/manager-test/pom.xml
+++ b/inlong-manager/manager-test/pom.xml
@@ -33,14 +33,6 @@
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
</dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-test</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- </dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
@@ -53,10 +45,19 @@
<groupId>org.mvnsearch</groupId>
<artifactId>h2-functions-4-mysql</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-test</artifactId>
+ </dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/inlong-manager/manager-test/src/main/java/org/apache/inlong/manager/test/BaseTest.java b/inlong-manager/manager-test/src/main/java/org/apache/inlong/manager/test/BaseTest.java
index eb43c7018..a588fabd9 100644
--- a/inlong-manager/manager-test/src/main/java/org/apache/inlong/manager/test/BaseTest.java
+++ b/inlong-manager/manager-test/src/main/java/org/apache/inlong/manager/test/BaseTest.java
@@ -17,13 +17,11 @@
package org.apache.inlong.manager.test;
-import org.junit.runner.RunWith;
import org.mvnsearch.h2.H2FunctionsLoader;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.context.annotation.ComponentScan;
import org.springframework.test.context.ActiveProfiles;
-import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.PostConstruct;
import javax.sql.DataSource;
@@ -31,7 +29,6 @@ import javax.sql.DataSource;
@ActiveProfiles(value = {"test"})
@EnableConfigurationProperties
@ComponentScan(basePackages = "org.apache.inlong.manager")
-@RunWith(SpringRunner.class)
public class BaseTest {
@Autowired
diff --git a/inlong-manager/manager-web/bin/startup.sh b/inlong-manager/manager-web/bin/startup.sh
index 6b889a6a8..82962aabd 100755
--- a/inlong-manager/manager-web/bin/startup.sh
+++ b/inlong-manager/manager-web/bin/startup.sh
@@ -91,4 +91,8 @@ JAVA_OPT="${JAVA_OPT} -XX:+IgnoreUnrecognizedVMOptions -XX:+UseConcMarkSweepGC -
#JAVA_OPT="${JAVA_OPT} -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8081"
# Execute the startup command: start the project in the background, and output the log to the logs folder under the project root directory
-nohup java ${JAVA_OPT} -Dlog4j2.formatMsgNoLookups=true -Dlog4j.formatMsgNoLookups=true -cp ${CLASSPATH} ${MAIN_CLASS} 1>startup.log 2>${LOG_DIR}/error.log &
\ No newline at end of file
+<<<<<<< HEAD
+nohup java ${JAVA_OPT} -Dlog4j2.formatMsgNoLookups=true -Dlog4j.formatMsgNoLookups=true -cp ${CLASSPATH} ${MAIN_CLASS} 1>startup.log 2>${LOG_DIR}/error.log &
+=======
+nohup java ${JAVA_OPT} -Dmanager.log.path=${CONFIG_DIR}/logs -Dlog4j2.formatMsgNoLookups=true -Dlog4j.formatMsgNoLookups=true -cp ${CLASSPATH} ${MAIN_CLASS} 1>/dev/null 2>${LOG_DIR}/error.log &
+>>>>>>> [Featue]3622 Tidy up dependencies for all modules
diff --git a/inlong-manager/manager-web/pom.xml b/inlong-manager/manager-web/pom.xml
index 03d914932..990a09301 100644
--- a/inlong-manager/manager-web/pom.xml
+++ b/inlong-manager/manager-web/pom.xml
@@ -41,6 +41,11 @@
<version>${project.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>manager-client-tools</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
@@ -115,11 +120,6 @@
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
</dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>manager-client-tools</artifactId>
- <version>${project.version}</version>
- </dependency>
</dependencies>
<build>
@@ -146,6 +146,7 @@
</resources>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${plugin.surefire.version}</version>
<configuration>
diff --git a/inlong-manager/manager-web/src/main/resources/log4j2.xml b/inlong-manager/manager-web/src/main/resources/log4j2.xml
new file mode 100644
index 000000000..82ad678d3
--- /dev/null
+++ b/inlong-manager/manager-web/src/main/resources/log4j2.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<configuration status="WARN" monitorInterval="30">
+ <Properties>
+ <property name="basePath">${sys:manager.log.path}</property>
+ <property name="log_pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} -%5p ${PID:-} [%15.15t] %-30.30C{1.} : %m%n</property>
+ <property name="every_file_size">1G</property>
+ <property name="output_log_level">DEBUG</property>
+ <property name="rolling_max">50</property>
+ <property name="info_fileName">${basePath}/info.log</property>
+ <property name="info_filePattern">${basePath}/info-%d{yyyy-MM-dd}-%i.log.gz</property>
+ <property name="info_max">10</property>
+ <property name="debug_fileName">${basePath}/debug.log</property>
+ <property name="debug_filePattern">${basePath}/debug-%d{yyyy-MM-dd}-%i.log.gz</property>
+ <property name="debug_max">10</property>
+ <property name="warn_fileName">${basePath}/warn.log</property>
+ <property name="warn_filePattern">${basePath}/warn-%d{yyyy-MM-dd}-%i.log.gz</property>
+ <property name="warn_max">10</property>
+ <property name="error_fileName">${basePath}/error.log</property>
+ <property name="error_filePattern">${basePath}/error-%d{yyyy-MM-dd}-%i.log.gz</property>
+ <property name="error_max">10</property>
+ <property name="console_print_level">DEBUG</property>
+ <property name="index_fileName">${basePath}/index.log</property>
+ <property name="index_filePattern">${basePath}/index-%d{yyyy-MM-dd}-%i.log.gz</property>
+ <property name="monitors_fileName">${basePath}/monitors.log</property>
+ <property name="monitors_filePattern">${basePath}/monitors-%d{yyyy-MM-dd}-%i.log.gz</property>
+ </Properties>
+
+ <conversionRule conversionWord="clr"
+ converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
+ <conversionRule conversionWord="wex"
+ converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
+ <conversionRule conversionWord="wEx"
+ converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
+
+ <appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <ThresholdFilter level="${console_print_level}" onMatch="ACCEPT" onMismatch="DENY"/>
+ <PatternLayout pattern="${log_pattern}"/>
+ </Console>
+
+ <RollingFile name="DebugFile" fileName="${debug_fileName}" filePattern="${debug_filePattern}">
+ <PatternLayout pattern="${log_pattern}"/>
+ <SizeBasedTriggeringPolicy size="${every_file_size}"/>
+ <DefaultRolloverStrategy max="${debug_max}" />
+ <Filters>
+ <ThresholdFilter level="WARN" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="INFO" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
+ </Filters>
+ </RollingFile>
+
+ <RollingFile name="InfoFile" fileName="${info_fileName}" filePattern="${info_filePattern}">
+ <PatternLayout pattern="${log_pattern}"/>
+ <SizeBasedTriggeringPolicy size="${every_file_size}"/>
+ <DefaultRolloverStrategy max="${info_max}" />
+ <Filters>
+ <ThresholdFilter level="WARN" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+ </Filters>
+ </RollingFile>
+
+ <RollingFile name="IndexFile" fileName="${index_fileName}" filePattern="${index_filePattern}">
+ <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %m%n"/>
+ <SizeBasedTriggeringPolicy size="${every_file_size}"/>
+ <DefaultRolloverStrategy max="${info_max}" />
+ <Filters>
+ <ThresholdFilter level="WARN" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+ </Filters>
+ </RollingFile>
+
+ <RollingFile name="MonitorFile" fileName="${monitors_fileName}" filePattern="${monitors_filePattern}">
+ <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %m%n"/>
+ <SizeBasedTriggeringPolicy size="${every_file_size}"/>
+ <DefaultRolloverStrategy max="${info_max}" />
+ <Filters>
+ <ThresholdFilter level="WARN" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+ </Filters>
+ </RollingFile>
+
+ <RollingFile name="WarnFile" fileName="${warn_fileName}" filePattern="${warn_filePattern}">
+ <PatternLayout pattern="${log_pattern}"/>
+ <SizeBasedTriggeringPolicy size="${every_file_size}"/>
+ <DefaultRolloverStrategy max="${warn_max}" />
+ <Filters>
+ <ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
+ </Filters>
+ </RollingFile>
+
+ <RollingFile name="ErrorFile" fileName="${error_fileName}" filePattern="${error_filePattern}">
+ <PatternLayout pattern="${log_pattern}"/>
+ <SizeBasedTriggeringPolicy size="${every_file_size}"/>
+ <DefaultRolloverStrategy max="${error_max}" />
+ <Filters>
+ <ThresholdFilter level="FATAL" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
+ </Filters>
+ </RollingFile>
+ </appenders>
+
+ <loggers>
+ <logger name="org.apache.pulsar" level="info" additivity="false">
+ <appender-ref ref="InfoFile"/>
+ </logger>
+ <root level="${output_log_level}">
+ <appender-ref ref="Console"/>
+ <appender-ref ref="DebugFile"/>
+ <appender-ref ref="InfoFile"/>
+ <appender-ref ref="WarnFile"/>
+ <appender-ref ref="ErrorFile"/>
+ </root>
+ </loggers>
+</configuration>
\ No newline at end of file
diff --git a/inlong-manager/manager-web/src/main/resources/logback-spring.xml b/inlong-manager/manager-web/src/main/resources/logback-spring.xml
deleted file mode 100644
index 2fd5e2b48..000000000
--- a/inlong-manager/manager-web/src/main/resources/logback-spring.xml
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
--->
-
-<configuration scan="true" scanPeriod="1000">
- <contextName>logback</contextName>
-
- <!-- The defined value will be inserted into the logger context. After definition, you can use "${}" to use variables. -->
- <property name="log.path" value="logs"/>
-
- <!--0. Log format and color rendering -->
- <!-- The rendering class that the color log depends on -->
- <conversionRule conversionWord="clr"
- converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
- <conversionRule conversionWord="wex"
- converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
- <conversionRule conversionWord="wEx"
- converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
- <!-- Color log format -->
- <property name="CONSOLE_LOG_PATTERN"
- value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
- <!--1. Output to the console-->
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
- <!-- Set character set -->
- <charset>UTF-8</charset>
- </encoder>
- </appender>
-
- <!--Application log, time rolling output -->
- <appender name="APP_LOG_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <!-- The path and file name of the log file being recorded -->
- <file>${log.path}/manager-web.log</file>
- <!--Log file output format-->
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
- <charset>UTF-8</charset>
- </encoder>
- <!-- The rolling strategy of the logger, record by date, by size -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <!-- Daily log archive path and format -->
- <fileNamePattern>${log.path}/info-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy
- class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <!--Number of days to keep log files-->
- <maxHistory>15</maxHistory>
- </rollingPolicy>
- <!-- This log file only records info level -->
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>info</level>
- </filter>
- </appender>
-
- <!-- 2.3 Level is WARN log, time rolling output -->
- <appender name="WARN_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <!-- The path and file name of the log file being recorded -->
- <file>${log.path}/warn.log</file>
- <!--Log file output format-->
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
- <charset>UTF-8</charset> <!-- Set the character set here -->
- </encoder>
- <!-- The rolling strategy of the logger, record by date, by size -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${log.path}/warn-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy
- class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <!--Number of days to keep log files-->
- <maxHistory>15</maxHistory>
- </rollingPolicy>
- <!-- This log file only records warn level -->
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>warn</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <!-- 2.4 Level is ERROR log, time rolling output -->
- <appender name="ERROR_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <!-- The path and file name of the log file being recorded -->
- <file>${log.path}/error.log</file>
- <!--Log file output format-->
- <encoder>
- <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50}:%L - %msg%n</pattern>
- <charset>UTF-8</charset> <!-- Set the character set here -->
- </encoder>
- <!-- The rolling strategy of the logger, record by date, by size -->
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <fileNamePattern>${log.path}/error-%d{yyyy-MM-dd}.%i.log</fileNamePattern>
- <timeBasedFileNamingAndTriggeringPolicy
- class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- <!--Number of days to keep log files-->
- <maxHistory>15</maxHistory>
- </rollingPolicy>
- <!-- This log file only records ERROR level -->
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>ERROR</level>
- <onMatch>ACCEPT</onMatch>
- <onMismatch>DENY</onMismatch>
- </filter>
- </appender>
-
- <root level="info">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="APP_LOG_FILE"/>
- <appender-ref ref="WARN_FILE"/>
- <appender-ref ref="ERROR_FILE"/>
- </root>
-
-</configuration>
diff --git a/inlong-manager/pom.xml b/inlong-manager/pom.xml
index a8b3d3df4..67a78dd32 100644
--- a/inlong-manager/pom.xml
+++ b/inlong-manager/pom.xml
@@ -43,53 +43,16 @@
<module>manager-client-tools</module>
</modules>
- <properties>
- <java.version>1.8</java.version>
- <java.compile.version>1.8</java.compile.version>
- <mybatis.version>3.5.6</mybatis.version>
- <mybatis.starter.version>2.1.0</mybatis.starter.version>
- <pagehelper.version>5.2.0</pagehelper.version>
- <pagehelper.springboot.version>1.3.0</pagehelper.springboot.version>
- <h2.version>2.1.210</h2.version>
- <h2-mysql.version>2.0.0</h2-mysql.version>
- <shiro.version>1.8.0</shiro.version>
- <hive.version>3.1.2</hive.version>
- <elasticsearch.version>6.8.23</elasticsearch.version>
- <servlet-api.version>2.5</servlet-api.version>
- <servlet.jsp-api.version>2.3.3</servlet.jsp-api.version>
- <reflections.version>0.10.2</reflections.version>
- <opencsv.version>5.4</opencsv.version>
- <httpcore.version>4.4.14</httpcore.version>
- <httpclient.version>4.5.13</httpclient.version>
- <junit.version>4.12</junit.version>
- <ini4j.version>0.5.1</ini4j.version>
- <knife4j.version>2.0.5</knife4j.version>
- <swagger.version>3.0.0</swagger.version>
- <swagger-annotations.version>1.6.2</swagger-annotations.version>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <checkstyle.version>6.19</checkstyle.version>
- <project.build.encoding>UTF-8</project.build.encoding>
- <plugin.compile.version>3.8.1</plugin.compile.version>
- <plugin.surefire.version>2.22.2</plugin.surefire.version>
- <plugin.failsafe.version>2.22.0</plugin.failsafe.version>
- <dockerfile-maven.version>1.4.13</dockerfile-maven.version>
- <okhttp.version>3.14.9</okhttp.version>
- <fastjson.version>1.2.76</fastjson.version>
- <flink-clients.version>1.13.5</flink-clients.version>
- <junit.version>4.12</junit.version>
- <commons-io.version>2.11.0</commons-io.version>
- <flink-core.version>1.13.5</flink-core.version>
- <jackson-core>2.13.1</jackson-core>
- <docker.organization>inlong</docker.organization>
- <project.build.encoding>UTF-8</project.build.encoding>
- <jcommander.version>1.78</jcommander.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -103,7 +66,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <version>${spring.boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -127,366 +89,6 @@
</dependency>
</dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter</artifactId>
- <version>${spring.boot.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- <version>${spring.boot.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-validation</artifactId>
- <version>${spring.boot.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-clients_2.11</artifactId>
- <version>${flink-clients.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${flink-core.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-cache</artifactId>
- <version>${spring.boot.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mybatis.spring.boot</groupId>
- <artifactId>mybatis-spring-boot-starter</artifactId>
- <version>${mybatis.starter.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-configuration-processor</artifactId>
- <version>${spring.boot.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jdbc</artifactId>
- <version>${spring.boot.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- <version>${spring.boot.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- <version>${log4j2.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-aop</artifactId>
- <version>${spring.boot.version}</version>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-web</artifactId>
- <version>${spring.version}</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis</artifactId>
- <version>${mybatis.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper</artifactId>
- <version>${pagehelper.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>${pagehelper.springboot.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client</artifactId>
- <version>${pulsar.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client-admin</artifactId>
- <version>${pulsar.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid-spring-boot-starter</artifactId>
- <version>${druid.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-spring</artifactId>
- <version>${shiro.version}</version>
- </dependency>
- <dependency>
- <groupId>org.postgresql</groupId>
- <artifactId>postgresql</artifactId>
- <version>${postgres.version}</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <version>${jackson.databind.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.datatype</groupId>
- <artifactId>jackson-datatype-jsr310</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.dataformat</groupId>
- <artifactId>jackson-dataformat-yaml</artifactId>
- <version>${jackson.version}</version>
- </dependency>
- <dependency>
- <groupId>org.reflections</groupId>
- <artifactId>reflections</artifactId>
- <version>${reflections.version}</version>
- </dependency>
-
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-annotations</artifactId>
- <version>${swagger-annotations.version}</version>
- </dependency>
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
- <version>${knife4j.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-to-slf4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.ini4j</groupId>
- <artifactId>ini4j</artifactId>
- <version>${ini4j.version}</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>${swagger.version}</version>
- </dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>${swagger.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-jdbc</artifactId>
- <version>${hive.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <version>${hive.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-annotations</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- <version>2.8.6</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.shiro</groupId>
- <artifactId>shiro-core</artifactId>
- <version>${shiro.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.11</version>
- </dependency>
- <dependency>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- <version>2.11.0</version>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- <version>3.2.2</version>
- </dependency>
- <dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>1.3</version>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>${servlet-api.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>com.opencsv</groupId>
- <artifactId>opencsv</artifactId>
- <version>${opencsv.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>${httpcore.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
-
- <!-- elastic search -->
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-high-level-client</artifactId>
- <version>${elasticsearch.version}</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client</artifactId>
- <version>${elasticsearch.version}</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch</groupId>
- <artifactId>elasticsearch</artifactId>
- <version>${elasticsearch.version}</version>
- </dependency>
- <dependency>
- <groupId>org.elasticsearch.client</groupId>
- <artifactId>elasticsearch-rest-client-sniffer</artifactId>
- <version>${elasticsearch.version}</version>
- </dependency>
- <dependency>
- <groupId>com.squareup.okhttp3</groupId>
- <artifactId>okhttp</artifactId>
- <version>${okhttp.version}</version>
- </dependency>
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>${fastjson.version}</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>${junit.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mockito</groupId>
- <artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-test</artifactId>
- <version>${spring.boot.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
- <version>${spring.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.powermock</groupId>
- <artifactId>powermock-api-mockito2</artifactId>
- <version>${powermock.version}</version>
- </dependency>
- <dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>${h2.version}</version>
- <!--<scope>test</scope>-->
- </dependency>
- <dependency>
- <groupId>org.mvnsearch</groupId>
- <artifactId>h2-functions-4-mysql</artifactId>
- <version>${h2-mysql.version}</version>
- <!--<scope>test</scope>-->
- </dependency>
- </dependencies>
- </dependencyManagement>
<repositories>
<repository>
<id>central</id>
@@ -522,10 +124,12 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>${plugin.surefire.version}</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-failsafe-plugin</artifactId>
<version>${plugin.failsafe.version}</version>
</plugin>
diff --git a/inlong-sdk/dataproxy-sdk/pom.xml b/inlong-sdk/dataproxy-sdk/pom.xml
index 274a42c40..23f69c33c 100644
--- a/inlong-sdk/dataproxy-sdk/pom.xml
+++ b/inlong-sdk/dataproxy-sdk/pom.xml
@@ -29,112 +29,83 @@
<artifactId>dataproxy-sdk</artifactId>
<name>Apache InLong - DataProxy SDK</name>
<packaging>jar</packaging>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.8</source>
- <target>1.8</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-release-plugin</artifactId>
- <version>2.5.3</version>
- <configuration>
- <autoVersionSubmodules>true</autoVersionSubmodules>
- <tagNameFormat>v@{project.version}</tagNameFormat>
- <releaseProfiles>release</releaseProfiles>
- <arguments>-Dmaven.javadoc.skip=true -Dmaven.test.skipTests=true -Dmaven.test.skip=true
- -Dmaven.deploy.skip=true
- </arguments>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <plugin.compile.version>3.8.1</plugin.compile.version>
- <netty.version>4.1.72.Final</netty.version>
- </properties>
<dependencies>
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.10</version>
- <scope>test</scope>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sdk-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.10</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport</artifactId>
- <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-handler</artifactId>
- <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-common</artifactId>
- <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-codec</artifactId>
- <version>${netty.version}</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-transport-native-epoll</artifactId>
- <version>${netty.version}</version>
</dependency>
- <!--<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <type>jar</type>
- </dependency>-->
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
- <version>2.8.5</version>
</dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5.13</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.11.0</version>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.6</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
- <version>1.1.0</version>
</dependency>
-
<dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sdk-common</artifactId>
- <version>${project.version}</version>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
</dependency>
</dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.3</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <tagNameFormat>v@{project.version}</tagNameFormat>
+ <releaseProfiles>release</releaseProfiles>
+ <arguments>-Dmaven.javadoc.skip=true -Dmaven.test.skipTests=true -Dmaven.test.skip=true
+ -Dmaven.deploy.skip=true
+ </arguments>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
diff --git a/inlong-sdk/pom.xml b/inlong-sdk/pom.xml
index 74783a671..a831f71f3 100644
--- a/inlong-sdk/pom.xml
+++ b/inlong-sdk/pom.xml
@@ -37,99 +37,65 @@
<module>dataproxy-sdk</module>
</modules>
- <properties>
- <compiler.source>1.8</compiler.source>
- <compiler.target>1.8</compiler.target>
- <flume.version>1.9.0</flume.version>
- <plugin.assembly.version>3.2.0</plugin.assembly.version>
- <codec.version>1.15</codec.version>
- <junit.version>4.13</junit.version>
- <powermock.version>2.0.2</powermock.version>
- <guava.version>19.0</guava.version>
- <skipTests>false</skipTests>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <protobuf-version>2.5.0</protobuf-version>
- <snappy-version>1.1.8.4</snappy-version>
- <fastjson.version>1.2.79</fastjson.version>
- <log4j.version>2.17.1</log4j.version>
- <mockito.version>2.23.0</mockito.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-core</artifactId>
- <version>${flume.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-node</artifactId>
- <version>${flume.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-sdk</artifactId>
- <version>${flume.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flume</groupId>
<artifactId>flume-ng-configuration</artifactId>
- <version>${flume.version}</version>
</dependency>
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
</dependency>
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
- <version>${protobuf-version}</version>
</dependency>
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
- <version>${snappy-version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
- <version>${fastjson.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>${log4j.version}</version>
</dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>${guava.version}</version>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
- <version>${powermock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<artifactId>mockito-core</artifactId>
<groupId>org.mockito</groupId>
<scope>test</scope>
- <version>${mockito.version}</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/inlong-sdk/sdk-common/pom.xml b/inlong-sdk/sdk-common/pom.xml
index f77e53686..e28b45a83 100644
--- a/inlong-sdk/sdk-common/pom.xml
+++ b/inlong-sdk/sdk-common/pom.xml
@@ -31,14 +31,6 @@
<artifactId>sdk-common</artifactId>
<name>Apache InLong - SDK Common</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- <compiler.source>1.8</compiler.source>
- <compiler.target>1.8</compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.inlong</groupId>
diff --git a/inlong-sdk/sort-sdk/pom.xml b/inlong-sdk/sort-sdk/pom.xml
index 8f7fd6523..940ada155 100644
--- a/inlong-sdk/sort-sdk/pom.xml
+++ b/inlong-sdk/sort-sdk/pom.xml
@@ -30,6 +30,41 @@
<version>1.1.0-incubating-SNAPSHOT</version>
<name>Apache InLong - Sort SDK</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>inlong-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sdk-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>tubemq-client</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pulsar</groupId>
+ <artifactId>pulsar-client</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
+ </dependency>
+ </dependencies>
+
<build>
<pluginManagement>
<plugins>
@@ -46,8 +81,9 @@
<version>3.8.0</version>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.1</version>
+ <version>${plugin.surefire.version}</version>
</plugin>
<plugin>
<artifactId>maven-jar-plugin</artifactId>
@@ -73,58 +109,4 @@
</pluginManagement>
</build>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <plugin.compile.version>3.8.1</plugin.compile.version>
- <pulsar.version>2.8.1</pulsar.version>
- <kafka.version>2.4.1</kafka.version>
- <httpclient.version>4.5.13</httpclient.version>
- <snappy-java.version>1.1.7.3</snappy-java.version>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>inlong-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>tubemq-client</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client</artifactId>
- <version>${pulsar.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>${kafka.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sdk-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>${httpclient.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>${snappy-java.version}</version>
- </dependency>
-
- </dependencies>
-
</project>
diff --git a/inlong-sort-standalone/pom.xml b/inlong-sort-standalone/pom.xml
index 41be7d9a0..628f0feab 100644
--- a/inlong-sort-standalone/pom.xml
+++ b/inlong-sort-standalone/pom.xml
@@ -49,7 +49,6 @@
<protobuf-version>3.19.4</protobuf-version>
<guava.version>19.0</guava.version>
<skipTests>false</skipTests>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<compiler.source>1.8</compiler.source>
<compiler.target>1.8</compiler.target>
<hive.version>2.3.9</hive.version>
diff --git a/inlong-sort-standalone/sort-standalone-common/pom.xml b/inlong-sort-standalone/sort-standalone-common/pom.xml
index 51c216200..dceb04cf0 100644
--- a/inlong-sort-standalone/sort-standalone-common/pom.xml
+++ b/inlong-sort-standalone/sort-standalone-common/pom.xml
@@ -30,12 +30,6 @@
<name>Apache InLong - Sort Standalone Common</name>
<artifactId>sort-standalone-common</artifactId>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <compiler.source>1.8</compiler.source>
- <compiler.target>1.8</compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.inlong</groupId>
diff --git a/inlong-sort-standalone/sort-standalone-dist/pom.xml b/inlong-sort-standalone/sort-standalone-dist/pom.xml
index 7f567593b..ff236ed30 100644
--- a/inlong-sort-standalone/sort-standalone-dist/pom.xml
+++ b/inlong-sort-standalone/sort-standalone-dist/pom.xml
@@ -32,11 +32,6 @@
<packaging>pom</packaging>
<name>Apache InLong - Sort Standalone Dist</name>
- <properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
diff --git a/inlong-sort-standalone/sort-standalone-source/pom.xml b/inlong-sort-standalone/sort-standalone-source/pom.xml
index 3975b7843..8ba8c4882 100644
--- a/inlong-sort-standalone/sort-standalone-source/pom.xml
+++ b/inlong-sort-standalone/sort-standalone-source/pom.xml
@@ -30,12 +30,6 @@
<name>Apache InLong - Sort Standalone Source</name>
<artifactId>sort-standalone-source</artifactId>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <compiler.source>1.8</compiler.source>
- <compiler.target>1.8</compiler.target>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.inlong</groupId>
diff --git a/inlong-sort/pom.xml b/inlong-sort/pom.xml
index 3871c74e9..342834e8b 100644
--- a/inlong-sort/pom.xml
+++ b/inlong-sort/pom.xml
@@ -33,36 +33,6 @@
<name>Apache InLong - Sort</name>
<packaging>pom</packaging>
- <properties>
- <sort.project.encoding>UTF-8</sort.project.encoding>
- <project.build.sourceEncoding>${sort.project.encoding}</project.build.sourceEncoding>
- <project.reporting.outputEncoding>${sort.project.encoding}</project.reporting.outputEncoding>
- <maven.compiler.encoding>${sort.project.encoding}</maven.compiler.encoding>
- <java.version>1.8</java.version>
- <maven.compiler.source>${java.version}</maven.compiler.source>
- <maven.compiler.target>${java.version}</maven.compiler.target>
-
- <flink.version>1.13.5</flink.version>
- <flink.scala.binary.version>2.11</flink.scala.binary.version>
- <guava.version>18.0</guava.version>
- <junit.version>4.12</junit.version>
- <hamcrest.version>1.3</hamcrest.version>
- <slf4j.version>1.7.15</slf4j.version>
- <log4j.version>2.17.1</log4j.version>
- <mockito.version>3.6.28</mockito.version>
- <curator.version>2.12.0</curator.version>
- <log4j.configuration>log4j-test.properties</log4j.configuration>
- <tubemq.version>${project.version}</tubemq.version>
- <commons-lang3.version>3.3.2</commons-lang3.version>
- <clickhouse-jdbc.version>0.3.1</clickhouse-jdbc.version>
- <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>
- <hive.version>2.3.8</hive.version>
- <pulsar.version>2.8.1</pulsar.version>
- <kafka.version>2.4.1</kafka.version>
- </properties>
-
<modules>
<module>sort-api</module>
<module>sort-common</module>
@@ -77,347 +47,42 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
- <version>${log4j.version}</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
- <version>${hamcrest.version}</version>
<type>jar</type>
<scope>test</scope>
</dependency>
-
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
<scope>test</scope>
</dependency>
</dependencies>
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>tubemq-client</artifactId>
- <version>${tubemq.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>inlong-common</artifactId>
- <version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-api</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>snappy-java</artifactId>
- <groupId>org.xerial.snappy</groupId>
- </exclusion>
- <exclusion>
- <artifactId>guava</artifactId>
- <groupId>com.google.guava</groupId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <version>${flink.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${flink.scala.binary.version}</artifactId>
- <version>${flink.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-table-common</artifactId>
- <version>${flink.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-table-runtime-blink_${flink.scala.binary.version}</artifactId>
- <version>${flink.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-parquet_${flink.scala.binary.version}</artifactId>
- <version>${flink.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-connector-kafka_${flink.scala.binary.version}</artifactId>
- <version>${flink.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-json</artifactId>
- <version>${flink.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-avro</artifactId>
- <version>${flink.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-shaded-jackson</artifactId>
- <version>${flink.jackson.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
- <version>${curator.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
- <version>${curator.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-test</artifactId>
- <version>${curator.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
- </dependency>
-
- <dependency>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- <version>${jsr.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-jdbc</artifactId>
- <version>${hive.version}</version>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-web</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hbase</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>jersey-json</artifactId>
- <groupId>com.sun.jersey</groupId>
- </exclusion>
- <exclusion>
- <artifactId>snappy-java</artifactId>
- <groupId>org.xerial.snappy</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-logging</artifactId>
- <groupId>commons-logging</groupId>
- </exclusion>
- <exclusion>
- <groupId>commons-io</groupId>
- <artifactId>commons-io</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-lang</groupId>
- <artifactId>commons-lang</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-minicluster</artifactId>
- <version>${hadoop.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.avro</groupId>
- <artifactId>avro</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
- <version>${hive.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.parquet</groupId>
- <artifactId>parquet-hadoop-bundle</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hbase</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-exec</artifactId>
- <version>${hive.version}</version>
- <exclusions>
- <exclusion>
- <groupId>org.pentaho</groupId>
- <artifactId>pentaho-aggdesigner-algorithm</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- <exclusion>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-compress</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.hbase</groupId>
- <artifactId>*</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.pulsar</groupId>
- <artifactId>pulsar-client-all</artifactId>
- <version>${pulsar.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka_${flink.scala.binary.version}</artifactId>
- <version>${kafka.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.zookeeper</groupId>
- <artifactId>zookeeper</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-test-utils_${flink.scala.binary.version}</artifactId>
- <version>${flink.version}</version>
- <scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-slf4j-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.apache.logging.log4j</groupId>
- <artifactId>log4j-core</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>ru.yandex.clickhouse</groupId>
- <artifactId>clickhouse-jdbc</artifactId>
- <version>${clickhouse-jdbc.version}</version>
- </dependency>
-
- </dependencies>
- </dependencyManagement>
-
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.1</version>
+ <version>${plugin.surefire.version}</version>
<configuration>
<!-- Enforce single fork execution due to heavy mini cluster use in the tests -->
<forkCount>1</forkCount>
diff --git a/inlong-sort/sort-common/pom.xml b/inlong-sort/sort-common/pom.xml
index 271f60a7d..f1792b18a 100644
--- a/inlong-sort/sort-common/pom.xml
+++ b/inlong-sort/sort-common/pom.xml
@@ -40,33 +40,28 @@
</properties>
<dependencies>
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-format-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-common</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-shaded-jackson</artifactId>
- <version>${flink.jackson.version}</version>
</dependency>
-
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.curator</groupId>
<artifactId>curator-framework</artifactId>
diff --git a/inlong-sort/sort-connectors/pom.xml b/inlong-sort/sort-connectors/pom.xml
index 1fda70f4d..d64f76df9 100644
--- a/inlong-sort/sort-connectors/pom.xml
+++ b/inlong-sort/sort-connectors/pom.xml
@@ -39,86 +39,69 @@
<artifactId>sort-common</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-format-base</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-format-common</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${flink.scala.binary.version}</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
- <version>${flink.version}</version>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-parquet_${flink.scala.binary.version}</artifactId>
</dependency>
-
<!--for clickhouse-->
<dependency>
<groupId>ru.yandex.clickhouse</groupId>
<artifactId>clickhouse-jdbc</artifactId>
</dependency>
-
<!--for hive-->
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.orc</groupId>
<artifactId>orc-core</artifactId>
- <version>1.6.7</version>
<classifier>nohive</classifier>
</dependency>
-
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-minicluster</artifactId>
<scope>test</scope>
</dependency>
-
<!--for doris-->
<dependency>
<groupId>org.antlr</groupId>
<artifactId>ST4</artifactId>
- <version>4.0.4</version>
</dependency>
-
<!--for pulsar-->
<dependency>
<groupId>org.apache.pulsar</groupId>
<artifactId>pulsar-client-all</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils_${flink.scala.binary.version}</artifactId>
diff --git a/inlong-sort/sort-core/pom.xml b/inlong-sort/sort-core/pom.xml
index 673a794ea..076505ce6 100644
--- a/inlong-sort/sort-core/pom.xml
+++ b/inlong-sort/sort-core/pom.xml
@@ -50,87 +50,108 @@
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>tubemq-client</artifactId>
+ <version>${project.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-core</artifactId>
- <scope>provided</scope>
- </dependency>
<dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-java_${flink.scala.binary.version}</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-format-base</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.flink</groupId>
- <artifactId>flink-table-common</artifactId>
- <version>${flink.version}</version>
- <scope>provided</scope>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-format-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-format-csv</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-framework</artifactId>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-format-kv</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-recipes</artifactId>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-format-inlongmsg-base</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.curator</groupId>
- <artifactId>curator-test</artifactId>
- <scope>test</scope>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-format-inlongmsg-csv</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>audit-sdk</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-base</artifactId>
+ <artifactId>inlong-common</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-common</artifactId>
+ <artifactId>sort-api</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-csv</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-core</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-kv</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-streaming-java_${flink.scala.binary.version}</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-inlongmsg-base</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-common</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-inlongmsg-csv</artifactId>
- <version>${project.version}</version>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-test</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
</dependency>
<dependency>
@@ -154,12 +175,6 @@
<artifactId>hive-jdbc</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>audit-sdk</artifactId>
- <version>${project.version}</version>
- </dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-test-utils_${flink.scala.binary.version}</artifactId>
@@ -180,7 +195,6 @@
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>pulsar</artifactId>
- <version>1.15.3</version>
<scope>test</scope>
</dependency>
@@ -192,23 +206,9 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-api</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
<dependency>
<groupId>org.xerial.snappy</groupId>
<artifactId>snappy-java</artifactId>
- <version>${snappy.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>inlong-common</artifactId>
<scope>test</scope>
</dependency>
diff --git a/inlong-sort/sort-formats/format-inlongmsg-base/pom.xml b/inlong-sort/sort-formats/format-inlongmsg-base/pom.xml
index 3a97cad02..0bc851313 100644
--- a/inlong-sort/sort-formats/format-inlongmsg-base/pom.xml
+++ b/inlong-sort/sort-formats/format-inlongmsg-base/pom.xml
@@ -41,53 +41,49 @@
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-common</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>${guava.version}</version>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-format-common</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.xerial.snappy</groupId>
- <artifactId>snappy-java</artifactId>
- <version>${snappy.version}</version>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>sort-format-base</artifactId>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>${commons-lang3.version}</version>
- <scope>provided</scope>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-common</artifactId>
- <version>${project.version}</version>
+ <groupId>org.xerial.snappy</groupId>
+ <artifactId>snappy-java</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>sort-format-base</artifactId>
- <version>${project.version}</version>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
- <version>${flink.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
- <version>${flink.version}</version>
<scope>provided</scope>
</dependency>
diff --git a/inlong-sort/sort-formats/pom.xml b/inlong-sort/sort-formats/pom.xml
index 4240bd85a..1f07568ea 100644
--- a/inlong-sort/sort-formats/pom.xml
+++ b/inlong-sort/sort-formats/pom.xml
@@ -60,12 +60,6 @@
</modules>
<properties>
- <joda.version>2.5</joda.version>
- <commons.compress.version>1.18</commons.compress.version>
- <commons.codec.version>1.10</commons.codec.version>
- <protobuf.version>3.11.4</protobuf.version>
- <dbsync-common-version>0.0.2-SNAPSHOT</dbsync-common-version>
- <jsr.version>1.3.9</jsr.version>
<flink.forkCount>1C</flink.forkCount>
<flink.reuseForks>true</flink.reuseForks>
<log4j.configuration>log4j-test.properties</log4j.configuration>
@@ -79,21 +73,18 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <version>${slf4j.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>com.google.code.findbugs</groupId>
<artifactId>jsr305</artifactId>
- <version>${jsr.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.12</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -101,7 +92,6 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
- <version>${mockito.version}</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -109,7 +99,6 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-module-junit4</artifactId>
- <version>2.0.0-RC.4</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -117,7 +106,6 @@
<dependency>
<groupId>org.powermock</groupId>
<artifactId>powermock-api-mockito2</artifactId>
- <version>2.0.0-RC.4</version>
<type>jar</type>
<scope>test</scope>
<exclusions>
@@ -131,7 +119,6 @@
<dependency>
<groupId>org.hamcrest</groupId>
<artifactId>hamcrest-all</artifactId>
- <version>1.3</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -139,7 +126,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
- <version>${slf4j.version}</version>
<type>jar</type>
<scope>test</scope>
</dependency>
@@ -151,10 +137,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.8.0</version>
<configuration>
- <source>${java.version}</source>
- <target>${java.version}</target>
<!-- The semantics of this option are reversed, see MCOMPILER-209. -->
<useIncrementalCompilation>false</useIncrementalCompilation>
<compilerArgs>
@@ -187,7 +170,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.1</version>
+ <version>${plugin.surefire.version}</version>
<configuration>
<forkCount>${flink.forkCount}</forkCount>
<reuseForks>${flink.reuseForks}</reuseForks>
diff --git a/inlong-sort/sort-single-tenant/pom.xml b/inlong-sort/sort-single-tenant/pom.xml
index d4c5c50f1..55f3224ce 100644
--- a/inlong-sort/sort-single-tenant/pom.xml
+++ b/inlong-sort/sort-single-tenant/pom.xml
@@ -34,13 +34,16 @@
<packaging>jar</packaging>
<dependencies>
-
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>inlong-common</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-common</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-connectors</artifactId>
@@ -52,40 +55,38 @@
</exclusion>
</exclusions>
</dependency>
-
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-format-base</artifactId>
<version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>sort-format-json</artifactId>
<version>${project.version}</version>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.inlong</groupId>
+ <artifactId>audit-sdk</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-core</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-streaming-java_${flink.scala.binary.version}</artifactId>
<scope>provided</scope>
</dependency>
-
<dependency>
<groupId>org.apache.flink</groupId>
<artifactId>flink-table-common</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-flink</artifactId>
- <version>0.12.1</version>
<exclusions>
<exclusion>
<groupId>org.apache.avro</groupId>
@@ -125,33 +126,19 @@
<artifactId>flink-shaded-jackson</artifactId>
</dependency>
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>inlong-common</artifactId>
- </dependency>
-
<dependency>
<groupId>com.qcloud</groupId>
<artifactId>chdfs_hadoop_plugin_network</artifactId>
- <version>2.5</version>
</dependency>
<dependency>
<groupId>com.qcloud.cos</groupId>
<artifactId>flink-cos-fs-hadoop</artifactId>
- <version>1.10.0-0.1.10</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>2.12.6.1</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.inlong</groupId>
- <artifactId>audit-sdk</artifactId>
- <version>${project.version}</version>
</dependency>
<!-- test -->
diff --git a/inlong-tubemq/pom.xml b/inlong-tubemq/pom.xml
index bc20cb6b0..a953e8eb1 100644
--- a/inlong-tubemq/pom.xml
+++ b/inlong-tubemq/pom.xml
@@ -76,7 +76,7 @@
<mockito.version>2.18.0</mockito.version>
<powermock.version>2.0.4</powermock.version>
<exec.maven.version>1.6.0</exec.maven.version>
- <plugin.assembly.version>3.2.0</plugin.assembly.version>
+ <plugin.assembly.version>3.3.0</plugin.assembly.version>
<build.helper.maven.version>3.0.0</build.helper.maven.version>
<protobuf.version>3.19.4</protobuf.version>
<je.version>7.3.7</je.version>
@@ -107,11 +107,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
- <encoding>UTF-8</encoding>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
@@ -158,7 +154,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
- <version>2.22.2</version>
+ <version>${plugin.surefire.version}</version>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
diff --git a/inlong-tubemq/tubemq-connectors/pom.xml b/inlong-tubemq/tubemq-connectors/pom.xml
index 035e254be..af6bba759 100644
--- a/inlong-tubemq/tubemq-connectors/pom.xml
+++ b/inlong-tubemq/tubemq-connectors/pom.xml
@@ -52,11 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
- <encoding>UTF-8</encoding>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
diff --git a/inlong-tubemq/tubemq-docker/pom.xml b/inlong-tubemq/tubemq-docker/pom.xml
index e542e0467..9910de7a1 100644
--- a/inlong-tubemq/tubemq-docker/pom.xml
+++ b/inlong-tubemq/tubemq-docker/pom.xml
@@ -49,11 +49,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
- <encoding>UTF-8</encoding>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
diff --git a/inlong-tubemq/tubemq-docker/tubemq-all/pom.xml b/inlong-tubemq/tubemq-docker/tubemq-all/pom.xml
index 9bbfdb994..cfca1269d 100644
--- a/inlong-tubemq/tubemq-docker/tubemq-all/pom.xml
+++ b/inlong-tubemq/tubemq-docker/tubemq-all/pom.xml
@@ -49,7 +49,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven.version}</version>
+ <version>${dockerfile.maven.version}</version>
<executions>
<execution>
<id>default</id>
diff --git a/inlong-tubemq/tubemq-docker/tubemq-build/pom.xml b/inlong-tubemq/tubemq-docker/tubemq-build/pom.xml
index c62458e4c..1fb0b113c 100644
--- a/inlong-tubemq/tubemq-docker/tubemq-build/pom.xml
+++ b/inlong-tubemq/tubemq-docker/tubemq-build/pom.xml
@@ -39,7 +39,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven.version}</version>
+ <version>${dockerfile.maven.version}</version>
<executions>
<execution>
<id>default</id>
diff --git a/inlong-tubemq/tubemq-docker/tubemq-cpp/pom.xml b/inlong-tubemq/tubemq-docker/tubemq-cpp/pom.xml
index b7144dda1..f0bf30d2b 100644
--- a/inlong-tubemq/tubemq-docker/tubemq-cpp/pom.xml
+++ b/inlong-tubemq/tubemq-docker/tubemq-cpp/pom.xml
@@ -39,7 +39,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven.version}</version>
+ <version>${dockerfile.maven.version}</version>
<executions>
<execution>
<id>default</id>
diff --git a/inlong-tubemq/tubemq-docker/tubemq-manager/pom.xml b/inlong-tubemq/tubemq-docker/tubemq-manager/pom.xml
index f8992f90b..88f91c153 100644
--- a/inlong-tubemq/tubemq-docker/tubemq-manager/pom.xml
+++ b/inlong-tubemq/tubemq-docker/tubemq-manager/pom.xml
@@ -49,7 +49,7 @@
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>${dockerfile-maven.version}</version>
+ <version>${dockerfile.maven.version}</version>
<executions>
<execution>
<id>default</id>
diff --git a/inlong-tubemq/tubemq-manager/bin/start-manager.sh b/inlong-tubemq/tubemq-manager/bin/start-manager.sh
index 92b699f2f..e48ed4667 100644
--- a/inlong-tubemq/tubemq-manager/bin/start-manager.sh
+++ b/inlong-tubemq/tubemq-manager/bin/start-manager.sh
@@ -67,4 +67,4 @@ else
JAVA="$JAVA_HOME/bin/java"
fi
-nohup "$JAVA" $MANAGER_JVM_OPTS -cp "$CLASSPATH" org.apache.inlong.tubemq.manager.TubeMQManager "$@" > "$CONSOLE_OUTPUT_FILE" 2>&1 < /dev/null &
\ No newline at end of file
+nohup "$JAVA" -Dmanager.log.path=${LOG_DIR} $MANAGER_JVM_OPTS -cp "$CLASSPATH" org.apache.inlong.tubemq.manager.TubeMQManager "$@" > "$CONSOLE_OUTPUT_FILE" 2>&1 < /dev/null &
\ No newline at end of file
diff --git a/inlong-tubemq/tubemq-manager/conf/log4j2.xml b/inlong-tubemq/tubemq-manager/conf/log4j2.xml
new file mode 100644
index 000000000..ec2320d17
--- /dev/null
+++ b/inlong-tubemq/tubemq-manager/conf/log4j2.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<configuration status="WARN" monitorInterval="30">
+ <Properties>
+ <property name="basePath">${sys:manager.log.path}</property>
+ <property name="log_pattern">%d{yyyy-MM-dd HH:mm:ss.SSS} -%5p ${PID:-} [%15.15t] %-30.30C{1.} : %m%n</property>
+ <property name="every_file_size">1G</property>
+ <property name="output_log_level">INFO</property>
+ <property name="rolling_max">50</property>
+ <property name="info_fileName">${basePath}/info.log</property>
+ <property name="info_filePattern">${basePath}/info-%d{yyyy-MM-dd}-%i.log.gz</property>
+ <property name="info_max">10</property>
+ <property name="debug_fileName">${basePath}/debug.log</property>
+ <property name="debug_filePattern">${basePath}/debug-%d{yyyy-MM-dd}-%i.log.gz</property>
+ <property name="debug_max">10</property>
+ <property name="warn_fileName">${basePath}/warn.log</property>
+ <property name="warn_filePattern">${basePath}/warn-%d{yyyy-MM-dd}-%i.log.gz</property>
+ <property name="warn_max">10</property>
+ <property name="error_fileName">${basePath}/error.log</property>
+ <property name="error_filePattern">${basePath}/error-%d{yyyy-MM-dd}-%i.log.gz</property>
+ <property name="error_max">10</property>
+ <property name="console_print_level">DEBUG</property>
+ <property name="index_fileName">${basePath}/index.log</property>
+ <property name="index_filePattern">${basePath}/index-%d{yyyy-MM-dd}-%i.log.gz</property>
+ <property name="monitors_fileName">${basePath}/monitors.log</property>
+ <property name="monitors_filePattern">${basePath}/monitors-%d{yyyy-MM-dd}-%i.log.gz</property>
+ </Properties>
+
+ <appenders>
+ <Console name="Console" target="SYSTEM_OUT">
+ <ThresholdFilter level="${console_print_level}" onMatch="ACCEPT" onMismatch="DENY"/>
+ <PatternLayout pattern="${log_pattern}"/>
+ </Console>
+
+ <RollingFile name="DebugFile" fileName="${debug_fileName}" filePattern="${debug_filePattern}">
+ <PatternLayout pattern="${log_pattern}"/>
+ <SizeBasedTriggeringPolicy size="${every_file_size}"/>
+ <DefaultRolloverStrategy max="${debug_max}" />
+ <Filters>
+ <ThresholdFilter level="WARN" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="INFO" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="DEBUG" onMatch="ACCEPT" onMismatch="DENY"/>
+ </Filters>
+ </RollingFile>
+
+ <RollingFile name="InfoFile" fileName="${info_fileName}" filePattern="${info_filePattern}">
+ <PatternLayout pattern="${log_pattern}"/>
+ <SizeBasedTriggeringPolicy size="${every_file_size}"/>
+ <DefaultRolloverStrategy max="${info_max}" />
+ <Filters>
+ <ThresholdFilter level="WARN" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+ </Filters>
+ </RollingFile>
+
+ <RollingFile name="IndexFile" fileName="${index_fileName}" filePattern="${index_filePattern}">
+ <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %m%n"/>
+ <SizeBasedTriggeringPolicy size="${every_file_size}"/>
+ <DefaultRolloverStrategy max="${info_max}" />
+ <Filters>
+ <ThresholdFilter level="WARN" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+ </Filters>
+ </RollingFile>
+
+ <RollingFile name="MonitorFile" fileName="${monitors_fileName}" filePattern="${monitors_filePattern}">
+ <PatternLayout pattern="%d{yyyy-MM-dd HH:mm:ss} %m%n"/>
+ <SizeBasedTriggeringPolicy size="${every_file_size}"/>
+ <DefaultRolloverStrategy max="${info_max}" />
+ <Filters>
+ <ThresholdFilter level="WARN" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="INFO" onMatch="ACCEPT" onMismatch="DENY"/>
+ </Filters>
+ </RollingFile>
+
+ <RollingFile name="WarnFile" fileName="${warn_fileName}" filePattern="${warn_filePattern}">
+ <PatternLayout pattern="${log_pattern}"/>
+ <SizeBasedTriggeringPolicy size="${every_file_size}"/>
+ <DefaultRolloverStrategy max="${warn_max}" />
+ <Filters>
+ <ThresholdFilter level="ERROR" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY"/>
+ </Filters>
+ </RollingFile>
+
+ <RollingFile name="ErrorFile" fileName="${error_fileName}" filePattern="${error_filePattern}">
+ <PatternLayout pattern="${log_pattern}"/>
+ <SizeBasedTriggeringPolicy size="${every_file_size}"/>
+ <DefaultRolloverStrategy max="${error_max}" />
+ <Filters>
+ <ThresholdFilter level="FATAL" onMatch="DENY" onMismatch="NEUTRAL"/>
+ <ThresholdFilter level="ERROR" onMatch="ACCEPT" onMismatch="DENY"/>
+ </Filters>
+ </RollingFile>
+ </appenders>
+
+ <loggers>
+ <logger name="org.apache.pulsar" level="info" additivity="false">
+ <appender-ref ref="InfoFile"/>
+ </logger>
+ <root level="${output_log_level}">
+ <appender-ref ref="Console"/>
+ <appender-ref ref="DebugFile"/>
+ <appender-ref ref="InfoFile"/>
+ <appender-ref ref="WarnFile"/>
+ <appender-ref ref="ErrorFile"/>
+ </root>
+ </loggers>
+</configuration>
\ No newline at end of file
diff --git a/inlong-tubemq/tubemq-manager/conf/logback.xml b/inlong-tubemq/tubemq-manager/conf/logback.xml
deleted file mode 100644
index 25af1d7e5..000000000
--- a/inlong-tubemq/tubemq-manager/conf/logback.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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.
- -->
-
-<configuration>
- <property name="FILE_ERROR_PATTERN"
- value="${FILE_LOG_PATTERN:-%d{${LOG_DATEFORMAT_PATTERN:-yyyy-MM-dd HH:mm:ss.SSS}} ${LOG_LEVEL_PATTERN:-%5p} ${PID:- } --- [%t] %-40.40logger{39} %file:%line: %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
- <include resource="org/springframework/boot/logging/logback/defaults.xml"/>
- <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
- <filter class="ch.qos.logback.classic.filter.LevelFilter">
- <level>INFO</level>
- </filter>
- <encoder>
- <pattern>${CONSOLE_LOG_PATTERN}</pattern>
- <charset>UTF-8</charset>
- </encoder>
- </appender>
-
- <appender name="FILE_INFO" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>../logs/tubemq-manager.info.%d{yyyy-MM-dd}.part_%i.log</FileNamePattern>
- <maxHistory>10</maxHistory>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- </rollingPolicy>
- <encoder>
- <pattern>${FILE_LOG_PATTERN}</pattern>
- <charset>UTF-8</charset>
- </encoder>
- </appender>
-
- <appender name="FILE_ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
- <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
- <FileNamePattern>../logs/tubemq-manager.error.%d{yyyy-MM-dd}.part_%i.log</FileNamePattern>
- <maxHistory>10</maxHistory>
- <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
- <maxFileSize>100MB</maxFileSize>
- </timeBasedFileNamingAndTriggeringPolicy>
- </rollingPolicy>
- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <level>Error</level>
- </filter>
- <encoder>
- <pattern>${FILE_ERROR_PATTERN}</pattern>
- <charset>UTF-8</charset>
- </encoder>
- </appender>
-
- <root level="info">
- <appender-ref ref="CONSOLE"/>
- <appender-ref ref="FILE_INFO"/>
- <appender-ref ref="FILE_ERROR"/>
- </root>
-</configuration>
diff --git a/inlong-tubemq/tubemq-manager/pom.xml b/inlong-tubemq/tubemq-manager/pom.xml
index 21e7949c3..1a6708691 100644
--- a/inlong-tubemq/tubemq-manager/pom.xml
+++ b/inlong-tubemq/tubemq-manager/pom.xml
@@ -31,19 +31,19 @@
<properties>
<guava.version>21.0</guava.version>
- <commons.version>4.3</commons.version>
<docker.image.prefix>springboot-docker</docker.image.prefix>
- <swagger.version>3.0.0</swagger.version>
- <swagger-annotations.version>1.6.2</swagger-annotations.version>
- <spring-boot.version>2.6.6</spring-boot.version>
- <lombok.version>1.18.22</lombok.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <version>${spring-boot.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
@@ -59,24 +59,35 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-rest</artifactId>
- <version>${spring-boot.version}</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-boot-starter</artifactId>
- <version>3.0.0</version>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-log4j2</artifactId>
+ </dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
- <version>3.0.0</version>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-spring-web</artifactId>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
- <version>${commons.version}</version>
</dependency>
<dependency>
@@ -88,7 +99,6 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
- <version>${spring-boot.version}</version>
<exclusions>
<exclusion>
<artifactId>hibernate-validator</artifactId>
@@ -105,80 +115,66 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
- <version>${spring-boot.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>hibernate-commons-annotations</artifactId>
- <groupId>org.hibernate.common</groupId>
- </exclusion>
- <exclusion>
- <artifactId>hibernate-core</artifactId>
- <groupId>org.hibernate</groupId>
- </exclusion>
- </exclusions>
+<!-- <exclusions>-->
+<!-- <exclusion>-->
+<!-- <artifactId>hibernate-commons-annotations</artifactId>-->
+<!-- <groupId>org.hibernate.common</groupId>-->
+<!-- </exclusion>-->
+<!-- <exclusion>-->
+<!-- <artifactId>hibernate-core</artifactId>-->
+<!-- <groupId>org.hibernate</groupId>-->
+<!-- </exclusion>-->
+<!-- </exclusions>-->
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
- <version>${lombok.version}</version>
</dependency>
-
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-core</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-access</artifactId>
- <version>1.2.10</version>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
</dependency>
<dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
</dependency>
-
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>${postgres.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <version>${spring-boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>2.1.210</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-core</artifactId>
- <version>3.4.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>${junit.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-spring-web</artifactId>
- <version>3.0.0</version>
- <scope>compile</scope>
- </dependency>
-
<dependency>
<groupId>jakarta.validation</groupId>
<artifactId>jakarta.validation-api</artifactId>
- <version>2.0.2</version>
</dependency>
</dependencies>
@@ -187,7 +183,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <version>3.3.0</version>
+ <version>${plugin.assembly.version}</version>
<configuration>
<descriptors>
<descriptor>src/main/assembly/assembly.xml</descriptor>
@@ -217,12 +213,12 @@
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
- <version>${spring-boot.version}</version>
+ <version>${spring.boot.version}</version>
</plugin>
<plugin>
<groupId>com.spotify</groupId>
<artifactId>dockerfile-maven-plugin</artifactId>
- <version>1.4.9</version>
+ <version>${dockerfile.maven.version}</version>
<configuration>
<repository>${docker.image.prefix}/${project.artifactId}</repository>
<buildArgs>
diff --git a/inlong-tubemq/tubemq-manager/sql/apache_tube_manager.sql b/inlong-tubemq/tubemq-manager/sql/apache_tube_manager.sql
index a7d4e47a1..7043b36dd 100644
--- a/inlong-tubemq/tubemq-manager/sql/apache_tube_manager.sql
+++ b/inlong-tubemq/tubemq-manager/sql/apache_tube_manager.sql
@@ -23,6 +23,7 @@ SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
CREATE DATABASE IF NOT EXISTS apache_inlong_tubemq;
+use apache_inlong_tubemq;
-- ----------------------------
-- Table structure for broker
-- ----------------------------
diff --git a/inlong-tubemq/tubemq-server/pom.xml b/inlong-tubemq/tubemq-server/pom.xml
index f397567e0..ddc346363 100644
--- a/inlong-tubemq/tubemq-server/pom.xml
+++ b/inlong-tubemq/tubemq-server/pom.xml
@@ -41,11 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>3.1</version>
<configuration>
- <source>1.8</source>
- <target>1.8</target>
- <encoding>UTF-8</encoding>
<showDeprecation>true</showDeprecation>
<showWarnings>true</showWarnings>
</configuration>
diff --git a/pom.xml b/pom.xml
index 106b64d48..e7d0639f2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -104,57 +104,113 @@
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <project.build.encoding>UTF-8</project.build.encoding>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
- <project.build.encoding>UTF-8</project.build.encoding>
<plugin.compile.version>3.8.1</plugin.compile.version>
<plugin.assembly.version>3.2.0</plugin.assembly.version>
+ <plugin.surefire.version>2.22.2</plugin.surefire.version>
+ <plugin.failsafe.version>2.22.2</plugin.failsafe.version>
+
<checkstyle.version>6.19</checkstyle.version>
- <dockerfile-maven.version>1.4.13</dockerfile-maven.version>
+ <dockerfile.maven.version>1.4.13</dockerfile.maven.version>
<docker.organization>inlong</docker.organization>
- <flume.version>1.9.0</flume.version>
<netty.version>4.1.72.Final</netty.version>
-
- <simpleclient_httpserver.version>0.14.1</simpleclient_httpserver.version>
+ <simpleclient.httpserver.version>0.14.1</simpleclient.httpserver.version>
<httpcore.version>4.4.14</httpcore.version>
<httpclient.version>4.5.13</httpclient.version>
+ <okhttp.version>3.14.9</okhttp.version>
<spring.boot.version>2.6.6</spring.boot.version>
<spring.version>5.3.18</spring.version>
<spring.autoconfigure.version>2.4.3</spring.autoconfigure.version>
<spring.plugin.version>2.6.6</spring.plugin.version>
+ <spring.fox.version>3.0.0</spring.fox.version>
+ <pagehelper.springboot.version>1.4.2</pagehelper.springboot.version>
+ <pagehelper.version>5.3.0</pagehelper.version>
+ <h2.version>2.1.210</h2.version>
+ <h2.mysql.version>2.0.0</h2.mysql.version>
+ <debezium.version>1.8.0.Final</debezium.version>
+ <rocksdb.version>6.14.6</rocksdb.version>
+ <hadoop.version>2.10.1</hadoop.version>
+ <postgresql.version>42.2.25</postgresql.version>
<mybatis.starter.version>2.1.3</mybatis.starter.version>
+ <mybatis.version>3.5.9</mybatis.version>
<druid.version>1.2.6</druid.version>
<elasticsearch.version>6.8.23</elasticsearch.version>
+ <shiro.version>1.8.0</shiro.version>
<snappy.version>1.1.8.4</snappy.version>
<protobuf.version>3.19.4</protobuf.version>
- <common.lang3.vserion>3.11</common.lang3.vserion>
+ <bytebuddy.version>1.12.9</bytebuddy.version>
+ <reflections.version>0.10.2</reflections.version>
+
+ <swagger.version>3.0.0</swagger.version>
+ <swagger.annotations.version>1.6.2</swagger.annotations.version>
+ <knife4j.version>3.0.3</knife4j.version>
+
+ <commons.io.version>2.11.0</commons.io.version>
+ <commons.cli.version>1.4</commons.cli.version>
+ <commons.dbutils.version>1.7</commons.dbutils.version>
+ <commons.codec.version>1.15</commons.codec.version>
+ <commons.lang3.version>3.11</commons.lang3.version>
+ <commons.lang.version>2.6</commons.lang.version>
+ <commons.collections.version>3.2.2</commons.collections.version>
+ <commons.collections4.version>4.3</commons.collections4.version>
- <gson.version>2.8.6</gson.version>
- <jackson.version>2.12.6</jackson.version>
- <jackson.databind.version>2.12.6.1</jackson.databind.version>
<guava.version>19.0</guava.version>
<lombok.version>1.18.22</lombok.version>
- <jetty.servlet.version>2.5-20110124</jetty.servlet.version>
- <codec.version>1.15</codec.version>
+ <mortbay.jetty.servlet.api.version>3.0.20100224</mortbay.jetty.servlet.api.version>
+ <mortbay.jetty.servlet.version>6.1.26</mortbay.jetty.servlet.version>
+ <jetty.version>9.4.44.v20210927</jetty.version>
+ <opencsv.version>5.4</opencsv.version>
+ <javax.servlet.version>2.5</javax.servlet.version>
+
+ <gson.version>2.8.6</gson.version>
+ <jackson.version>2.13.1</jackson.version>
+ <jackson.databind.version>2.12.6.1</jackson.databind.version>
+ <fastjson.version>1.2.79</fastjson.version>
+
+ <clickhouse-jdbc.version>0.3.1</clickhouse-jdbc.version>
+ <hive.version>3.1.2</hive.version>
+ <flume.version>1.9.0</flume.version>
<pulsar.version>2.8.1</pulsar.version>
+ <pulsar.testcontainers.version>1.15.3</pulsar.testcontainers.version>
<kafka.version>2.4.1</kafka.version>
+ <iceberg.flink.version>0.12.1</iceberg.flink.version>
+ <flink.version>1.13.5</flink.version>
+ <flink.scala.binary.version>2.11</flink.scala.binary.version>
+ <flink.jackson.version>2.12.1-13.0</flink.jackson.version>
+
+ <qcloud.flink.cos.fs.hadoop.version>1.10.0-0.1.10</qcloud.flink.cos.fs.hadoop.version>
+ <qcloud.chdfs.version>2.5</qcloud.chdfs.version>
+
+ <curator.version>2.12.0</curator.version>
+
+ <avro.version>1.11.0</avro.version>
+ <orc.core.version>1.6.7</orc.core.version>
+ <oro.version>2.0.8</oro.version>
+ <akka.version>2.5.21</akka.version>
+ <antlr.verison>4.0.4</antlr.verison>
<logback.version>1.2.10</logback.version>
- <junit.version>4.13.2</junit.version>
- <hadoop.version>2.10.1</hadoop.version>
- <postgres.version>42.3.3</postgres.version>
+ <log4j2.version>2.17.1</log4j2.version>
+ <slf4j.version>1.7.36</slf4j.version>
+ <junit.version>4.13.2</junit.version>
+ <awaitility.version>4.0.3</awaitility.version>
+ <mockito.version>3.12.4</mockito.version>
<testng.version>6.14.3</testng.version>
<powermock.version>2.0.9</powermock.version>
- <mockito.version>3.12.4</mockito.version>
- <log4j2.version>2.17.1</log4j2.version>
- <slf4j.version>1.7.36</slf4j.version>
+ <assertj.version>3.4.1</assertj.version>
+
+ <jakarta.version>2.0.2</jakarta.version>
+ <hamcrest.version>1.3</hamcrest.version>
+ <jsr.version>3.0.2</jsr.version>
+ <jcommander.version>1.78</jcommander.version>
</properties>
<dependencyManagement>
@@ -181,23 +237,209 @@
<version>${flume.version}</version>
</dependency>
+ <!-- hive -->
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-jdbc</artifactId>
+ <version>${hive.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-web</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-metastore</artifactId>
+ <version>${hive.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.parquet</groupId>
+ <artifactId>parquet-hadoop-bundle</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-exec</artifactId>
+ <version>${hive.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.pentaho</groupId>
+ <artifactId>pentaho-aggdesigner-algorithm</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-compress</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.hbase</groupId>
+ <artifactId>*</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
- <!--db-->
+ <!-- hadoop -->
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>${hadoop.version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>jersey-json</artifactId>
+ <groupId>com.sun.jersey</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>snappy-java</artifactId>
+ <groupId>org.xerial.snappy</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-minicluster</artifactId>
+ <version>${hadoop.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- clickhouse -->
+ <dependency>
+ <groupId>ru.yandex.clickhouse</groupId>
+ <artifactId>clickhouse-jdbc</artifactId>
+ <version>${clickhouse-jdbc.version}</version>
+ </dependency>
+
+ <!-- db -->
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-spring</artifactId>
+ <version>${shiro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>${shiro.version}</version>
+ </dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis.starter.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mybatis</groupId>
+ <artifactId>mybatis</artifactId>
+ <version>${mybatis.version}</version>
+ </dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>${postgres.version}</version>
+ <version>${postgresql.version}</version>
</dependency>
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.rocksdb</groupId>
+ <artifactId>rocksdbjni</artifactId>
+ <version>${rocksdb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.debezium</groupId>
+ <artifactId>debezium-api</artifactId>
+ <version>${debezium.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.debezium</groupId>
+ <artifactId>debezium-embedded</artifactId>
+ <version>${debezium.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>io.debezium</groupId>
+ <artifactId>debezium-connector-mysql</artifactId>
+ <version>${debezium.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ <version>${h2.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.mvnsearch</groupId>
+ <artifactId>h2-functions-4-mysql</artifactId>
+ <version>${h2.mysql.version}</version>
+ </dependency>
<!--spring -->
<dependency>
@@ -210,6 +452,31 @@
<artifactId>spring-boot-starter</artifactId>
<version>${spring.boot.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-rest</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-aop</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-validation</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-data-jpa</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-log4j2</artifactId>
@@ -226,11 +493,96 @@
<artifactId>spring-boot-autoconfigure</artifactId>
<version>${spring.boot.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-cache</artifactId>
+ <version>${spring.boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <version>${spring.boot.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-test</artifactId>
+ <version>${spring.boot.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${spring.version}</version>
+ <scope>compile</scope>
+ </dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-beans</artifactId>
<version>${spring.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ <version>${spring.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-test</artifactId>
+ <version>${spring.version}</version>
+ <scope>test</scope>
+ </dependency>
+
+ <!-- spring fox -->
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-boot-starter</artifactId>
+ <version>${spring.fox.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-swagger-ui</artifactId>
+ <version>${spring.fox.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.springfox</groupId>
+ <artifactId>springfox-spring-web</artifactId>
+ <version>${spring.fox.version}</version>
+ </dependency>
+
+ <!-- swagger -->
+ <dependency>
+ <groupId>io.swagger</groupId>
+ <artifactId>swagger-annotations</artifactId>
+ <version>${swagger.annotations.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-spring-boot-starter</artifactId>
+ <version>${knife4j.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-to-slf4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- pagehelper -->
+ <dependency>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper</artifactId>
+ <version>${pagehelper.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.github.pagehelper</groupId>
+ <artifactId>pagehelper-spring-boot-starter</artifactId>
+ <version>${pagehelper.springboot.version}</version>
+ </dependency>
<!--netty dependency-->
<dependency>
@@ -264,14 +616,44 @@
<version>${netty.version}</version>
</dependency>
<dependency>
- <groupId>commons-codec</groupId>
- <artifactId>commons-codec</artifactId>
- <version>${codec.version}</version>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${mortbay.jetty.servlet.api.version}</version>
</dependency>
<dependency>
<groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${mortbay.jetty.servlet.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>${jetty.servlet.version}</version>
+ <version>${javax.servlet.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- jetty -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-servlet</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <version>${jetty.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.opencsv</groupId>
+ <artifactId>opencsv</artifactId>
+ <version>${opencsv.version}</version>
</dependency>
<!-- http -->
@@ -280,14 +662,18 @@
<artifactId>httpcore</artifactId>
<version>${httpcore.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>${okhttp.version}</version>
+ </dependency>
- <!--elasticsearch-->
+ <!-- elastic search -->
<dependency>
<groupId>org.elasticsearch.client</groupId>
<artifactId>elasticsearch-rest-high-level-client</artifactId>
@@ -303,6 +689,11 @@
<artifactId>elasticsearch</artifactId>
<version>${elasticsearch.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.elasticsearch.client</groupId>
+ <artifactId>elasticsearch-rest-client-sniffer</artifactId>
+ <version>${elasticsearch.version}</version>
+ </dependency>
<!--pulsar dependency-->
<dependency>
@@ -310,15 +701,127 @@
<artifactId>pulsar-client</artifactId>
<version>${pulsar.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.pulsar</groupId>
+ <artifactId>pulsar-client-admin</artifactId>
+ <version>${pulsar.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pulsar</groupId>
+ <artifactId>pulsar-client-all</artifactId>
+ <version>${pulsar.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.testcontainers</groupId>
+ <artifactId>pulsar</artifactId>
+ <version>${pulsar.testcontainers.version}</version>
+ <scope>test</scope>
+ </dependency>
- <!--kafka dependency-->
+ <!-- kafka dependency-->
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
<version>${kafka.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka_${flink.scala.binary.version}</artifactId>
+ <version>${kafka.version}</version>
+ </dependency>
- <!--lombok-->
+ <!-- flink -->
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-clients_${flink.scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-core</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-streaming-java_${flink.scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-common</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-table-runtime-blink_${flink.scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-parquet_${flink.scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-connector-kafka_${flink.scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-json</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-avro</artifactId>
+ <version>${flink.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-shaded-jackson</artifactId>
+ <version>${flink.jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.flink</groupId>
+ <artifactId>flink-test-utils_${flink.scala.binary.version}</artifactId>
+ <version>${flink.version}</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.iceberg</groupId>
+ <artifactId>iceberg-flink</artifactId>
+ <version>${iceberg.flink.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <!-- qcloud -->
+ <dependency>
+ <groupId>com.qcloud</groupId>
+ <artifactId>chdfs_hadoop_plugin_network</artifactId>
+ <version>${qcloud.chdfs.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.qcloud.cos</groupId>
+ <artifactId>flink-cos-fs-hadoop</artifactId>
+ <version>${qcloud.flink.cos.fs.hadoop.version}</version>
+ </dependency>
+
+ <!-- lombok -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
@@ -337,6 +840,12 @@
<version>${guava.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>${fastjson.version}</version>
+ </dependency>
+
<!-- snappy -->
<dependency>
<groupId>org.xerial.snappy</groupId>
@@ -344,12 +853,50 @@
<version>${snappy.version}</version>
</dependency>
+ <!-- format -->
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro</artifactId>
+ <version>${avro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avro</groupId>
+ <artifactId>avro-ipc</artifactId>
+ <version>${avro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>oro</groupId>
+ <artifactId>oro</artifactId>
+ <version>${oro.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.orc</groupId>
+ <artifactId>orc-core</artifactId>
+ <version>${orc.core.version}</version>
+ <classifier>nohive</classifier>
+ </dependency>
+ <dependency>
+ <groupId>com.typesafe.akka</groupId>
+ <artifactId>akka-stream_2.11</artifactId>
+ <version>${akka.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>ST4</artifactId>
+ <version>${antlr.verison}</version>
+ </dependency>
+
<!-- protobuf -->
<dependency>
<groupId>com.google.protobuf</groupId>
<artifactId>protobuf-java</artifactId>
<version>${protobuf.version}</version>
</dependency>
+ <dependency>
+ <artifactId>byte-buddy</artifactId>
+ <groupId>net.bytebuddy</groupId>
+ <version>${bytebuddy.version}</version>
+ </dependency>
<!-- jackson -->
<dependency>
@@ -362,19 +909,103 @@
<artifactId>jackson-annotations</artifactId>
<version>${jackson.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-core</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.datatype</groupId>
+ <artifactId>jackson-datatype-jsr310</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.dataformat</groupId>
+ <artifactId>jackson-dataformat-yaml</artifactId>
+ <version>${jackson.version}</version>
+ </dependency>
+
+ <!-- zookeeper -->
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-framework</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-recipes</artifactId>
+ <version>${curator.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.curator</groupId>
+ <artifactId>curator-test</artifactId>
+ <version>${curator.version}</version>
+ <scope>test</scope>
+ </dependency>
- <!-- lang -->
+ <!-- reflections -->
+ <dependency>
+ <groupId>org.reflections</groupId>
+ <artifactId>reflections</artifactId>
+ <version>${reflections.version}</version>
+ </dependency>
+
+ <!-- common / lang-->
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>${commons.lang.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>${common.lang3.vserion}</version>
+ <version>${commons.lang3.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>commons-dbutils</artifactId>
+ <groupId>commons-dbutils</groupId>
+ <version>${commons.dbutils.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>commons-cli</artifactId>
+ <groupId>commons-cli</groupId>
+ <version>${commons.cli.version}</version>
+ </dependency>
+ <dependency>
+ <artifactId>commons-io</artifactId>
+ <groupId>commons-io</groupId>
+ <version>${commons.io.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons.codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ <version>${commons.collections.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-collections4</artifactId>
+ <version>${commons.collections4.version}</version>
</dependency>
-
<!-- metric -->
<dependency>
<groupId>io.prometheus</groupId>
<artifactId>simpleclient_httpserver</artifactId>
- <version>${simpleclient_httpserver.version}</version>
+ <version>${simpleclient.httpserver.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient</artifactId>
+ <version>${simpleclient.httpserver.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>io.prometheus</groupId>
+ <artifactId>simpleclient_hotspot</artifactId>
+ <version>${simpleclient.httpserver.version}</version>
</dependency>
<!-- log 4j2 -->
@@ -398,6 +1029,18 @@
<artifactId>slf4j-api</artifactId>
<version>${slf4j.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <version>${slf4j.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-1.2-api</artifactId>
+ <version>${log4j2.version}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- logback -->
<dependency>
@@ -410,6 +1053,11 @@
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
</dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-access</artifactId>
+ <version>${logback.version}</version>
+ </dependency>
<!-- test -->
<dependency>
@@ -447,20 +1095,66 @@
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.assertj</groupId>
+ <artifactId>assertj-core</artifactId>
+ <version>${assertj.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <artifactId>awaitility</artifactId>
+ <groupId>org.awaitility</groupId>
+ <scope>test</scope>
+ <version>${awaitility.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.hamcrest</groupId>
+ <artifactId>hamcrest-all</artifactId>
+ <version>${hamcrest.version}</version>
+ <type>jar</type>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>jakarta.validation</groupId>
+ <artifactId>jakarta.validation-api</artifactId>
+ <version>${jakarta.version}</version>
+ </dependency>
+
+ <!-- jsr -->
+ <dependency>
+ <groupId>com.google.code.findbugs</groupId>
+ <artifactId>jsr305</artifactId>
+ <version>${jsr.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.beust</groupId>
+ <artifactId>jcommander</artifactId>
+ <version>${jcommander.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>${plugin.compile.version}</version>
+ <configuration>
+ <encoding>${project.build.encoding}</encoding>
+ <source>${maven.compiler.source}</source>
+ <target>${maven.compiler.target}</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>${project.build.encoding}</encoding>
- <source>${maven.compiler.source}</source>
- <target>${maven.compiler.target}</target>
- </configuration>
- <version>${plugin.compile.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>