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 2020/12/13 23:44:24 UTC
[logging-log4j2] branch master updated: Update Spring dependencies
to 5.3.2, Spring Boot to 2.3.6, and Spring Cloud to Hoxton.SR9
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 86353b0 Update Spring dependencies to 5.3.2, Spring Boot to 2.3.6, and Spring Cloud to Hoxton.SR9
86353b0 is described below
commit 86353b026cbdb573bf9d3056ce47c602e9962c4d
Author: rgoers <ra...@dslextreme.com>
AuthorDate: Sun Dec 13 16:42:02 2020 -0700
Update Spring dependencies to 5.3.2, Spring Boot to 2.3.6, and Spring Cloud to Hoxton.SR9
---
.../cloud/config/sample/config/WebMvcConfig.java | 4 ++--
.../pom.xml | 24 ++--------------------
.../src/main/config-repo/log4j2.xml | 8 ++++----
log4j-spring-cloud-config/pom.xml | 2 +-
pom.xml | 4 ++--
src/changes/changes.xml | 7 +++++--
6 files changed, 16 insertions(+), 33 deletions(-)
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/WebMvcConfig.java b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/WebMvcConfig.java
index 1576f88..0a38fa3 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/WebMvcConfig.java
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-application/src/main/java/org/apache/logging/log4j/spring/cloud/config/sample/config/WebMvcConfig.java
@@ -22,10 +22,10 @@ import org.apache.logging.log4j.spring.cloud.config.sample.utils.spring.SampleRe
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.web.client.RestTemplate;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
@Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer {
private Logger LOGGER = LogManager.getLogger(WebMvcConfig.class);
@Bean
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
index d401d14..591b62d 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/pom.xml
@@ -14,7 +14,7 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.1.2.RELEASE</version>
+ <version>2.3.6.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
@@ -22,7 +22,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>1.8</java.version>
- <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+ <spring-cloud.version>Hoxton.SR9</spring-cloud.version>
<!-- paths -->
@@ -211,24 +211,4 @@
</site>
</distributionManagement>
- <repositories>
- <repository>
- <id>spring-snapshots</id>
- <name>Spring Snapshots</name>
- <url>https://repo.spring.io/snapshot</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- </repository>
- <repository>
- <id>spring-milestones</id>
- <name>Spring Milestones</name>
- <url>https://repo.spring.io/libs-milestone</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
-
</project>
diff --git a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/config-repo/log4j2.xml b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/config-repo/log4j2.xml
index 631399f..955431d 100644
--- a/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/config-repo/log4j2.xml
+++ b/log4j-spring-cloud-config/log4j-spring-cloud-config-samples/log4j-spring-cloud-config-sample-server/src/main/config-repo/log4j2.xml
@@ -101,7 +101,7 @@
<SizeBasedTriggeringPolicy size="10MB" />
<DefaultRolloverStrategy max="5"/>
</RollingFile>-->
- <Socket name="Elastic"
+ <!--<Socket name="Elastic"
host="\${sys:logstash.search.host}"
port="12222"
protocol="tcp"
@@ -124,8 +124,8 @@
<EventTemplateAdditionalField key="kubernetes.imageId" value="\${k8s:imageId:-}"/>
<EventTemplateAdditionalField key="kubernetes.imageName" value="\${k8s:imageName:-}"/>
</JsonTemplateLayout>
- </Socket>
- <!--<Socket name="Elastic" host="\${sys:logstash.search.host:-localhost}" port="12222" protocol="tcp" bufferedIo="true" ignoreExceptions="false">
+ </Socket> -->
+ <Socket name="Elastic" host="\${sys:logstash.search.host:-localhost}" port="12222" protocol="tcp" bufferedIo="true" ignoreExceptions="false">
<GelfLayout includeStackTrace="true" host="${hostName}" includeThreadContext="true" includeNullDelimiter="true"
compressionType="OFF">
<ThreadContextIncludes>requestId,sessionId,loginId,userId,ipAddress,corpAcctNumber,callingHost,ohBehalfOf,onBehalfOfAccount</ThreadContextIncludes>
@@ -147,7 +147,7 @@
<KeyValuePair key="kubernetes.imageId" value="\${k8s:imageId:-}"/>
<KeyValuePair key="kubernetes.imageName" value="\${k8s:imageName:-}"/>
</GelfLayout>
- </Socket>-->
+ </Socket>
<Console name="Console" target="SYSTEM_OUT">
<RFC5424Layout enterpriseNumber="50177" includeMDC="true" mdcId="RequestContext" appName="SalesforceGateway"
mdcPrefix="" newLine="true" mdcIncludes="requestId,sessionId,loginId,userId,ipAddress,corpAcctNumber"/>
diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml
index fc20cf2..8803bdc 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.SR7</spring-cloud-version>
+ <spring-cloud-version>Hoxton.SR9</spring-cloud-version>
<log4jParentDir>${basedir}/..</log4jParentDir>
<maven.doap.skip>true</maven.doap.skip>
</properties>
diff --git a/pom.xml b/pom.xml
index c85505a..3b9c10a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,8 +189,8 @@
<logbackVersion>1.2.3</logbackVersion>
<jackson1Version>1.9.13</jackson1Version>
<jackson2Version>2.11.2</jackson2Version>
- <spring-boot.version>2.3.4.RELEASE</spring-boot.version>
- <springVersion>5.2.8.RELEASE</springVersion>
+ <spring-boot.version>2.3.6.RELEASE</spring-boot.version>
+ <springVersion>5.3.2</springVersion>
<kubernetes-client.version>4.6.1</kubernetes-client.version>
<flumeVersion>1.9.0</flumeVersion>
<disruptorVersion>3.4.2</disruptorVersion>
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 40686a1..229ee48 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -194,11 +194,14 @@
<action issue="LOG4J2-2844" dev="ggregory" type="fix">
Null pointer exception when no network interfaces are available.
</action>
- <action issue="LOG4J2-2850" dev="sandeepbarnwal" type="fix">
- Fixes incorrect constructor call in LocalizedMessageFactory.
+ <action issue="LOG4J2-2850" dev="sandeepbarnwal" type="fix">
+ Fixes incorrect constructor call in LocalizedMessageFactory.
</action>
</release>
<release version="2.14.1" date="2020-MM-DD" description="GA Release 2.14.1">
+ <action dev="rgoers" type="update">
+ Update Spring dependencies to 5.3.2, Spring Boot to 2.3.6, and Spring Cloud to Hoxton.SR9.
+ </action>
<action issue="LOG4J2-2974" dev="rgoers" type="fix">
Log4j would fail to initialize in Java 8 with log4j-spring-boot.
</action>