This is an automated email from the ASF dual-hosted git repository.
xjiao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/mnemonic.git
The following commit(s) were added to refs/heads/master by this push:
new 1ac400e MNEMONIC-713: Update log4j modules for Gradle build system
1ac400e is described below
commit 1ac400ebee7a0679cf003bd712603d6f9da12e0a
Author: Yanhui Zhao <[email protected]>
AuthorDate: Fri Apr 15 03:31:56 2022 +0000
MNEMONIC-713: Update log4j modules for Gradle build system
---
build.gradle | 12 +++++++-----
mnemonic-benches/mnemonic-sort-bench/build.gradle | 6 +-----
mnemonic-benches/mnemonic-spark-kmeans-bench/build.gradle | 6 +-----
mnemonic-collections/build.gradle | 6 +-----
mnemonic-common/build.gradle | 6 +-----
mnemonic-core/build.gradle | 6 +-----
mnemonic-examples/build.gradle | 6 +-----
mnemonic-hadoop/mnemonic-hadoop-mapreduce/build.gradle | 6 +-----
mnemonic-sessions/build.gradle | 6 +-----
mnemonic-spark/mnemonic-spark-core/build.gradle | 6 +-----
10 files changed, 16 insertions(+), 50 deletions(-)
diff --git a/build.gradle b/build.gradle
index fd48844..7888d2c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -46,11 +46,13 @@ subprojects {
dependency 'org.testng:testng:6.8.17'
dependency 'commons-cli:commons-cli:1.3.1'
dependency 'com.squareup:javapoet:1.13.0'
- dependency 'org.slf4j:slf4j-api:1.7.21'
- dependency 'org.slf4j:slf4j-log4j12:1.7.21'
- dependency 'org.slf4j:jul-to-slf4j:1.7.21'
- dependency 'org.slf4j:jcl-over-slf4j:1.7.21'
- dependency 'log4j:log4j:1.2.17'
+ dependency 'org.apache.logging.log4j:log4j-api:2.11.0'
+ dependency 'org.apache.logging.log4j:log4j-core:2.11.0'
+ dependency 'org.apache.logging.log4j:log4j-1.2-api:2.11.0'
+ dependency 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.0'
+ dependency 'org.apache.logging.log4j:log4j-web:2.11.0'
+ dependency 'org.slf4j:slf4j-api:1.7.25'
+ dependency 'com.lmax:disruptor:3.3.7'
dependency 'ch.qos.logback:logback-classic:1.1.7'
dependency 'ch.qos.logback:logback-core:1.1.7'
}
diff --git a/mnemonic-benches/mnemonic-sort-bench/build.gradle
b/mnemonic-benches/mnemonic-sort-bench/build.gradle
index 0e20325..7baf81f 100644
--- a/mnemonic-benches/mnemonic-sort-bench/build.gradle
+++ b/mnemonic-benches/mnemonic-sort-bench/build.gradle
@@ -30,11 +30,7 @@ dependencies {
api project(':mnemonic-memory-services:mnemonic-sys-vmem-service')
api 'commons-cli:commons-cli'
api 'org.apache.commons:commons-lang3'
- api 'org.slf4j:slf4j-api'
- api 'org.slf4j:jul-to-slf4j'
- api 'org.slf4j:jcl-over-slf4j'
- api 'log4j:log4j'
- api 'org.slf4j:slf4j-log4j12'
+ api 'org.apache.logging.log4j:log4j-slf4j-impl'
testCompileOnly 'org.testng:testng'
}
diff --git a/mnemonic-benches/mnemonic-spark-kmeans-bench/build.gradle
b/mnemonic-benches/mnemonic-spark-kmeans-bench/build.gradle
index 41ddfc3..1d730e7 100644
--- a/mnemonic-benches/mnemonic-spark-kmeans-bench/build.gradle
+++ b/mnemonic-benches/mnemonic-spark-kmeans-bench/build.gradle
@@ -47,11 +47,7 @@ dependencies {
implementation "org.scala-lang:scala-library:${scala_version}"
implementation "org.scala-lang:scala-reflect:${scala_version}"
implementation "org.scala-lang:scala-actors:${scala_version}"
- api 'org.slf4j:slf4j-api'
- api 'org.slf4j:jul-to-slf4j'
- api 'org.slf4j:jcl-over-slf4j'
- api 'log4j:log4j'
- api 'org.slf4j:slf4j-log4j12'
+ api 'org.apache.logging.log4j:log4j-slf4j-impl'
testCompileOnly 'org.testng:testng'
testImplementation
"org.scalatest:scalatest_${scala_bin_version}:${scalatest_version}"
}
diff --git a/mnemonic-collections/build.gradle
b/mnemonic-collections/build.gradle
index 2118f98..ed68e2f 100644
--- a/mnemonic-collections/build.gradle
+++ b/mnemonic-collections/build.gradle
@@ -35,11 +35,7 @@ dependencies {
api project(':mnemonic-core')
api project(':mnemonic-memory-services:mnemonic-pmalloc-service')
api 'org.apache.commons:commons-lang3'
- api 'org.slf4j:slf4j-api'
- api 'org.slf4j:jul-to-slf4j'
- api 'org.slf4j:jcl-over-slf4j'
- api 'log4j:log4j'
- api 'org.slf4j:slf4j-log4j12'
+ api 'org.apache.logging.log4j:log4j-slf4j-impl:2.11.0'
testCompileOnly 'org.testng:testng'
}
diff --git a/mnemonic-common/build.gradle b/mnemonic-common/build.gradle
index 2f37957..cb79be8 100644
--- a/mnemonic-common/build.gradle
+++ b/mnemonic-common/build.gradle
@@ -19,11 +19,7 @@ description = 'mnemonic-common'
dependencies {
api 'org.apache.commons:commons-lang3'
- api 'org.slf4j:slf4j-api'
- api 'org.slf4j:jul-to-slf4j'
- api 'org.slf4j:jcl-over-slf4j'
- api 'log4j:log4j'
- api 'org.slf4j:slf4j-log4j12'
+ api 'org.apache.logging.log4j:log4j-slf4j-impl'
testCompileOnly 'org.testng:testng'
}
test.useTestNG()
diff --git a/mnemonic-core/build.gradle b/mnemonic-core/build.gradle
index da11b33..9e9f3e0 100644
--- a/mnemonic-core/build.gradle
+++ b/mnemonic-core/build.gradle
@@ -31,11 +31,7 @@ dependencies {
api project(':mnemonic-memory-services:mnemonic-nvml-vmem-service')
api 'org.apache.commons:commons-lang3'
api 'com.squareup:javapoet'
- api 'org.slf4j:slf4j-api'
- api 'org.slf4j:jul-to-slf4j'
- api 'org.slf4j:jcl-over-slf4j'
- api 'log4j:log4j'
- api 'org.slf4j:slf4j-log4j12'
+ api 'org.apache.logging.log4j:log4j-slf4j-impl'
testAnnotationProcessor project(':mnemonic-core')
testCompileOnly project(':mnemonic-core')
testCompileOnly 'org.testng:testng'
diff --git a/mnemonic-examples/build.gradle b/mnemonic-examples/build.gradle
index 1c93deb..8bad540 100644
--- a/mnemonic-examples/build.gradle
+++ b/mnemonic-examples/build.gradle
@@ -36,11 +36,7 @@ dependencies {
api project(':mnemonic-memory-services:mnemonic-nvml-vmem-service')
api project(':mnemonic-memory-services:mnemonic-nvml-pmem-service')
api 'org.apache.commons:commons-lang3'
- api 'org.slf4j:slf4j-api'
- api 'org.slf4j:jul-to-slf4j'
- api 'org.slf4j:jcl-over-slf4j'
- api 'log4j:log4j'
- api 'org.slf4j:slf4j-log4j12'
+ api 'org.apache.logging.log4j:log4j-slf4j-impl'
testCompileOnly 'org.testng:testng'
}
diff --git a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/build.gradle
b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/build.gradle
index 1554d02..ed984ab 100644
--- a/mnemonic-hadoop/mnemonic-hadoop-mapreduce/build.gradle
+++ b/mnemonic-hadoop/mnemonic-hadoop-mapreduce/build.gradle
@@ -40,11 +40,7 @@ dependencies {
implementation "org.apache.hadoop:hadoop-common:${hadoop_version}"
implementation "org.apache.hadoop:hadoop-hdfs:${hadoop_version}"
implementation
"org.apache.hadoop:hadoop-mapreduce-client-core:${hadoop_version}"
- api 'org.slf4j:slf4j-api'
- api 'org.slf4j:jul-to-slf4j'
- api 'org.slf4j:jcl-over-slf4j'
- api 'log4j:log4j'
- api 'org.slf4j:slf4j-log4j12'
+ api 'org.apache.logging.log4j:log4j-slf4j-impl'
testCompileOnly 'org.testng:testng'
}
diff --git a/mnemonic-sessions/build.gradle b/mnemonic-sessions/build.gradle
index d4efb60..bc3a0a1 100644
--- a/mnemonic-sessions/build.gradle
+++ b/mnemonic-sessions/build.gradle
@@ -34,11 +34,7 @@ dependencies {
annotationProcessor project(':mnemonic-core')
api project(':mnemonic-collections')
api 'org.apache.commons:commons-lang3'
- api 'org.slf4j:slf4j-api'
- api 'org.slf4j:jul-to-slf4j'
- api 'org.slf4j:jcl-over-slf4j'
- api 'log4j:log4j'
- api 'org.slf4j:slf4j-log4j12'
+ api 'org.apache.logging.log4j:log4j-slf4j-impl'
testCompileOnly 'org.testng:testng'
}
diff --git a/mnemonic-spark/mnemonic-spark-core/build.gradle
b/mnemonic-spark/mnemonic-spark-core/build.gradle
index 69360a3..c4061bb 100644
--- a/mnemonic-spark/mnemonic-spark-core/build.gradle
+++ b/mnemonic-spark/mnemonic-spark-core/build.gradle
@@ -46,11 +46,7 @@ dependencies {
implementation
"org.apache.spark:spark-core_${scala_bin_version}:${spark_version}"
implementation
"org.apache.spark:spark-mllib_${scala_bin_version}:${spark_version}"
implementation "org.scala-lang:scala-library:${scala_version}"
- api 'org.slf4j:slf4j-api'
- api 'org.slf4j:jul-to-slf4j'
- api 'org.slf4j:jcl-over-slf4j'
- api 'log4j:log4j'
- api 'org.slf4j:slf4j-log4j12'
+ api 'org.apache.logging.log4j:log4j-slf4j-impl'
testCompileOnly 'org.testng:testng'
testImplementation
"org.scalatest:scalatest_${scala_bin_version}:${scalatest_version}"
}
