You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@inlong.apache.org by he...@apache.org on 2022/02/19 03:52:45 UTC

[incubator-inlong] branch master updated: [INLONG-2593] Use a unified version of logback (#2594)

This is an automated email from the ASF dual-hosted git repository.

healchow 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 e83b631  [INLONG-2593] Use a unified version of logback (#2594)
e83b631 is described below

commit e83b63146700b64bc8f7f22b28c1471b3229b9bf
Author: xueyingzhang <86...@users.noreply.github.com>
AuthorDate: Sat Feb 19 11:52:42 2022 +0800

    [INLONG-2593] Use a unified version of logback (#2594)
---
 inlong-audit/pom.xml                   | 11 -----------
 inlong-manager/manager-service/pom.xml |  9 +++++++++
 inlong-tubemq/tubemq-manager/pom.xml   |  2 --
 pom.xml                                | 11 +++++++++++
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/inlong-audit/pom.xml b/inlong-audit/pom.xml
index fa2aa20..0e07d05 100644
--- a/inlong-audit/pom.xml
+++ b/inlong-audit/pom.xml
@@ -59,7 +59,6 @@
         <spring.version>5.3.15</spring.version>
         <druid.version>1.2.6</druid.version>
         <elasticsearch.version>6.8.23</elasticsearch.version>
-        <logback.version>1.2.10</logback.version>
         <gson.version>2.8.6</gson.version>
         <jackson.version>2.12.3</jackson.version>
         <junit.version>4.12</junit.version>
@@ -141,16 +140,6 @@
                 <version>${elasticsearch.version}</version>
             </dependency>
             <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-classic</artifactId>
-                <version>${logback.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>ch.qos.logback</groupId>
-                <artifactId>logback-core</artifactId>
-                <version>${logback.version}</version>
-            </dependency>
-            <dependency>
                 <groupId>com.google.code.gson</groupId>
                 <artifactId>gson</artifactId>
                 <version>${gson.version}</version>
diff --git a/inlong-manager/manager-service/pom.xml b/inlong-manager/manager-service/pom.xml
index 9c3680e..3faf9df 100644
--- a/inlong-manager/manager-service/pom.xml
+++ b/inlong-manager/manager-service/pom.xml
@@ -61,6 +61,15 @@
         </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>
         </dependency>
diff --git a/inlong-tubemq/tubemq-manager/pom.xml b/inlong-tubemq/tubemq-manager/pom.xml
index f3aaea6..e81a32d 100644
--- a/inlong-tubemq/tubemq-manager/pom.xml
+++ b/inlong-tubemq/tubemq-manager/pom.xml
@@ -109,7 +109,6 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-core</artifactId>
-            <version>1.2.10</version>
         </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
@@ -119,7 +118,6 @@
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>
-            <version>1.2.10</version>
         </dependency>
 
         <dependency>
diff --git a/pom.xml b/pom.xml
index 9aacc83..f73742d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -112,6 +112,7 @@
         <dockerfile-maven.version>1.4.13</dockerfile-maven.version>
         <docker.organization>inlong</docker.organization>
         <lombok.version>1.18.22</lombok.version>
+        <logback.version>1.2.10</logback.version>
     </properties>
 
     <dependencyManagement>
@@ -121,6 +122,16 @@
                 <artifactId>lombok</artifactId>
                 <version>${lombok.version}</version>
             </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>