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 ad318c7dd9a..57c16c097df 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 @@ -47,6 +47,10 @@ log4j-spring-boot ${project.version} + + org.springframework.cloud + spring-cloud-starter-bootstrap + org.springframework.cloud spring-cloud-config-client 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 e6fd49d3310..179d561de1e 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 @@ 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 7d3be766354..b1905ee8505 100644 --- a/log4j-spring-cloud-config/pom.xml +++ b/log4j-spring-cloud-config/pom.xml @@ -31,7 +31,7 @@ UTF-8 true - Hoxton.SR9 + 2020.0.4 ${basedir}/.. true diff --git a/pom.xml b/pom.xml index 5b891cbde7b..1e7204c7e42 100644 --- a/pom.xml +++ b/pom.xml @@ -198,8 +198,8 @@ 1.2.3 1.9.13 2.12.4 - 2.3.6.RELEASE - 5.3.9 + 2.5.7 + 5.3.13 4.6.1 1.9.0 3.4.4 diff --git a/src/changes/changes.xml b/src/changes/changes.xml index dd575a49eac..247face4e56 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 + + Update Spring framework to 5.3.13, Spring Boot to 2.5.7, and Spring Cloud to 2020.0.4. + Provide support for overriding the Tomcat Log class in Tomcat 8.5+.