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/09 01:45:50 UTC
[incubator-inlong] branch master updated: [INLONG-658] modify the
dependency of inlong-manager (#523)
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 9645a7d [INLONG-658] modify the dependency of inlong-manager (#523)
9645a7d is described below
commit 9645a7d2ae492fa67d98e3c03d125e8db29d751b
Author: healchow <he...@gmail.com>
AuthorDate: Fri Jul 9 09:45:43 2021 +0800
[INLONG-658] modify the dependency of inlong-manager (#523)
Co-authored-by: healzhou <he...@tencent.com>
---
inlong-manager/manager-api/pom.xml | 32 +--------------
inlong-manager/manager-common/pom.xml | 5 +--
inlong-manager/manager-dao/pom.xml | 58 ++++++++++++++++++++++-----
inlong-manager/manager-openapi/pom.xml | 16 +-------
inlong-manager/manager-service/pom.xml | 73 ++++++++++++++++++++--------------
inlong-manager/pom.xml | 29 +++++---------
6 files changed, 107 insertions(+), 106 deletions(-)
diff --git a/inlong-manager/manager-api/pom.xml b/inlong-manager/manager-api/pom.xml
index 8e0f2e3..f270638 100644
--- a/inlong-manager/manager-api/pom.xml
+++ b/inlong-manager/manager-api/pom.xml
@@ -34,36 +34,6 @@
<groupId>org.apache.inlong</groupId>
<artifactId>manager-service</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- <exclusion>
- <artifactId>elasticsearch-rest-client-sniffer</artifactId>
- <groupId>org.elasticsearch.client</groupId>
- </exclusion>
- <exclusion>
- <artifactId>guava</artifactId>
- <groupId>com.google.guava</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>commons-beanutils</artifactId>
- <groupId>commons-beanutils</groupId>
- </exclusion>
- <exclusion>
- <artifactId>commons-collections4</artifactId>
- <groupId>org.apache.commons</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -181,6 +151,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
+ <version>3.1.0</version>
<executions>
<execution>
<phase>prepare-package</phase>
@@ -227,6 +198,7 @@
</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-common/pom.xml b/inlong-manager/manager-common/pom.xml
index daae766..51b4481 100644
--- a/inlong-manager/manager-common/pom.xml
+++ b/inlong-manager/manager-common/pom.xml
@@ -70,6 +70,7 @@
<groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId>
</dependency>
+
<dependency>
<groupId>com.github.xiaoymin</groupId>
<artifactId>knife4j-spring-boot-starter</artifactId>
@@ -119,12 +120,10 @@
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <scope>compile</scope>
</dependency>
-
<dependency>
<groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper</artifactId>
+ <artifactId>pagehelper-spring-boot-starter</artifactId>
</dependency>
<dependency>
diff --git a/inlong-manager/manager-dao/pom.xml b/inlong-manager/manager-dao/pom.xml
index 868c186..56c46fc 100644
--- a/inlong-manager/manager-dao/pom.xml
+++ b/inlong-manager/manager-dao/pom.xml
@@ -76,18 +76,56 @@
<artifactId>hive-jdbc</artifactId>
<exclusions>
<exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
+ <artifactId>hadoop-common</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-http</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-rewrite</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-server</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-servlet</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-webapp</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hive-llap-server</artifactId>
+ <groupId>org.apache.hive</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-runner</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>javax.servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <groupId>javax.servlet.jsp</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-common</artifactId>
- <exclusions>
<exclusion>
- <groupId>*</groupId>
- <artifactId>*</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
diff --git a/inlong-manager/manager-openapi/pom.xml b/inlong-manager/manager-openapi/pom.xml
index bf39f3e..082a173 100644
--- a/inlong-manager/manager-openapi/pom.xml
+++ b/inlong-manager/manager-openapi/pom.xml
@@ -34,20 +34,6 @@
<groupId>org.apache.inlong</groupId>
<artifactId>manager-service</artifactId>
<version>${project.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>servlet-api</artifactId>
- <groupId>javax.servlet</groupId>
- </exclusion>
- <exclusion>
- <artifactId>log4j-slf4j-impl</artifactId>
- <groupId>org.apache.logging.log4j</groupId>
- </exclusion>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -138,6 +124,7 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
@@ -167,6 +154,7 @@
</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-service/pom.xml b/inlong-manager/manager-service/pom.xml
index 27fda75..c60baf1 100644
--- a/inlong-manager/manager-service/pom.xml
+++ b/inlong-manager/manager-service/pom.xml
@@ -61,6 +61,7 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -68,44 +69,59 @@
<artifactId>hive-jdbc</artifactId>
<exclusions>
<exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
+ <artifactId>hive-llap-server</artifactId>
+ <groupId>org.apache.hive</groupId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-metastore</artifactId>
- <exclusions>
<exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
+ <artifactId>jetty-runner</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-standalone-metastore</artifactId>
- <exclusions>
<exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
+ <artifactId>jetty-server</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
</exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-common</artifactId>
- <exclusions>
<exclusion>
- <artifactId>*</artifactId>
- <groupId>*</groupId>
+ <artifactId>hadoop-yarn-server-resourcemanager</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-servlet</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-http</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-rewrite</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>jetty-webapp</artifactId>
+ <groupId>org.eclipse.jetty</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>javax.servlet-api</artifactId>
+ <groupId>javax.servlet</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>javax.servlet.jsp-api</artifactId>
+ <groupId>javax.servlet.jsp</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>log4j-slf4j-impl</artifactId>
+ <groupId>org.apache.logging.log4j</groupId>
+ </exclusion>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
</exclusion>
</exclusions>
</dependency>
+
<dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-service</artifactId>
+ <groupId>org.apache.hadoop</groupId>
+ <artifactId>hadoop-common</artifactId>
<exclusions>
<exclusion>
<artifactId>*</artifactId>
@@ -125,7 +141,6 @@
</exclusion>
</exclusions>
</dependency>
-
</dependencies>
</project>
diff --git a/inlong-manager/pom.xml b/inlong-manager/pom.xml
index b93404a..1c25709 100644
--- a/inlong-manager/pom.xml
+++ b/inlong-manager/pom.xml
@@ -46,11 +46,13 @@
<mybatis.version>3.5.6</mybatis.version>
<mybatis.starter.version>2.0.1</mybatis.starter.version>
<pagehelper.version>5.2.0</pagehelper.version>
+ <pagehelper.springboot.version>1.3.0</pagehelper.springboot.version>
<mysql.version>8.0.15</mysql.version>
<druid.version>1.2.5</druid.version>
<shiro.version>1.4.1</shiro.version>
<hive.version>3.1.2</hive.version>
<servlet-api.version>2.5</servlet-api.version>
+ <servlet.jsp-api.version>2.3.3</servlet.jsp-api.version>
<slf4j.version>1.7.25</slf4j.version>
<guava.version>18.0</guava.version>
<gson.version>2.8.6</gson.version>
@@ -163,6 +165,12 @@
<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>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
<version>${druid.version}</version>
@@ -229,29 +237,9 @@
<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-common</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.hive</groupId>
- <artifactId>hive-standalone-metastore</artifactId>
- <version>${hive.version}</version>
- </dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
@@ -302,6 +290,7 @@
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${servlet-api.version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>