From 7561a7ad92dc66c5d14b50dd0d2745c38f9dd76d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Tue, 19 Oct 2021 10:44:25 +0200 Subject: [PATCH 01/10] Removed bindings from common and server packages. Use exact same dependencies in both grale and pom files. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- bookkeeper-common/build.gradle | 2 -- bookkeeper-common/pom.xml | 11 +---------- bookkeeper-dist/all/build.gradle | 3 ++- bookkeeper-dist/server/build.gradle | 3 ++- bookkeeper-server/build.gradle | 2 -- bookkeeper-server/pom.xml | 10 ++-------- .../apache/bookkeeper/bookie/FileSystemUpgrade.java | 8 -------- 7 files changed, 7 insertions(+), 32 deletions(-) diff --git a/bookkeeper-common/build.gradle b/bookkeeper-common/build.gradle index 94b5b36d63c..34ac13adf1f 100644 --- a/bookkeeper-common/build.gradle +++ b/bookkeeper-common/build.gradle @@ -41,9 +41,7 @@ dependencies { testImplementation depLibs.commonsLang3 testImplementation depLibs.hamcrest testImplementation depLibs.junit - testImplementation depLibs.log4jSlf4jImpl testImplementation depLibs.log4j12api - testImplementation depLibs.log4jCore testImplementation depLibs.mockito annotationProcessor depLibs.lombok diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index c1065c975be..aa198804f4b 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -83,16 +83,7 @@ org.apache.logging.log4j log4j-1.2-api ${log4j.version} - - - org.apache.logging.log4j - log4j-core - ${log4j.version} - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j.version} + test diff --git a/bookkeeper-dist/all/build.gradle b/bookkeeper-dist/all/build.gradle index 343f01a7111..205166614c1 100644 --- a/bookkeeper-dist/all/build.gradle +++ b/bookkeeper-dist/all/build.gradle @@ -41,7 +41,8 @@ dependencies { compileOnly depLibs.spotbugsAnnotations implementation depLibs.log4j12api - + implementation depLibs.log4jCore + implementation depLibs.log4jSlf4jImpl testCompileOnly depLibs.lombok diff --git a/bookkeeper-dist/server/build.gradle b/bookkeeper-dist/server/build.gradle index 6ce817ddf9f..ee03e06424e 100644 --- a/bookkeeper-dist/server/build.gradle +++ b/bookkeeper-dist/server/build.gradle @@ -43,7 +43,8 @@ dependencies { compileOnly depLibs.spotbugsAnnotations implementation depLibs.log4j12api - + implementation depLibs.log4jCore + implementation depLibs.log4jSlf4jImpl testCompileOnly depLibs.lombok diff --git a/bookkeeper-server/build.gradle b/bookkeeper-server/build.gradle index b18ed013032..5c421046654 100644 --- a/bookkeeper-server/build.gradle +++ b/bookkeeper-server/build.gradle @@ -72,9 +72,7 @@ dependencies { testImplementation depLibs.zookeeperTest annotationProcessor depLibs.lombok testAnnotationProcessor depLibs.lombok - testImplementation depLibs.log4jSlf4jImpl testImplementation depLibs.log4j12api - testImplementation depLibs.log4jCore } test { diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 07004c8770a..a6193f698d7 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -52,14 +52,8 @@ org.apache.logging.log4j log4j-1.2-api - - - org.apache.logging.log4j - log4j-core - - - org.apache.logging.log4j - log4j-slf4j-impl + ${log4j.version} + test org.apache.zookeeper diff --git a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java index b009eae38ca..c50e05633d8 100644 --- a/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java +++ b/bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java @@ -52,7 +52,6 @@ import org.apache.commons.cli.Options; import org.apache.commons.configuration.ConfigurationException; import org.apache.commons.io.FileUtils; -import org.apache.log4j.ConsoleAppender; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -335,13 +334,6 @@ private static void printHelp(Options opts) { } public static void main(String[] args) throws Exception { - org.apache.log4j.Logger root = org.apache.log4j.Logger.getRootLogger(); - ConsoleAppender console = new org.apache.log4j.ConsoleAppender(); - console.setLayout(new org.apache.log4j.PatternLayout("%-5p [%t]: %m%n")); - root.addAppender(console); - root.setLevel(org.apache.log4j.Level.ERROR); - org.apache.log4j.Logger.getLogger(FileSystemUpgrade.class).setLevel( - org.apache.log4j.Level.INFO); final Options opts = new Options(); opts.addOption("c", "conf", true, "Configuration for Bookie"); From 6833cc5361f0bfa14ba1235e55f43fe54a543249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Tue, 19 Oct 2021 11:24:34 +0200 Subject: [PATCH 02/10] Mssing log4j-core dependency in tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- bookkeeper-common/build.gradle | 1 + bookkeeper-common/pom.xml | 6 ++++++ bookkeeper-server/build.gradle | 1 + bookkeeper-server/pom.xml | 6 ++++++ 4 files changed, 14 insertions(+) diff --git a/bookkeeper-common/build.gradle b/bookkeeper-common/build.gradle index 34ac13adf1f..0fd9538b354 100644 --- a/bookkeeper-common/build.gradle +++ b/bookkeeper-common/build.gradle @@ -42,6 +42,7 @@ dependencies { testImplementation depLibs.hamcrest testImplementation depLibs.junit testImplementation depLibs.log4j12api + testImplementation depLibs.log4jCore testImplementation depLibs.mockito annotationProcessor depLibs.lombok diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index aa198804f4b..541028906c5 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -85,6 +85,12 @@ ${log4j.version} test + + org.apache.logging.log4j + log4j-core + ${log4j.version} + test + diff --git a/bookkeeper-server/build.gradle b/bookkeeper-server/build.gradle index 5c421046654..a019ae6e854 100644 --- a/bookkeeper-server/build.gradle +++ b/bookkeeper-server/build.gradle @@ -73,6 +73,7 @@ dependencies { annotationProcessor depLibs.lombok testAnnotationProcessor depLibs.lombok testImplementation depLibs.log4j12api + testImplementation depLibs.log4jCore } test { diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index a6193f698d7..786b54fe777 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -55,6 +55,12 @@ ${log4j.version} test + + org.apache.logging.log4j + log4j-core + ${log4j.version} + test + org.apache.zookeeper zookeeper From 27ed644f3b761b8fe39a50dc401d46cf6633de87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Tue, 19 Oct 2021 12:21:31 +0200 Subject: [PATCH 03/10] Missing slf4j log4j binding in server and common test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- bookkeeper-common/build.gradle | 1 + bookkeeper-common/pom.xml | 6 ++++++ bookkeeper-server/build.gradle | 1 + bookkeeper-server/pom.xml | 6 ++++++ 4 files changed, 14 insertions(+) diff --git a/bookkeeper-common/build.gradle b/bookkeeper-common/build.gradle index 0fd9538b354..8e5268e242c 100644 --- a/bookkeeper-common/build.gradle +++ b/bookkeeper-common/build.gradle @@ -43,6 +43,7 @@ dependencies { testImplementation depLibs.junit testImplementation depLibs.log4j12api testImplementation depLibs.log4jCore + testImplementation depLibs.log4jSlf4jImpl testImplementation depLibs.mockito annotationProcessor depLibs.lombok diff --git a/bookkeeper-common/pom.xml b/bookkeeper-common/pom.xml index 541028906c5..e7709f4597a 100644 --- a/bookkeeper-common/pom.xml +++ b/bookkeeper-common/pom.xml @@ -91,6 +91,12 @@ ${log4j.version} test + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} + test + diff --git a/bookkeeper-server/build.gradle b/bookkeeper-server/build.gradle index a019ae6e854..fba7196f0db 100644 --- a/bookkeeper-server/build.gradle +++ b/bookkeeper-server/build.gradle @@ -74,6 +74,7 @@ dependencies { testAnnotationProcessor depLibs.lombok testImplementation depLibs.log4j12api testImplementation depLibs.log4jCore + testImplementation depLibs.log4jSlf4jImpl } test { diff --git a/bookkeeper-server/pom.xml b/bookkeeper-server/pom.xml index 786b54fe777..469aab161d9 100644 --- a/bookkeeper-server/pom.xml +++ b/bookkeeper-server/pom.xml @@ -61,6 +61,12 @@ ${log4j.version} test + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} + test + org.apache.zookeeper zookeeper From e4ff4d94d2adadfd5f13f22b1f88e4bc41b1b016 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Wed, 20 Oct 2021 19:41:17 +0200 Subject: [PATCH 04/10] Removed unnecessary changes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- bookkeeper-common/build.gradle | 2 +- bookkeeper-server/build.gradle | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bookkeeper-common/build.gradle b/bookkeeper-common/build.gradle index 8e5268e242c..94b5b36d63c 100644 --- a/bookkeeper-common/build.gradle +++ b/bookkeeper-common/build.gradle @@ -41,9 +41,9 @@ dependencies { testImplementation depLibs.commonsLang3 testImplementation depLibs.hamcrest testImplementation depLibs.junit + testImplementation depLibs.log4jSlf4jImpl testImplementation depLibs.log4j12api testImplementation depLibs.log4jCore - testImplementation depLibs.log4jSlf4jImpl testImplementation depLibs.mockito annotationProcessor depLibs.lombok diff --git a/bookkeeper-server/build.gradle b/bookkeeper-server/build.gradle index fba7196f0db..b18ed013032 100644 --- a/bookkeeper-server/build.gradle +++ b/bookkeeper-server/build.gradle @@ -72,9 +72,9 @@ dependencies { testImplementation depLibs.zookeeperTest annotationProcessor depLibs.lombok testAnnotationProcessor depLibs.lombok + testImplementation depLibs.log4jSlf4jImpl testImplementation depLibs.log4j12api testImplementation depLibs.log4jCore - testImplementation depLibs.log4jSlf4jImpl } test { From 089d153c690d058bf3f7ad70bbf45b55e1a994b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Thu, 21 Oct 2021 15:55:59 +0200 Subject: [PATCH 05/10] Remove unnecessary blank line MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- bookkeeper-dist/all/build.gradle | 1 - 1 file changed, 1 deletion(-) diff --git a/bookkeeper-dist/all/build.gradle b/bookkeeper-dist/all/build.gradle index d3977f49300..205cdf26d4f 100644 --- a/bookkeeper-dist/all/build.gradle +++ b/bookkeeper-dist/all/build.gradle @@ -35,7 +35,6 @@ dependencies { implementation project(':stream:distributedlog:core') implementation project(':stream:server') implementation project(':bookkeeper-tools') - implementation depLibs.jsr305 runtimeOnly depLibs.log4j12api implementation (depLibs.zookeeperTest) { From 88b4fa1568647134f4f8842c8542c6ea43dc14f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Thu, 21 Oct 2021 16:14:21 +0200 Subject: [PATCH 06/10] Make logging bindings test-only in bookkeeper-server gradle file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- bookkeeper-server/build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bookkeeper-server/build.gradle b/bookkeeper-server/build.gradle index 1445fbe44af..b18ed013032 100644 --- a/bookkeeper-server/build.gradle +++ b/bookkeeper-server/build.gradle @@ -53,9 +53,6 @@ dependencies { implementation depLibs.protobuf implementation depLibs.rocksDb implementation depLibs.zookeeper - implementation depLibs.log4jSlf4jImpl - implementation depLibs.log4j12api - implementation depLibs.log4jCore testImplementation project(':bookkeeper-stats-providers:prometheus-metrics-provider') testImplementation project(':bookkeeper-http:vertx-http-server') @@ -75,6 +72,9 @@ dependencies { testImplementation depLibs.zookeeperTest annotationProcessor depLibs.lombok testAnnotationProcessor depLibs.lombok + testImplementation depLibs.log4jSlf4jImpl + testImplementation depLibs.log4j12api + testImplementation depLibs.log4jCore } test { From 4bfe554aeeb609f0b3f63b118531e140a54b6f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Thu, 21 Oct 2021 17:05:39 +0200 Subject: [PATCH 07/10] Make gradle and mvn log4j bindings analogous in dist package. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- bookkeeper-dist/all/build.gradle | 2 ++ bookkeeper-dist/server/build.gradle | 5 +++-- bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt | 2 -- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bookkeeper-dist/all/build.gradle b/bookkeeper-dist/all/build.gradle index 205cdf26d4f..78c4086f1a7 100644 --- a/bookkeeper-dist/all/build.gradle +++ b/bookkeeper-dist/all/build.gradle @@ -37,6 +37,8 @@ dependencies { implementation project(':bookkeeper-tools') implementation depLibs.jsr305 runtimeOnly depLibs.log4j12api + runtimeOnly depLibs.log4jSlf4jImpl + runtimeOnly depLibs.log4jCore implementation (depLibs.zookeeperTest) { exclude group: "io.netty", module: "netty-transport-native-epoll" exclude group: 'log4j', module: 'log4j' diff --git a/bookkeeper-dist/server/build.gradle b/bookkeeper-dist/server/build.gradle index d10add5b587..b240abb8fc3 100644 --- a/bookkeeper-dist/server/build.gradle +++ b/bookkeeper-dist/server/build.gradle @@ -35,8 +35,9 @@ dependencies { implementation project(':stream:distributedlog:core') implementation project(':stream:server') implementation project(':bookkeeper-tools') - implementation depLibs.log4j12api - + runtimeOnly depLibs.log4j12api + runtimeOnly depLibs.log4jSlf4jImpl + runtimeOnly depLibs.log4jCore runtimeOnly (depLibs.zookeeperTest) { exclude group: "io.netty", module: "netty-transport-native-epoll" exclude group: 'log4j', module: 'log4j' diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index ceaa468b829..13eca9d71cd 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -232,8 +232,6 @@ Apache Software License, Version 2. - lib/io.netty-netty-transport-native-unix-common-4.1.68.Final.jar [11] - lib/org.apache.logging.log4j-log4j-1.2-api-2.14.1.jar [16] - lib/org.apache.logging.log4j-log4j-api-2.14.1.jar [16] -- lib/org.apache.logging.log4j-log4j-core-2.14.1.jar [16] -- lib/org.apache.logging.log4j-log4j-slf4j-impl-2.14.1.jar [16] - lib/net.java.dev.jna-jna-3.2.7.jar [17] - lib/org.apache.commons-commons-collections4-4.1.jar [18] - lib/org.apache.commons-commons-lang3-3.6.jar [19] From ea1aba481f36e224047c3c6e70a7296054d6420b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Fri, 22 Oct 2021 19:06:07 +0200 Subject: [PATCH 08/10] Restored runtime libraries in bookkeeper-server gradle file. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- bookkeeper-server/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bookkeeper-server/build.gradle b/bookkeeper-server/build.gradle index b18ed013032..b801d9b0ba0 100644 --- a/bookkeeper-server/build.gradle +++ b/bookkeeper-server/build.gradle @@ -53,6 +53,8 @@ dependencies { implementation depLibs.protobuf implementation depLibs.rocksDb implementation depLibs.zookeeper + runtimeOnly depLibs.metricsCore + runtimeOnly depLibs.snappy testImplementation project(':bookkeeper-stats-providers:prometheus-metrics-provider') testImplementation project(':bookkeeper-http:vertx-http-server') From 1f143703bd5ca757b17f873fe54a8b59dc178af4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl?= Date: Mon, 25 Oct 2021 19:15:42 +0200 Subject: [PATCH 09/10] Add missing bindings used by integration tests. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl --- stream/server/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/stream/server/build.gradle b/stream/server/build.gradle index 944277dcd3c..19faa189683 100644 --- a/stream/server/build.gradle +++ b/stream/server/build.gradle @@ -59,6 +59,8 @@ dependencies { implementation depLibs.metricsCore implementation depLibs.snappy implementation depLibs.log4j12api + implementation depLibs.log4jSlf4jImpl + implementation depLibs.log4jCore implementation depLibs.vertxCore implementation depLibs.vertxWeb testImplementation depLibs.mockito From b74b0848bda5adf510968de442f37779c8fa3c8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ra=C3=BAl=20Gracia?= Date: Tue, 26 Oct 2021 17:25:44 +0200 Subject: [PATCH 10/10] Add bindings on BkCtl distribution gradle. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raúl Gracia --- bookkeeper-dist/bkctl/build.gradle | 4 +++- bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/bookkeeper-dist/bkctl/build.gradle b/bookkeeper-dist/bkctl/build.gradle index eda3c96d978..772070d74f9 100644 --- a/bookkeeper-dist/bkctl/build.gradle +++ b/bookkeeper-dist/bkctl/build.gradle @@ -36,8 +36,10 @@ dependencies { runtimeOnly (project(':bookkeeper-stats-providers:codahale-metrics-provider')) { exclude group: "io.dropwizard.metrics", module: "metrics-graphite" exclude group: "io.dropwizard.metrics", module: "metrics-jvm" - } + } runtimeOnly depLibs.snappy + runtimeOnly depLibs.log4jCore + runtimeOnly depLibs.log4jSlf4jImpl } releaseArtifacts { diff --git a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt index 13eca9d71cd..ceaa468b829 100644 --- a/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt +++ b/bookkeeper-dist/src/main/resources/LICENSE-bkctl.bin.txt @@ -232,6 +232,8 @@ Apache Software License, Version 2. - lib/io.netty-netty-transport-native-unix-common-4.1.68.Final.jar [11] - lib/org.apache.logging.log4j-log4j-1.2-api-2.14.1.jar [16] - lib/org.apache.logging.log4j-log4j-api-2.14.1.jar [16] +- lib/org.apache.logging.log4j-log4j-core-2.14.1.jar [16] +- lib/org.apache.logging.log4j-log4j-slf4j-impl-2.14.1.jar [16] - lib/net.java.dev.jna-jna-3.2.7.jar [17] - lib/org.apache.commons-commons-collections4-4.1.jar [18] - lib/org.apache.commons-commons-lang3-3.6.jar [19]