You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by on...@apache.org on 2021/12/10 19:12:26 UTC
[geode] branch support/1.13 updated: GEODE-9888: Bump log4j from 2.13.1 to 2.15.0 (#7186)
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch support/1.13
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/support/1.13 by this push:
new 73ba38e GEODE-9888: Bump log4j from 2.13.1 to 2.15.0 (#7186)
73ba38e is described below
commit 73ba38ea74b3be48d83fda023f3972ad011d05dd
Author: Owen Nichols <34...@users.noreply.github.com>
AuthorDate: Fri Dec 10 11:09:25 2021 -0800
GEODE-9888: Bump log4j from 2.13.1 to 2.15.0 (#7186)
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 10 +++++-----
.../apache/geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 10 +++++-----
.../src/integrationTest/resources/dependency_classpath.txt | 10 +++++-----
geode-wan/build.gradle | 2 +-
5 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/boms/geode-all-bom/src/test/resources/expected-pom.xml b/boms/geode-all-bom/src/test/resources/expected-pom.xml
index 9fb7ed3..060425c 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -628,31 +628,31 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.13.1</version>
+ <version>2.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.13.1</version>
+ <version>2.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
- <version>2.13.1</version>
+ <version>2.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
- <version>2.13.1</version>
+ <version>2.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.13.1</version>
+ <version>2.15.0</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
index 1d8ca9d..325c166 100644
--- a/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
+++ b/buildSrc/src/main/groovy/org/apache/geode/gradle/plugins/DependencyConstraints.groovy
@@ -40,7 +40,7 @@ class DependencyConstraints implements Plugin<Project> {
deps.put("fastutil.version", "8.3.1")
deps.put("javax.transaction-api.version", "1.3")
deps.put("jgroups.version", "3.6.14.Final")
- deps.put("log4j.version", "2.13.1")
+ deps.put("log4j.version", "2.15.0")
deps.put("micrometer.version", "1.6.3")
deps.put("shiro.version", "1.8.0")
deps.put("slf4j-api.version", "1.7.30")
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index 88defbe..176282b 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -1045,11 +1045,11 @@ lib/jline-2.12.jar
lib/jna-5.5.0.jar
lib/jna-platform-5.5.0.jar
lib/jopt-simple-5.0.4.jar
-lib/log4j-api-2.13.1.jar
-lib/log4j-core-2.13.1.jar
-lib/log4j-jcl-2.13.1.jar
-lib/log4j-jul-2.13.1.jar
-lib/log4j-slf4j-impl-2.13.1.jar
+lib/log4j-api-2.15.0.jar
+lib/log4j-core-2.15.0.jar
+lib/log4j-jcl-2.15.0.jar
+lib/log4j-jul-2.15.0.jar
+lib/log4j-slf4j-impl-2.15.0.jar
lib/lucene-analyzers-common-6.6.6.jar
lib/lucene-analyzers-phonetic-6.6.6.jar
lib/lucene-core-6.6.6.jar
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 6433338..dc0796d 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -27,8 +27,8 @@ httpcore-4.4.13.jar
HikariCP-3.4.2.jar
commons-lang3-3.10.jar
jaxb-api-2.3.1.jar
-log4j-jcl-2.13.1.jar
-log4j-api-2.13.1.jar
+log4j-jcl-2.15.0.jar
+log4j-api-2.15.0.jar
spring-shell-1.2.0.RELEASE.jar
rmiio-2.1.2.jar
antlr-2.7.7.jar
@@ -78,9 +78,9 @@ jetty-io-9.4.39.v20210325.jar
jetty-xml-9.4.39.v20210325.jar
jetty-util-ajax-9.4.39.v20210325.jar
jetty-util-9.4.39.v20210325.jar
-log4j-slf4j-impl-2.13.1.jar
-log4j-core-2.13.1.jar
-log4j-jul-2.13.1.jar
+log4j-slf4j-impl-2.15.0.jar
+log4j-core-2.15.0.jar
+log4j-jul-2.15.0.jar
lucene-analyzers-phonetic-6.6.6.jar
lucene-analyzers-common-6.6.6.jar
lucene-queryparser-6.6.6.jar
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index 97c6c02..f25bf9b 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -30,7 +30,7 @@ dependencies {
implementation(project(':geode-tcp-server'))
implementation(project(':geode-core'))
- compileOnly('org.apache.logging.log4j:log4j-api:2.13.1')
+ compileOnly('org.apache.logging.log4j:log4j-api:2.15.0')
testImplementation(project(':geode-junit'))
testImplementation('org.assertj:assertj-core')