You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by go...@apache.org on 2021/07/07 10:30:35 UTC
[incubator-inlong] branch master updated: [INLONG-658] modify the
dependency of inlong-manager (#515)
This is an automated email from the ASF dual-hosted git repository.
gosonzhang 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 005a102 [INLONG-658] modify the dependency of inlong-manager (#515)
005a102 is described below
commit 005a102dc244f97853d92de2340e915d63b533c3
Author: 瘦风 <he...@gmail.com>
AuthorDate: Wed Jul 7 18:30:27 2021 +0800
[INLONG-658] modify the dependency of inlong-manager (#515)
Co-authored-by: healzhou <he...@tencent.com>
---
inlong-manager/manager-common/pom.xml | 19 +---
inlong-manager/manager-dao/pom.xml | 41 ++++++--
inlong-manager/manager-openapi/pom.xml | 6 +-
inlong-manager/manager-service/pom.xml | 30 +-----
inlong-manager/manager-web/pom.xml | 7 +-
inlong-manager/manager-workflow-engine/pom.xml | 4 +-
inlong-manager/pom.xml | 125 +++++++++++++++++--------
7 files changed, 134 insertions(+), 98 deletions(-)
diff --git a/inlong-manager/manager-common/pom.xml b/inlong-manager/manager-common/pom.xml
index ac6f87f..daae766 100644
--- a/inlong-manager/manager-common/pom.xml
+++ b/inlong-manager/manager-common/pom.xml
@@ -29,9 +29,6 @@
<artifactId>manager-common</artifactId>
<name>Apache InLong - Manager Common</name>
- <properties>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -73,7 +70,6 @@
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>
- <!--swagger-knife4j-->
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
@@ -123,22 +119,12 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>5.3.4</version>
<scope>compile</scope>
</dependency>
+
<dependency>
<groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- <exclusions>
- <exclusion>
- <artifactId>spring-boot-autoconfigure</artifactId>
- <groupId>org.springframework.boot</groupId>
- </exclusion>
- <exclusion>
- <artifactId>spring-boot-starter</artifactId>
- <groupId>org.springframework.boot</groupId>
- </exclusion>
- </exclusions>
+ <artifactId>pagehelper</artifactId>
</dependency>
<dependency>
@@ -159,7 +145,6 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>1.4.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
diff --git a/inlong-manager/manager-dao/pom.xml b/inlong-manager/manager-dao/pom.xml
index dd8fdbe..514d7f0 100644
--- a/inlong-manager/manager-dao/pom.xml
+++ b/inlong-manager/manager-dao/pom.xml
@@ -29,15 +29,11 @@
<artifactId>manager-dao</artifactId>
<name>Apache InLong - Manager DAO</name>
- <properties>
-
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>manager-workflow-engine</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
@@ -78,7 +74,40 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
- <version>1.2.1</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>log4j</artifactId>
+ <groupId>log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>HikariCP</artifactId>
+ <groupId>com.zaxxer</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>commons-logging</artifactId>
+ <groupId>commons-logging</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-api</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-1.2-api</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-core</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
</dependencies>
diff --git a/inlong-manager/manager-openapi/pom.xml b/inlong-manager/manager-openapi/pom.xml
index e630fa3..bf39f3e 100644
--- a/inlong-manager/manager-openapi/pom.xml
+++ b/inlong-manager/manager-openapi/pom.xml
@@ -29,15 +29,11 @@
<artifactId>manager-openapi</artifactId>
<name>Apache InLong - Manager OpenAPI</name>
- <properties>
-
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>manager-service</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<artifactId>servlet-api</artifactId>
diff --git a/inlong-manager/manager-service/pom.xml b/inlong-manager/manager-service/pom.xml
index 6df7c9c..8c2733d 100644
--- a/inlong-manager/manager-service/pom.xml
+++ b/inlong-manager/manager-service/pom.xml
@@ -16,8 +16,8 @@
~ limitations under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://maven.apache.org/POM/4.0.0"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -30,15 +30,11 @@
<artifactId>manager-service</artifactId>
<name>Apache InLong - Manager Service</name>
- <properties>
-
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>manager-dao</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<artifactId>guava</artifactId>
@@ -52,27 +48,19 @@
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-logging</artifactId>
- <version>${spring-boot.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-common</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>inlong-sort-api</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
-
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
- <version>1.2.1</version>
<exclusions>
<exclusion>
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
@@ -123,7 +111,6 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-metastore</artifactId>
- <version>3.1.2</version>
<exclusions>
<exclusion>
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
@@ -162,10 +149,6 @@
<groupId>org.apache.curator</groupId>
</exclusion>
<exclusion>
- <artifactId>hive-standalone-metastore</artifactId>
- <groupId>org.apache.hive</groupId>
- </exclusion>
- <exclusion>
<artifactId>hadoop-auth</artifactId>
<groupId>org.apache.hadoop</groupId>
</exclusion>
@@ -218,7 +201,6 @@
<dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-common</artifactId>
- <version>2.6.0</version>
<exclusions>
<exclusion>
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
@@ -265,7 +247,6 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-service</artifactId>
- <version>1.2.1</version>
<exclusions>
<exclusion>
<artifactId>geronimo-jaspic_1.0_spec</artifactId>
@@ -321,7 +302,6 @@
<dependency>
<groupId>org.apache.shiro</groupId>
<artifactId>shiro-core</artifactId>
- <version>1.4.1</version>
<scope>compile</scope>
<exclusions>
<exclusion>
diff --git a/inlong-manager/manager-web/pom.xml b/inlong-manager/manager-web/pom.xml
index 3d26839..a2b7a34 100644
--- a/inlong-manager/manager-web/pom.xml
+++ b/inlong-manager/manager-web/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>manager-service</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
<exclusions>
<exclusion>
<artifactId>servlet-api</artifactId>
@@ -135,16 +135,13 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
</dependency>
-
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
-
<dependency>
<artifactId>guava</artifactId>
<groupId>com.google.guava</groupId>
- <version>18.0</version>
</dependency>
</dependencies>
@@ -224,12 +221,14 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
<configuration>
<source>${java.version}</source>
<target>${java.version}</target>
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
<version>3.1.0</version>
<executions>
diff --git a/inlong-manager/manager-workflow-engine/pom.xml b/inlong-manager/manager-workflow-engine/pom.xml
index 08b54fe..e98ecb4 100644
--- a/inlong-manager/manager-workflow-engine/pom.xml
+++ b/inlong-manager/manager-workflow-engine/pom.xml
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.inlong</groupId>
<artifactId>manager-common</artifactId>
- <version>${project.parent.version}</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
@@ -62,7 +62,6 @@
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
- <version>3.14.9</version>
</dependency>
<dependency>
<groupId>io.swagger</groupId>
@@ -75,7 +74,6 @@
<dependency>
<groupId>org.mybatis</groupId>
<artifactId>mybatis</artifactId>
- <version>3.5.1</version>
</dependency>
</dependencies>
diff --git a/inlong-manager/pom.xml b/inlong-manager/pom.xml
index 5b6a8d0..49bc42e 100644
--- a/inlong-manager/pom.xml
+++ b/inlong-manager/pom.xml
@@ -42,25 +42,28 @@
<java.version>1.8</java.version>
<java.compile.version>1.8</java.compile.version>
<spring-boot.version>2.4.3</spring-boot.version>
+ <springframework.version>5.3.4</springframework.version>
+ <mybatis.version>3.5.6</mybatis.version>
<mybatis.starter.version>2.0.1</mybatis.starter.version>
- <mybatis.pagehelper.starter.version>1.3.0</mybatis.pagehelper.starter.version>
+ <pagehelper.version>5.2.0</pagehelper.version>
<mysql.version>8.0.15</mysql.version>
<druid.version>1.2.5</druid.version>
<shiro.version>1.4.1</shiro.version>
- <lombok.version>1.18.20</lombok.version>
- <jackson.version>2.9.5</jackson.version>
- <guava.version>18.0</guava.version>
- <swagger.version>3.0.0</swagger.version>
- <swagger-annotations.version>1.6.2</swagger-annotations.version>
- <knife4j.version>2.0.5</knife4j.version>
- <ini4j.version>0.5.1</ini4j.version>
- <slf4j.version>1.7.25</slf4j.version>
+ <hive.version>3.1.2</hive.version>
<servlet-api.version>2.5</servlet-api.version>
+ <slf4j.version>1.7.25</slf4j.version>
+ <guava.version>18.0</guava.version>
+ <gson.version>2.8.6</gson.version>
<json-simple.version>1.1.1</json-simple.version>
+ <jackson.version>2.9.5</jackson.version>
<opencsv.version>5.4</opencsv.version>
- <gson.version>2.8.6</gson.version>
<httpcore.version>4.4.14</httpcore.version>
<httpclient.version>4.5.13</httpclient.version>
+ <lombok.version>1.18.20</lombok.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>
</properties>
<dependencies>
@@ -68,12 +71,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</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.springframework.boot</groupId>
@@ -134,11 +131,6 @@
<version>${mybatis.starter.version}</version>
</dependency>
<dependency>
- <groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>${mybatis.pagehelper.starter.version}</version>
- </dependency>
- <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
<version>${spring-boot.version}</version>
@@ -150,6 +142,27 @@
<version>${spring-boot.version}</version>
</dependency>
<dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-logging</artifactId>
+ <version>${spring-boot.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-web</artifactId>
+ <version>${springframework.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.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
@@ -186,21 +199,69 @@
<artifactId>jackson-datatype-jsr310</artifactId>
<version>${jackson.version}</version>
</dependency>
- <dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>${swagger.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>
+ </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-service</artifactId>
+ <version>${hive.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-metastore</artifactId>
+ <version>${hive.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <version>2.6.0</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.shiro</groupId>
+ <artifactId>shiro-core</artifactId>
+ <version>1.4.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>okhttp</artifactId>
+ <version>3.14.9</version>
+ </dependency>
+
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
@@ -221,18 +282,6 @@
<artifactId>commons-codec</artifactId>
<version>1.3</version>
</dependency>
- <!--swagger-knife4j-->
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
- <version>${knife4j.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.ini4j</groupId>
- <artifactId>ini4j</artifactId>
- <version>${ini4j.version}</version>
- </dependency>
<dependency>
<groupId>org.slf4j</groupId>