GEODE-9888: Bump log4j from 2.14.0 to 2.15.0 (#7184)

apache · Dec 10, 2021 · a5981d2 · a5981d2
1 parent 9099e1f
commit a5981d2
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 18 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
@@ -622,31 +622,31 @@
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-api</artifactId>
-        <version>2.14.0</version>
+        <version>2.15.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-core</artifactId>
-        <version>2.14.0</version>
+        <version>2.15.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-jcl</artifactId>
-        <version>2.14.0</version>
+        <version>2.15.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-jul</artifactId>
-        <version>2.14.0</version>
+        <version>2.15.0</version>
         <scope>compile</scope>
       </dependency>
       <dependency>
         <groupId>org.apache.logging.log4j</groupId>
         <artifactId>log4j-slf4j-impl</artifactId>
-        <version>2.14.0</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
@@ -40,7 +40,7 @@ class DependencyConstraints implements Plugin<Project> {
     deps.put("fastutil.version", "8.5.2")
     deps.put("javax.transaction-api.version", "1.3")
     deps.put("jgroups.version", "3.6.14.Final")
-    deps.put("log4j.version", "2.14.0")
+    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
@@ -1041,11 +1041,11 @@ lib/jline-2.12.jar
 lib/jna-5.6.0.jar
 lib/jna-platform-5.6.0.jar
 lib/jopt-simple-5.0.4.jar
-lib/log4j-api-2.14.0.jar
-lib/log4j-core-2.14.0.jar
-lib/log4j-jcl-2.14.0.jar
-lib/log4j-jul-2.14.0.jar
-lib/log4j-slf4j-impl-2.14.0.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
@@ -27,8 +27,8 @@ httpcore-4.4.14.jar
 HikariCP-4.0.1.jar
 commons-lang3-3.11.jar
 jaxb-api-2.3.1.jar
-log4j-jcl-2.14.0.jar
-log4j-api-2.14.0.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
@@ -77,9 +77,9 @@ jetty-io-9.4.39.v20210325.jar
 jetty-xml-9.4.39.v20210325.jar
 jetty-util-9.4.39.v20210325.jar
 jetty-util-ajax-9.4.39.v20210325.jar
-log4j-slf4j-impl-2.14.0.jar
-log4j-core-2.14.0.jar
-log4j-jul-2.14.0.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-docs/managing/logging/how_logging_works.html.md.erb b/geode-docs/managing/logging/how_logging_works.html.md.erb
@@ -23,7 +23,7 @@ limitations under the License.
 
 <%=vars.product_name%> has been tested with Log4j 2.14.
 <%=vars.product_name%> requires the 
-`log4j-api-2.14.0.jar` and `log4j-core-2.14.0.jar`
+`log4j-api-2.15.0.jar` and `log4j-core-2.15.0.jar`
 JAR files to be in the classpath.
 Both of these JARs are distributed in the `<path-to-product>/lib` directory and included in the appropriate `*-dependencies.jar` convenience libraries.
 

diff --git 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.14.0')
+  compileOnly('org.apache.logging.log4j:log4j-api:2.15.0')
 
   testImplementation(project(':geode-junit'))
   testImplementation('org.assertj:assertj-core')