Skip to content

Issue 2837: Remove unnecessary log4j bindings from Bookkeeper packages #2838

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eolivelli merged 12 commits into from
Oct 27, 2021
Merged

Issue 2837: Remove unnecessary log4j bindings from Bookkeeper packages #2838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
7561a7a
Removed bindings from common and server packages. Use exact same depe…
RaulGracia Oct 19, 2021
6833cc5
Mssing log4j-core dependency in tests.
RaulGracia Oct 19, 2021
27ed644
Missing slf4j log4j binding in server and common test.
RaulGracia Oct 19, 2021
e4ff4d9
Removed unnecessary changes.
RaulGracia Oct 20, 2021
b3352a3
Merge branch 'master' into issue-cleanup-log-bindings
RaulGracia Oct 21, 2021
089d153
Remove unnecessary blank line
RaulGracia Oct 21, 2021
88b4fa1
Make logging bindings test-only in bookkeeper-server gradle file.
RaulGracia Oct 21, 2021
4bfe554
Make gradle and mvn log4j bindings analogous in dist package.
RaulGracia Oct 21, 2021
ea1aba4
Restored runtime libraries in bookkeeper-server gradle file.
RaulGracia Oct 22, 2021
d1c9676
Merge branch 'master' into issue-cleanup-log-bindings
RaulGracia Oct 22, 2021
1f14370
Add missing bindings used by integration tests.
RaulGracia Oct 25, 2021
b74b084
Add bindings on BkCtl distribution gradle.
RaulGracia Oct 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions bookkeeper-common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,16 +83,19 @@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<version>${log4j.version}</version>
<scope>test</scope> <!-- There are tests that rely on this binding in their test logic -->
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
<scope>test</scope> <!-- There are tests that rely on this binding in their test logic -->
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
<scope>test</scope> <!-- There are tests that rely on this binding in their test logic -->
</dependency>
</dependencies>
<build>
Expand Down
2 changes: 2 additions & 0 deletions bookkeeper-dist/all/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
4 changes: 3 additions & 1 deletion bookkeeper-dist/bkctl/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
5 changes: 3 additions & 2 deletions bookkeeper-dist/server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions bookkeeper-server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,6 @@ dependencies {
implementation depLibs.protobuf
implementation depLibs.rocksDb
implementation depLibs.zookeeper
implementation depLibs.log4jSlf4jImpl
implementation depLibs.log4j12api
implementation depLibs.log4jCore
runtimeOnly depLibs.metricsCore
runtimeOnly depLibs.snappy

Expand All @@ -77,6 +74,9 @@ dependencies {
testImplementation depLibs.zookeeperTest
annotationProcessor depLibs.lombok
testAnnotationProcessor depLibs.lombok
testImplementation depLibs.log4jSlf4jImpl
testImplementation depLibs.log4j12api
testImplementation depLibs.log4jCore
}

task writeClasspath {
Expand Down
6 changes: 6 additions & 0 deletions bookkeeper-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,20 @@
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-1.2-api</artifactId>
<version>${log4j.version}</version>
<scope>test</scope> <!-- There are tests that rely on this binding in their test logic -->
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
<version>${log4j.version}</version>
<scope>test</scope> <!-- There are tests that rely on this binding in their test logic -->
</dependency>
<dependency>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-slf4j-impl</artifactId>
<version>${log4j.version}</version>
<scope>test</scope> <!-- There are tests that rely on this binding in their test logic -->
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
Expand Down
8 changes: 0 additions & 8 deletions bookkeeper-server/src/main/java/org/apache/bookkeeper/bookie/FileSystemUpgrade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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");
Expand Down
2 changes: 2 additions & 0 deletions stream/server/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down