You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by rg...@apache.org on 2021/11/22 19:48:03 UTC
[logging-log4j2] branch release-2.x updated: Update Spring framework to 5.3.13, Spring Boot to 2.5.7, and Spring Cloud to 2020.0.4.
This is an automated email from the ASF dual-hosted git repository.
rgoers pushed a commit to branch release-2.x
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/release-2.x by this push:
new 49c005c Update Spring framework to 5.3.13, Spring Boot to 2.5.7, and Spring Cloud to 2020.0.4.
49c005c is described below
commit 49c005c5ea1d5683a4ba043cf66bfd891b53c987
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Mon Nov 22 12:47:50 2021 -0700
Update Spring framework to 5.3.13, Spring Boot to 2.5.7, and Spring Cloud to 2020.0.4.
---
log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml | 4 ++++
.../logging/log4j/spring/cloud/config/client/Log4j2EventListener.java | 1 -
log4j-spring-cloud-config/pom.xml | 2 +-
pom.xml | 4 ++--
src/changes/changes.xml | 3 +++
5 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
index ad318c7..57c16c0 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/pom.xml
@@ -49,6 +49,10 @@
</dependency>
<dependency>
<groupId>org.springframework.cloud</groupId>
+ <artifactId>spring-cloud-starter-bootstrap</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-config-client</artifactId>
</dependency>
<dependency>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListener.java b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListener.java
index e6fd49d..179d561 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListener.java
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-client/src/main/java/org/apache/logging/log4j/spring/cloud/config/client/Log4j2EventListener.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.spring.cloud.config.client;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-
import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;
diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml
index 7d3be76..b1905ee 100644
--- a/log4j-spring-cloud-config/pom.xml
+++ b/log4j-spring-cloud-config/pom.xml
@@ -31,7 +31,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<revapi.skip>true</revapi.skip>
- <spring-cloud-version>Hoxton.SR9</spring-cloud-version>
+ <spring-cloud-version>2020.0.4</spring-cloud-version>
<log4jParentDir>${basedir}/..</log4jParentDir>
<maven.doap.skip>true</maven.doap.skip>
</properties>
diff --git a/pom.xml b/pom.xml
index 5b891cb..1e7204c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -198,8 +198,8 @@
<logbackVersion>1.2.3</logbackVersion>
<jackson1Version>1.9.13</jackson1Version>
<jackson2Version>2.12.4</jackson2Version>
- <spring-boot.version>2.3.6.RELEASE</spring-boot.version>
- <springVersion>5.3.9</springVersion>
+ <spring-boot.version>2.5.7</spring-boot.version>
+ <springVersion>5.3.13</springVersion>
<kubernetes-client.version>4.6.1</kubernetes-client.version>
<flumeVersion>1.9.0</flumeVersion>
<disruptorVersion>3.4.4</disruptorVersion>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index dd575a4..247face 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -213,6 +213,9 @@
Wrong subject on mail when it depends on the LogEvent
</action>
<!-- UPDATES -->
+ <action dev="rgoers" type="update">
+ Update Spring framework to 5.3.13, Spring Boot to 2.5.7, and Spring Cloud to 2020.0.4.
+ </action>
<action issue="LOG4J2-2025" dev="rgoers" type="update">
Provide support for overriding the Tomcat Log class in Tomcat 8.5+.
</action>