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/11 02:04:07 UTC
[incubator-inlong] branch master updated: [INLONG-3596][Manager] Update the dependency (#3597)
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 d9c374a80 [INLONG-3596][Manager] Update the dependency (#3597)
d9c374a80 is described below
commit d9c374a804e2f405dc9b31b7a513d091936ecd2a
Author: dockerzhang <do...@apache.org>
AuthorDate: Mon Apr 11 10:04:01 2022 +0800
[INLONG-3596][Manager] Update the dependency (#3597)
---
inlong-manager/manager-web/bin/managerctl | 2 +-
inlong-manager/manager-web/bin/startup.sh | 2 +-
inlong-manager/manager-web/pom.xml | 3 --
.../src/main/resources/application.properties | 2 ++
inlong-manager/pom.xml | 39 ++++++++--------------
pom.xml | 5 +--
6 files changed, 21 insertions(+), 32 deletions(-)
diff --git a/inlong-manager/manager-web/bin/managerctl b/inlong-manager/manager-web/bin/managerctl
index 711966d6f..1049ff7aa 100644
--- a/inlong-manager/manager-web/bin/managerctl
+++ b/inlong-manager/manager-web/bin/managerctl
@@ -20,7 +20,7 @@
# Project startup jar package name
-APPLICATION_JAR="manager-client-tools.jar"
+APPLICATION_JAR="manager-client-tools-*.jar"
BIN_PATH=$(
cd $(dirname $0)
diff --git a/inlong-manager/manager-web/bin/startup.sh b/inlong-manager/manager-web/bin/startup.sh
index be85bd90a..6b889a6a8 100755
--- a/inlong-manager/manager-web/bin/startup.sh
+++ b/inlong-manager/manager-web/bin/startup.sh
@@ -91,4 +91,4 @@ 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>/dev/null 2>${LOG_DIR}/error.log &
\ No newline at end of file
+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
diff --git a/inlong-manager/manager-web/pom.xml b/inlong-manager/manager-web/pom.xml
index 71f937e89..03d914932 100644
--- a/inlong-manager/manager-web/pom.xml
+++ b/inlong-manager/manager-web/pom.xml
@@ -133,9 +133,6 @@
<directory>bin</directory>
<filtering>true</filtering>
<targetPath>bin</targetPath>
- <includes>
- <include>*.sh</include>
- </includes>
</resource>
<!-- Filter sql files to sql directory -->
<resource>
diff --git a/inlong-manager/manager-web/src/main/resources/application.properties b/inlong-manager/manager-web/src/main/resources/application.properties
index 9b0bec1f0..630fede96 100644
--- a/inlong-manager/manager-web/src/main/resources/application.properties
+++ b/inlong-manager/manager-web/src/main/resources/application.properties
@@ -25,6 +25,8 @@ logging.level.root=INFO
logging.file.path=log
spring.application.name=InLong-Manager-Web
spring.profiles.active=dev
+spring.main.allow-circular-references=true
+spring.mvc.pathmatch.matching-strategy=ANT_PATH_MATCHER
# Serialize the Date type to a timestamp
spring.jackson.serialization.write-dates-as-timestamps=true
spring.jackson.date-format=yyyy-MM-dd HH:mm:ss
diff --git a/inlong-manager/pom.xml b/inlong-manager/pom.xml
index d54c34bda..a8b3d3df4 100644
--- a/inlong-manager/pom.xml
+++ b/inlong-manager/pom.xml
@@ -46,36 +46,26 @@
<properties>
<java.version>1.8</java.version>
<java.compile.version>1.8</java.compile.version>
- <spring-boot.version>2.5.12</spring-boot.version>
- <springframework.version>5.3.18</springframework.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>
- <druid.version>1.2.5</druid.version>
<shiro.version>1.8.0</shiro.version>
<hive.version>3.1.2</hive.version>
- <pulsar.version>2.8.1</pulsar.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>
- <slf4j.version>1.7.25</slf4j.version>
- <guava.version>18.0</guava.version>
- <jackson.version>2.12.6</jackson.version>
- <jackson.databind.version>2.12.6.1</jackson.databind.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>
- <mockito.version>3.6.28</mockito.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>
- <log4j.version>2.17.1</log4j.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<checkstyle.version>6.19</checkstyle.version>
@@ -86,7 +76,6 @@
<dockerfile-maven.version>1.4.13</dockerfile-maven.version>
<okhttp.version>3.14.9</okhttp.version>
<fastjson.version>1.2.76</fastjson.version>
- <powermock.version>2.0.2</powermock.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>
@@ -114,7 +103,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
- <version>${spring-boot.version}</version>
+ <version>${spring.boot.version}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -143,17 +132,17 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
- <version>${spring-boot.version}</version>
+ <version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
- <version>${spring-boot.version}</version>
+ <version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-validation</artifactId>
- <version>${spring-boot.version}</version>
+ <version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.apache.flink</groupId>
@@ -168,7 +157,7 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-cache</artifactId>
- <version>${spring-boot.version}</version>
+ <version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
@@ -178,18 +167,18 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
- <version>${spring-boot.version}</version>
+ <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>
+ <version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
- <version>${spring-boot.version}</version>
+ <version>${spring.boot.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.logging.log4j</groupId>
@@ -204,22 +193,22 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>${log4j.version}</version>
+ <version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>${log4j.version}</version>
+ <version>${log4j2.version}</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
- <version>${spring-boot.version}</version>
+ <version>${spring.boot.version}</version>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-web</artifactId>
- <version>${springframework.version}</version>
+ <version>${spring.version}</version>
<scope>compile</scope>
</dependency>
<dependency>
@@ -470,13 +459,13 @@
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-test</artifactId>
- <version>${spring-boot.version}</version>
+ <version>${spring.boot.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-test</artifactId>
- <version>${springframework.version}</version>
+ <version>${spring.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index dd0f4221e..106b64d48 100644
--- a/pom.xml
+++ b/pom.xml
@@ -135,7 +135,8 @@
<common.lang3.vserion>3.11</common.lang3.vserion>
<gson.version>2.8.6</gson.version>
- <jackson.version>2.13.1</jackson.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>
@@ -354,7 +355,7 @@
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
- <version>${jackson.version}</version>
+ <version>${jackson.databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>