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:09 UTC
[logging-log4j2] branch release-2.x 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 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 f5aad57 Update Spring dependencies to 5.3.2, Spring Boot to 2.3.6, and Spring Cloud to Hoxton.SR9
f5aad57 is described below
commit f5aad577323e5a945403e6f168f1a599ec443988
Author: Ralph Goers <rg...@apache.org>
AuthorDate: Sun Dec 13 16:43:32 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 | 4 +--
.../src/main/config-repo/log4j2.xml | 39 ++++++++++++----------
log4j-spring-cloud-config/pom.xml | 4 +--
pom.xml | 4 +--
src/changes/changes.xml | 3 ++
6 files changed, 31 insertions(+), 27 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 a67b1ef..63582ea 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
@@ -29,7 +29,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>
@@ -38,7 +38,7 @@
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<log4jParentDir>${basedir}/../../..</log4jParentDir>
<java.version>1.8</java.version>
- <spring-cloud.version>Greenwich.SR1</spring-cloud.version>
+ <spring-cloud.version>Hoxton.SR9</spring-cloud.version>
<deploy.plugin.version>2.8.2</deploy.plugin.version>
<!-- paths -->
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 e88234f..ae07aef 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
@@ -106,24 +106,27 @@
port="12222"
protocol="tcp"
bufferedIo="true">
- <JsonTemplateLayout eventTemplateUri="classpath:GelfLayout.json" nullEventDelimiterEnabled="true">
- <EventTemplateAdditionalField key="containerId" value="\${docker:containerId:-}"/>
- <EventTemplateAdditionalField key="application" value="\${lower:${spring:spring.application.name:-spring}}"/>
- <EventTemplateAdditionalField key="kubernetes.serviceAccountName" value="\${k8s:accountName:-}"/>
- <EventTemplateAdditionalField key="kubernetes.containerId" value="\${k8s:containerId:-}"/>
- <EventTemplateAdditionalField key="kubernetes.containerName" value="\${k8s:containerName:-}"/>
- <EventTemplateAdditionalField key="kubernetes.host" value="\${k8s:host:-}"/>
- <EventTemplateAdditionalField key="kubernetes.labels.app" value="\${k8s:labels.app:-}"/>
- <EventTemplateAdditionalField key="kubernetes.labels.pod-template-hash" value="\${k8s:labels.podTemplateHash:-}"/>
- <EventTemplateAdditionalField key="kubernetes.master_url" value="\${k8s:masterUrl:-}"/>
- <EventTemplateAdditionalField key="kubernetes.namespaceId" value="\${k8s:namespaceId:-}"/>
- <EventTemplateAdditionalField key="kubernetes.namespaceName" value="\${k8s:namespaceName:-}"/>
- <EventTemplateAdditionalField key="kubernetes.podID" value="\${k8s:podId:-}"/>
- <EventTemplateAdditionalField key="kubernetes.podIP" value="\${k8s:podIp:-}"/>
- <EventTemplateAdditionalField key="kubernetes.podName" value="\${k8s:podName:-}"/>
- <EventTemplateAdditionalField key="kubernetes.imageId" value="\${k8s:imageId:-}"/>
- <EventTemplateAdditionalField key="kubernetes.imageName" value="\${k8s:imageName:-}"/>
- </JsonTemplateLayout>
+ <GelfLayout includeStackTrace="true" host="${hostName}" includeThreadContext="true" includeNullDelimiter="true"
+ compressionType="OFF">
+ <ThreadContextIncludes>requestId,sessionId,loginId,userId,ipAddress,corpAcctNumber,callingHost,ohBehalfOf,onBehalfOfAccount</ThreadContextIncludes>
+ <MessagePattern>%d [%t] %-5p %X{requestId, sessionId, loginId, userId, ipAddress, corpAcctNumber} %C{1.}.%M:%L - %m%n</MessagePattern>
+ <KeyValuePair key="docker.containerId" value="\${docker:containerId:-}"/>
+ <KeyValuePair key="application" value="$\${lower:\${spring:spring.application.name}}"/>
+ <KeyValuePair key="kubernetes.serviceAccountName" value="\${k8s:accountName:-}"/>
+ <KeyValuePair key="kubernetes.containerId" value="\${k8s:containerId:-}"/>
+ <KeyValuePair key="kubernetes.containerName" value="\${k8s:containerName:-}"/>
+ <KeyValuePair key="kubernetes.host" value="\${k8s:host:-}"/>
+ <KeyValuePair key="kubernetes.labels.app" value="\${k8s:labels.app:-}"/>
+ <KeyValuePair key="kubernetes.labels.pod-template-hash" value="\${k8s:labels.podTemplateHash:-}"/>
+ <KeyValuePair key="kubernetes.master_url" value="\${k8s:masterUrl:-}"/>
+ <KeyValuePair key="kubernetes.namespaceId" value="\${k8s:namespaceId:-}"/>
+ <KeyValuePair key="kubernetes.namespaceName" value="\${k8s:namespaceName:-}"/>
+ <KeyValuePair key="kubernetes.podID" value="\${k8s:podId:-}"/>
+ <KeyValuePair key="kubernetes.podIP" value="\${k8s:podIp:-}"/>
+ <KeyValuePair key="kubernetes.podName" value="\${k8s:podName:-}"/>
+ <KeyValuePair key="kubernetes.imageId" value="\${k8s:imageId:-}"/>
+ <KeyValuePair key="kubernetes.imageName" value="\${k8s:imageName:-}"/>
+ </GelfLayout>
</Socket>
<Console name="Console" target="SYSTEM_OUT">
<RFC5424Layout enterpriseNumber="50177" includeMDC="true" mdcId="RequestContext" appName="SalesforceGateway"
diff --git a/log4j-spring-cloud-config/pom.xml b/log4j-spring-cloud-config/pom.xml
index bf2bab4..c28ad39 100644
--- a/log4j-spring-cloud-config/pom.xml
+++ b/log4j-spring-cloud-config/pom.xml
@@ -31,9 +31,7 @@
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<revapi.skip>true</revapi.skip>
- <spring-cloud-version>Hoxton.SR7</spring-cloud-version>
- <spring-boot.version>2.3.4.RELEASE</spring-boot.version>
- <springVersion>5.2.8.RELEASE</springVersion>
+ <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 769ef69..f71075d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -189,8 +189,8 @@
<logbackVersion>1.2.3</logbackVersion>
<jackson1Version>1.9.13</jackson1Version>
<jackson2Version>2.11.3</jackson2Version>
- <spring-boot.version>2.3.4.RELEASE</spring-boot.version>
- <springVersion>5.3.1</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 03dba8a..7fad886 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,6 +30,9 @@
- "remove" - Removed
-->
<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>