Skip to content

Add custom Log4j2 ConfigurationFactory that allows Composite Log4j configuration #988

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
Sigmonia merged 10 commits into from
Mar 13, 2025
Merged

Add custom Log4j2 ConfigurationFactory that allows Composite Log4j configuration #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d0a0bd4
Initial log4j2 factory for dynamic configuration
Sigmonia Feb 11, 2025
87731de
Initial log4j2 factory for dynamic configuration
Sigmonia Feb 11, 2025
0943174
Clean up class loader
Sigmonia Feb 11, 2025
106b860
clean up some scraps
Sigmonia Feb 11, 2025
589867c
Clean up and add comments
Sigmonia Feb 12, 2025
31cede4
Bump spring version
Sigmonia Feb 21, 2025
794c058
Couldn't get the ConfigurationFactory to play nice with the docker co…
Sigmonia Mar 5, 2025
f538678
Remove example log4j properties
Sigmonia Mar 6, 2025
6c952bf
Remove level
Sigmonia Mar 11, 2025
bca6112
Merge branch 'develop' into fb_compositeLog4j
Mar 13, 2025
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
2 changes: 1 addition & 1 deletion gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ snappyJavaVersion=1.1.10.7
# Also, update apacheTomcatVersion above to match Spring Boot's Tomcat dependency version
springBootVersion=3.4.1
# This usually matches the Spring Framework version dictated by springBootVersion
springVersion=6.2.1
springVersion=6.2.3

sqliteJdbcVersion=3.48.0.0

Expand Down
2 changes: 1 addition & 1 deletion server/bootstrap/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,4 +66,4 @@ project.afterEvaluate {
}
}
}
}
}
8 changes: 7 additions & 1 deletion server/embedded/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ configurations.configureEach {
}

dependencies {
// Needed to support composite Log4j2 plugins using JSONLayout elements
implementation "com.fasterxml.jackson.core:jackson-databind:${jacksonDatabindVersion}"

implementation("org.springframework.boot:spring-boot-starter-web:${springBootVersion}") {
exclude group: "org.springframework.boot", module: "spring-boot-starter-json" // Not used (?) and pulls in an old version of Jackson
exclude group: "jakarta.annotation", module: "jakarta.annotation-api" // Already present in tomcat-annotations-api
Expand Down Expand Up @@ -77,7 +80,10 @@ dependencies {
runtimeOnly("org.apache.tomcat:tomcat-dbcp:${apacheTomcatVersion}") {
exclude group: "org.apache.tomcat", module: "tomcat-juli"
}
runtimeOnly "org.apache.logging.log4j:log4j-slf4j2-impl:${log4j2Version}"
implementation ("org.apache.logging.log4j:log4j-slf4j2-impl:${log4j2Version}") {
exclude group: 'commons-logging', module: 'commons-logging'
}

implementation "commons-io:commons-io:${commonsIoVersion}"
implementation "org.apache.logging.log4j:log4j-core:${log4j2Version}"

Expand Down