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 2019/08/07 22:23:16 UTC
[geode] 02/02: GEODE-7051: Upgrade to log4j 2.12.0
This is an automated email from the ASF dual-hosted git repository.
onichols pushed a commit to branch release/1.10.0
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 7f8cfc7e3145fc0fd6099708dae6a686f3973037
Author: Kirk Lund <kl...@apache.org>
AuthorDate: Tue Aug 6 12:38:52 2019 -0700
GEODE-7051: Upgrade to log4j 2.12.0
(cherry picked from commit e1b61cdcaf38966bbb732b0b3db5223f2cc4f5e4)
---
boms/geode-all-bom/src/test/resources/expected-pom.xml | 10 +++++-----
.../apache/geode/gradle/plugins/DependencyConstraints.groovy | 2 +-
.../resources/gradle-test-projects/management/build.gradle | 2 +-
.../src/integrationTest/resources/assembly_content.txt | 10 +++++-----
.../src/integrationTest/resources/dependency_classpath.txt | 10 +++++-----
geode-wan/build.gradle | 2 +-
6 files changed, 18 insertions(+), 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
index 1dcf64b..fb62353 100644
--- a/boms/geode-all-bom/src/test/resources/expected-pom.xml
+++ b/boms/geode-all-bom/src/test/resources/expected-pom.xml
@@ -562,31 +562,31 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
- <version>2.11.1</version>
+ <version>2.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
- <version>2.11.1</version>
+ <version>2.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jcl</artifactId>
- <version>2.11.1</version>
+ <version>2.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-jul</artifactId>
- <version>2.11.1</version>
+ <version>2.12.0</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
- <version>2.11.1</version>
+ <version>2.12.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 00cd608..0f646a5 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.2.2")
deps.put("javax.transaction-api.version", "1.3")
deps.put("jgroups.version", "3.6.14.Final")
- deps.put("log4j.version", "2.11.1")
+ deps.put("log4j.version", "2.12.0")
deps.put("micrometer.version", "1.2.0")
deps.put("shiro.version", "1.4.0")
deps.put("slf4j-api.version", "1.7.25")
diff --git a/geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle b/geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle
index 6bb1470..b1252a6 100644
--- a/geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle
+++ b/geode-assembly/src/acceptanceTest/resources/gradle-test-projects/management/build.gradle
@@ -25,7 +25,7 @@ repositories {
dependencies {
compile("${project.group}:geode-core:${project.version}")
- runtime('org.apache.logging.log4j:log4j-slf4j-impl:2.11.1')
+ runtime('org.apache.logging.log4j:log4j-slf4j-impl:2.12.0')
}
application {
diff --git a/geode-assembly/src/integrationTest/resources/assembly_content.txt b/geode-assembly/src/integrationTest/resources/assembly_content.txt
index f5c7cd2..196eea4 100644
--- a/geode-assembly/src/integrationTest/resources/assembly_content.txt
+++ b/geode-assembly/src/integrationTest/resources/assembly_content.txt
@@ -979,11 +979,11 @@ lib/jgroups-3.6.14.Final.jar
lib/jline-2.12.jar
lib/jna-4.1.0.jar
lib/jopt-simple-5.0.4.jar
-lib/log4j-api-2.11.1.jar
-lib/log4j-core-2.11.1.jar
-lib/log4j-jcl-2.11.1.jar
-lib/log4j-jul-2.11.1.jar
-lib/log4j-slf4j-impl-2.11.1.jar
+lib/log4j-api-2.12.0.jar
+lib/log4j-core-2.12.0.jar
+lib/log4j-jcl-2.12.0.jar
+lib/log4j-jul-2.12.0.jar
+lib/log4j-slf4j-impl-2.12.0.jar
lib/lucene-analyzers-common-6.6.2.jar
lib/lucene-analyzers-phonetic-6.6.2.jar
lib/lucene-core-6.6.2.jar
diff --git a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
index 273e1d9..6d33133 100644
--- a/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
+++ b/geode-assembly/src/integrationTest/resources/dependency_classpath.txt
@@ -53,11 +53,11 @@ jgroups-3.6.14.Final.jar
jline-2.12.jar
jna-4.1.0.jar
jopt-simple-5.0.4.jar
-log4j-api-2.11.1.jar
-log4j-core-2.11.1.jar
-log4j-jcl-2.11.1.jar
-log4j-jul-2.11.1.jar
-log4j-slf4j-impl-2.11.1.jar
+log4j-api-2.12.0.jar
+log4j-core-2.12.0.jar
+log4j-jcl-2.12.0.jar
+log4j-jul-2.12.0.jar
+log4j-slf4j-impl-2.12.0.jar
lucene-analyzers-common-6.6.2.jar
lucene-analyzers-phonetic-6.6.2.jar
lucene-core-6.6.2.jar
diff --git a/geode-wan/build.gradle b/geode-wan/build.gradle
index 3e2c0d5..95fcded 100644
--- a/geode-wan/build.gradle
+++ b/geode-wan/build.gradle
@@ -28,7 +28,7 @@ dependencies {
}
compile(project(':geode-core'))
- compileOnly('org.apache.logging.log4j:log4j-api:2.11.1')
+ compileOnly('org.apache.logging.log4j:log4j-api:2.12.0')
testCompile(project(':geode-junit')) {
exclude module: 'geode-core'