This is an automated email from the ASF dual-hosted git repository. sk0x50 pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/main by this push: new e470097db2 IGNITE-20286 Fix missed logs in tests (#2572) e470097db2 is described below commit e470097db283cee4d0b58947c55bbeffcd2782f3 Author: Slava Koptilin <slava.kopti...@gmail.com> AuthorDate: Fri Sep 15 10:12:08 2023 +0300 IGNITE-20286 Fix missed logs in tests (#2572) --- buildscripts/java-integration-test.gradle | 1 + buildscripts/java-junit5.gradle | 1 + buildscripts/java-test-fixtures.gradle | 1 + gradle/libs.versions.toml | 4 ++-- modules/cli/build.gradle | 7 +++++++ modules/network/build.gradle | 3 --- 6 files changed, 12 insertions(+), 5 deletions(-) diff --git a/buildscripts/java-integration-test.gradle b/buildscripts/java-integration-test.gradle index b683fdb3db..a5793d66fe 100644 --- a/buildscripts/java-integration-test.gradle +++ b/buildscripts/java-integration-test.gradle @@ -40,6 +40,7 @@ testing { implementation libs.log4j.api implementation libs.log4j.core implementation libs.log4j.bridge + implementation libs.slf4j.log4j } sources { diff --git a/buildscripts/java-junit5.gradle b/buildscripts/java-junit5.gradle index dc71359380..5ca6ba1e29 100644 --- a/buildscripts/java-junit5.gradle +++ b/buildscripts/java-junit5.gradle @@ -39,4 +39,5 @@ dependencies { testImplementation libs.log4j.api testImplementation libs.log4j.core testImplementation libs.log4j.bridge + testImplementation libs.slf4j.log4j } diff --git a/buildscripts/java-test-fixtures.gradle b/buildscripts/java-test-fixtures.gradle index 17feb22e60..5ee1985b1b 100644 --- a/buildscripts/java-test-fixtures.gradle +++ b/buildscripts/java-test-fixtures.gradle @@ -25,6 +25,7 @@ dependencies { testFixturesImplementation libs.log4j.api testFixturesImplementation libs.log4j.core testFixturesImplementation libs.log4j.bridge + testFixturesImplementation libs.slf4j.log4j } pmdTestFixtures { diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 7742524aab..9b8e21c259 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -44,8 +44,8 @@ micronautSecurity="3.9.2" micronautReactor="2.5.0" mockito = "5.4.0" picocli = "4.7.0" -slf4j = "2.0.7" -log4j = "2.19.0" +slf4j = "2.0.9" +log4j = "2.20.0" spoon = "8.4.0-beta-18" swagger = "2.2.8" swaggerLegacy = "1.6.4" diff --git a/modules/cli/build.gradle b/modules/cli/build.gradle index a4c28040a0..32c06fe66e 100644 --- a/modules/cli/build.gradle +++ b/modules/cli/build.gradle @@ -115,6 +115,13 @@ dependencies { integrationTestImplementation libs.hamcrest.optional } +// Use the same logging implementation for ignite components and cli. +configurations { + testImplementation.exclude group: "org.slf4j", module: "slf4j-jdk14" + testFixturesImplementation.exclude group: "org.slf4j", module: "slf4j-jdk14" + integrationTestImplementation.exclude group: "org.slf4j", module: "slf4j-jdk14" +} + ext.generatedClientDir = layout.buildDirectory.dir("swagger/client") task copyOpenapiDefinition(type: Copy) { diff --git a/modules/network/build.gradle b/modules/network/build.gradle index 9944c87007..ece7813037 100644 --- a/modules/network/build.gradle +++ b/modules/network/build.gradle @@ -63,7 +63,6 @@ dependencies { testImplementation libs.bytebuddy testImplementation libs.compileTesting testImplementation libs.awaitility - testImplementation libs.slf4j.log4j testFixturesAnnotationProcessor project(":ignite-network-annotation-processor") testFixturesImplementation project(':ignite-configuration') @@ -73,8 +72,6 @@ dependencies { testFixturesImplementation libs.fastutil.core testFixturesImplementation libs.scalecube.cluster testFixturesImplementation libs.jetbrains.annotations - testFixturesImplementation libs.slf4j.log4j - integrationTestAnnotationProcessor project(":ignite-network-annotation-processor") integrationTestAnnotationProcessor project(":ignite-network-annotation-processor")