You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2021/12/13 02:45:17 UTC
[dubbo] branch master updated: fix: Update the version of log4j for bug fixes (#9378)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 7cb6bff fix: Update the version of log4j for bug fixes (#9378)
7cb6bff is described below
commit 7cb6bff60598ff6729f6cf7eab46775f2b4ad305
Author: Pin Xiong <pi...@foxmail.com>
AuthorDate: Mon Dec 13 10:44:59 2021 +0800
fix: Update the version of log4j for bug fixes (#9378)
---
dubbo-dependencies-bom/pom.xml | 3 ++-
dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml | 14 ++++++++++++++
dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml | 14 ++++++++++++++
dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml | 14 ++++++++++++++
dubbo-spring-boot/pom.xml | 2 ++
5 files changed, 46 insertions(+), 1 deletion(-)
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index c4176dd..cbe72ee 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -138,7 +138,8 @@
<jcl_version>1.2</jcl_version>
<log4j_version>1.2.16</log4j_version>
<logback_version>1.2.2</logback_version>
- <log4j2_version>2.11.1</log4j2_version>
+ <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
+ <log4j2_version>2.15.0</log4j2_version>
<commons_io_version>2.7</commons_io_version>
<embedded_redis_version>0.10.0</embedded_redis_version>
diff --git a/dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml
index 5c066f4..e933eab 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-actuator/pom.xml
@@ -43,6 +43,20 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<optional>true</optional>
+ <exclusions>
+ <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
+ <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>
+ <optional>true</optional>
+ <version>${log4j2_version}</version>
</dependency>
<dependency>
diff --git a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml
index 98e6816..57fcf1d 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-autoconfigure/pom.xml
@@ -51,6 +51,20 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-logging</artifactId>
<optional>true</optional>
+ <exclusions>
+ <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
+ <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>
+ <optional>true</optional>
+ <version>${log4j2_version}</version>
</dependency>
<!-- Dubbo -->
diff --git a/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml b/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml
index d381646..5be613c 100644
--- a/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml
+++ b/dubbo-spring-boot/dubbo-spring-boot-starter/pom.xml
@@ -37,6 +37,20 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
<optional>true</optional>
+ <exclusions>
+ <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
+ <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>
+ <optional>true</optional>
+ <version>${log4j2_version}</version>
</dependency>
<dependency>
diff --git a/dubbo-spring-boot/pom.xml b/dubbo-spring-boot/pom.xml
index 2299bb6..68d5ffa 100644
--- a/dubbo-spring-boot/pom.xml
+++ b/dubbo-spring-boot/pom.xml
@@ -41,6 +41,8 @@
<properties>
<spring-boot.version>2.3.1.RELEASE</spring-boot.version>
<dubbo.version>${revision}</dubbo.version>
+ <!-- Fix the bug of log4j refer:https://github.com/apache/logging-log4j2/pull/608 -->
+ <log4j2_version>2.15.0</log4j2_version>
</properties>
<dependencyManagement>