diff --git a/cluster-testlib/pom.xml b/cluster-testlib/pom.xml index 872ac3ac..dfaf2cb4 100644 --- a/cluster-testlib/pom.xml +++ b/cluster-testlib/pom.xml @@ -1,5 +1,7 @@ - + scalecube-cluster-parent io.scalecube @@ -21,55 +23,6 @@ scalecube-cluster-api ${project.version} - - - org.slf4j - slf4j-api - - - org.apache.logging.log4j - log4j-slf4j-impl - - - org.apache.logging.log4j - log4j-core - - - - org.junit.jupiter - junit-jupiter-api - ${junit-jupiter.version} - - - org.junit.jupiter - junit-jupiter-engine - ${junit-jupiter.version} - - - org.junit.jupiter - junit-jupiter-params - ${junit-jupiter.version} - - - org.mockito - mockito-junit-jupiter - ${mockito-junit.version} - - - org.junit.jupiter - junit-jupiter-api - - - - - org.hamcrest - hamcrest-all - ${hamcrest.version} - - - io.projectreactor - reactor-test - diff --git a/cluster-testlib/src/main/java/io/scalecube/cluster/utils/LoggingExtension.java b/cluster-testlib/src/main/java/io/scalecube/cluster/utils/LoggingExtension.java deleted file mode 100644 index 5308441e..00000000 --- a/cluster-testlib/src/main/java/io/scalecube/cluster/utils/LoggingExtension.java +++ /dev/null @@ -1,54 +0,0 @@ -package io.scalecube.cluster.utils; - -import java.lang.reflect.Method; -import org.junit.jupiter.api.extension.AfterAllCallback; -import org.junit.jupiter.api.extension.AfterEachCallback; -import org.junit.jupiter.api.extension.BeforeAllCallback; -import org.junit.jupiter.api.extension.BeforeEachCallback; -import org.junit.jupiter.api.extension.ExtensionContext; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class LoggingExtension - implements AfterEachCallback, BeforeEachCallback, AfterAllCallback, BeforeAllCallback { - - private static final Logger LOGGER = LoggerFactory.getLogger(LoggingExtension.class); - - @Override - public void beforeAll(ExtensionContext context) { - LOGGER.info( - "***** Setup: " + context.getTestClass().map(Class::getSimpleName).orElse("") + " *****"); - } - - @Override - public void afterEach(ExtensionContext context) { - LOGGER.info( - "***** Test finished: " - + context.getTestClass().map(Class::getSimpleName).orElse("") - + "." - + context.getTestMethod().map(Method::getName).orElse("") - + "." - + context.getDisplayName() - + " *****"); - } - - @Override - public void beforeEach(ExtensionContext context) { - LOGGER.info( - "***** Test started: " - + context.getTestClass().map(Class::getSimpleName).orElse("") - + "." - + context.getTestMethod().map(Method::getName).orElse("") - + "." - + context.getDisplayName() - + " *****"); - } - - @Override - public void afterAll(ExtensionContext context) { - LOGGER.info( - "***** TearDown: " - + context.getTestClass().map(Class::getSimpleName).orElse("") - + " *****"); - } -} diff --git a/cluster-testlib/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/cluster-testlib/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension deleted file mode 100644 index 122d0873..00000000 --- a/cluster-testlib/src/main/resources/META-INF/services/org.junit.jupiter.api.extension.Extension +++ /dev/null @@ -1 +0,0 @@ -io.scalecube.cluster.utils.LoggingExtension diff --git a/cluster-testlib/src/main/resources/junit-platform.properties b/cluster-testlib/src/main/resources/junit-platform.properties deleted file mode 100644 index 6efc0d5e..00000000 --- a/cluster-testlib/src/main/resources/junit-platform.properties +++ /dev/null @@ -1 +0,0 @@ -junit.jupiter.extensions.autodetection.enabled=true diff --git a/cluster/pom.xml b/cluster/pom.xml index e63e4545..213e49ee 100644 --- a/cluster/pom.xml +++ b/cluster/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -26,8 +28,7 @@ org.slf4j slf4j-api - - + ${project.groupId} scalecube-transport-netty diff --git a/cluster-testlib/src/main/resources/log4j2.xml b/cluster/src/test/resources/log4j2-test.xml similarity index 100% rename from cluster-testlib/src/main/resources/log4j2.xml rename to cluster/src/test/resources/log4j2-test.xml diff --git a/codec-parent/pom.xml b/codec-parent/pom.xml index c379cf79..42fb109d 100644 --- a/codec-parent/pom.xml +++ b/codec-parent/pom.xml @@ -28,13 +28,6 @@ scalecube-cluster-api ${project.version} - - - ${project.groupId} - scalecube-cluster-testlib - ${project.version} - test - diff --git a/examples/src/main/resources/log4j2.xml b/examples/src/main/resources/log4j2.xml new file mode 100644 index 00000000..6b8193c1 --- /dev/null +++ b/examples/src/main/resources/log4j2.xml @@ -0,0 +1,32 @@ + + + + + + + %level{length=1} %date{HHmm:ss,SSS} %logger{1.} %message [%thread]%n + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index af5cfe09..8984bd90 100644 --- a/pom.xml +++ b/pom.xml @@ -1,11 +1,13 @@ - + 4.0.0 io.scalecube scalecube-parent - 0.3.12 + 0.3.14 scalecube-cluster-parent @@ -33,15 +35,7 @@ - 2024.0.8 - 4.2.6.Final - 2.19.2 - 1.7.36 - - 5.3.1 - 5.9.3 - 1.3 - 2.17.2 + 0.1.1 https://maven.pkg.github.com/scalecube/scalecube-cluster @@ -57,51 +51,14 @@ codec-parent - - - - - io.projectreactor - reactor-bom - ${reactor.version} - pom - import - - - - - io.netty - netty-bom - ${netty.version} - pom - import - - - - - com.fasterxml.jackson - jackson-bom - ${jackson.version} - pom - import - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - - - org.apache.logging.log4j - log4j-bom - ${log4j.version} - pom - import - - - + + + + io.scalecube + scalecube-test-support + ${scalecube-test-support.version} + test + + diff --git a/transport-parent/transport-netty/pom.xml b/transport-parent/transport-netty/pom.xml index 9b53b02d..554b8789 100644 --- a/transport-parent/transport-netty/pom.xml +++ b/transport-parent/transport-netty/pom.xml @@ -17,13 +17,11 @@ scalecube-transport-api ${project.version} - io.projectreactor.netty reactor-netty - - + ${project.groupId} scalecube-cluster-testlib