Skip to content
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

Jump to bottom

Allow default slf4j provider to be found via service locator #1522

Merged
merged 1 commit into from
Aug 16, 2024
Merged

Allow default slf4j provider to be found via service locator #1522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions FitNesseRoot/FitNesse/ReleaseNotes/content.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
!2 Pending Changes
* Fix SLF4J logging ([[1522][https://github.com/unclebob/fitnesse/pull/1522]])

!2 20240707
* Allow usage of JDK > 18 ([[1513][https://github.com/unclebob/fitnesse/pull/1513]]).
Expand Down
7 changes: 5 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ sourceSets {
main {
java.srcDir 'src'
resources.srcDir 'src'
output.resourcesDir java.classesDirectory
output.resourcesDir java.classesDirectory
}
test {
java.srcDir 'test'
Expand Down Expand Up @@ -189,7 +189,10 @@ task standaloneJar(type: Jar) {
from {
configurations.runtimeClasspath.collect { zipTree(it) }
} {
exclude 'META-INF/**'
exclude { FileTreeElement details ->
details.relativePath.pathString.startsWith('META-INF/') &&
!details.relativePath.pathString.equals('META-INF/services/org.slf4j.spi.SLF4JServiceProvider')
}
}
from jar.outputs.files.collect {
zipTree(it)
Expand Down
Loading