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:39 UTC
[logging-log4j2] branch master 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 master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
The following commit(s) were added to refs/heads/master by this push:
new f2b4114 Update Spring framework to 5.3.13, Spring Boot to 2.5.7, and Spring Cloud to 2020.0.4.
f2b4114 is described below
commit f2b4114cca32d35ce9de6e620e5cccfe0175225d
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Mon Nov 22 12:48:32 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 ++++
.../log4j/spring/cloud/config/client/Log4j2EventListener.java | 7 -------
log4j-spring-cloud-config/pom.xml | 2 +-
pom.xml | 4 ++--
src/changes/changes.xml | 3 +++
5 files changed, 10 insertions(+), 10 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 b3d377d..02a20da 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
@@ -50,6 +50,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 ac96551..648be61 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,15 +19,8 @@ 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.bus.ConditionalOnBusEnabled;
-import org.springframework.cloud.bus.SpringCloudBusClient;
-import org.springframework.cloud.bus.event.RemoteApplicationEvent;
import org.springframework.cloud.context.environment.EnvironmentChangeEvent;
-import org.springframework.cloud.stream.annotation.EnableBinding;
-import org.springframework.cloud.stream.annotation.StreamListener;
import org.springframework.context.ApplicationListener;
-import org.springframework.context.event.EventListener;
import org.springframework.stereotype.Component;
@Component
diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml
index 8803bdc..bb4e25e 100644
--- a/log4j-spring-cloud-config/pom.xml
+++ b/log4j-spring-cloud-config/pom.xml
@@ -29,7 +29,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 036579b..c3afd80 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 9398ff9..8a58457 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -342,6 +342,9 @@
Fixed a deadlock between the AsyncLoggerContextSelector and java.util.logging.LogManager by updating Disruptor to 3.4.4.
</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 dev="ggregory" type="update">
- org.eclipse.persistence:javax.persistence ............. 2.1.1 -> 2.2.1
- org.eclipse.persistence:org.eclipse.persistence.jpa ... 2.6.5 -> 2.6.9