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

[1F4aew1T] Uses slf4j-api 2.x api instead of slf4j-simple 1.x #480

Merged
merged 2 commits into from
Aug 23, 2023
Merged

[1F4aew1T] Uses slf4j-api 2.x api instead of slf4j-simple 1.x #480

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98fd673
[1F4aew1T] Uses slf4j-api 2.x api instead of slf4j-simple 1.x
ncordon Aug 23, 2023
778ec55
[1F4aew1T] Updates LICENSE and NOTICE
ncordon Aug 23, 2023
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: 0 additions & 2 deletions LICENSES.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2580,9 +2580,7 @@ MIT
neo4j-1.18.3.jar
postgresql-1.18.3.jar
reactive-streams-1.0.4.jar
slf4j-api-1.7.36.jar
slf4j-api-2.0.7.jar
slf4j-simple-1.7.36.jar
testcontainers-1.18.3.jar
------------------------------------------------------------------------------

Expand Down
2 changes: 0 additions & 2 deletions NOTICE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -443,9 +443,7 @@ MIT
neo4j-1.18.3.jar
postgresql-1.18.3.jar
reactive-streams-1.0.4.jar
slf4j-api-1.7.36.jar
slf4j-api-2.0.7.jar
slf4j-simple-1.7.36.jar
testcontainers-1.18.3.jar

MPL 1.1
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ dependencies {
api group: 'org.hdrhistogram', name: 'HdrHistogram', version: '2.1.9'
api group: 'org.apache.commons', name: 'commons-collections4', version: '4.2'
// We need this to avoid seeing SLF4J: Failed to load class "org.slf4j.impl.StaticLoggerBinder" on startup
api group: 'org.slf4j', name: 'slf4j-simple', version: '1.7.36'
api group: 'org.slf4j', name: 'slf4j-api', version: '2.0.7'

// We need to force this dependency's verion due to a vulnerability https://github.com/neo4j-contrib/neo4j-apoc-procedures/issues/3048
api group: 'org.apache.commons', name: 'commons-lang3', {
Expand Down
2 changes: 2 additions & 0 deletions it/src/test/java/apoc/it/core/StartupTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ public void check_basic_deployment() {
assertTrue(functionCount > 0);
assertTrue(coreCount > 0);
// Check there's one and only one logger for apoc inside the container
// and it doesn't override the one inside the database
assertFalse(startupLog.contains("[main] INFO org.eclipse.jetty.server.Server"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looking on the two log output versions in the descriptions of this PR, both contains this?

Copy link
Collaborator Author

@ncordon ncordon Aug 23, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry I misread the ticket https://trello.com/c/1F4aew1T, the output does not have to appear at all, which is what this test is checking. I've updated the PR description.

assertFalse(startupLog.contains("SLF4J: No SLF4J providers were found"));
assertFalse(startupLog.contains("SLF4J: Failed to load class \"org.slf4j.impl.StaticLoggerBinder\""));
assertFalse(startupLog.contains("SLF4J: Class path contains multiple SLF4J providers"));
Expand Down