diff --git a/metrics-aeron/pom.xml b/metrics-aeron/pom.xml index b82f65a..2a9a991 100644 --- a/metrics-aeron/pom.xml +++ b/metrics-aeron/pom.xml @@ -1,5 +1,7 @@ - + 4.0.0 @@ -29,48 +31,6 @@ io.aeron aeron-cluster - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.jupiter - junit-jupiter-params - test - - - org.mockito - mockito-core - test - - - org.mockito - mockito-junit-jupiter - test - - - net.bytebuddy - * - - - - - org.apache.logging.log4j - log4j-slf4j-impl - test - - - org.apache.logging.log4j - log4j-core - test - diff --git a/metrics-aeron/src/test/java/io/scalecube/metrics/aeron/LoggingExtension.java b/metrics-aeron/src/test/java/io/scalecube/metrics/aeron/LoggingExtension.java deleted file mode 100644 index 8e55bb1..0000000 --- a/metrics-aeron/src/test/java/io/scalecube/metrics/aeron/LoggingExtension.java +++ /dev/null @@ -1,51 +0,0 @@ -package io.scalecube.metrics.aeron; - -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; - -/** - * A JUnit5 Extension, merely writes the test's name at start and finish. Make sure to start JAVA - * with -Djunit.jupiter.extensions.autodetection.enabled=true to activate this - * extension - */ -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/metrics-aeron/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/metrics-aeron/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension deleted file mode 100644 index fea3ed8..0000000 --- a/metrics-aeron/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension +++ /dev/null @@ -1 +0,0 @@ -io.scalecube.metrics.aeron.LoggingExtension diff --git a/metrics-aeron/src/test/resources/junit-platform.properties b/metrics-aeron/src/test/resources/junit-platform.properties deleted file mode 100644 index 6efc0d5..0000000 --- a/metrics-aeron/src/test/resources/junit-platform.properties +++ /dev/null @@ -1 +0,0 @@ -junit.jupiter.extensions.autodetection.enabled=true diff --git a/metrics/pom.xml b/metrics/pom.xml index 29b0793..1e4b92c 100644 --- a/metrics/pom.xml +++ b/metrics/pom.xml @@ -24,48 +24,6 @@ org.hdrhistogram HdrHistogram - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.junit.jupiter - junit-jupiter-params - test - - - org.mockito - mockito-core - test - - - org.mockito - mockito-junit-jupiter - test - - - net.bytebuddy - * - - - - - org.apache.logging.log4j - log4j-slf4j-impl - test - - - org.apache.logging.log4j - log4j-core - test - diff --git a/metrics/src/test/java/io/scalecube/metrics/LoggingExtension.java b/metrics/src/test/java/io/scalecube/metrics/LoggingExtension.java deleted file mode 100644 index 6882931..0000000 --- a/metrics/src/test/java/io/scalecube/metrics/LoggingExtension.java +++ /dev/null @@ -1,51 +0,0 @@ -package io.scalecube.metrics; - -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; - -/** - * A JUnit5 Extension, merely writes the test's name at start and finish. Make sure to start JAVA - * with -Djunit.jupiter.extensions.autodetection.enabled=true to activate this - * extension - */ -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/metrics/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension b/metrics/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension deleted file mode 100644 index 13e78de..0000000 --- a/metrics/src/test/resources/META-INF/services/org.junit.jupiter.api.extension.Extension +++ /dev/null @@ -1 +0,0 @@ -io.scalecube.metrics.LoggingExtension diff --git a/metrics/src/test/resources/junit-platform.properties b/metrics/src/test/resources/junit-platform.properties deleted file mode 100644 index 6efc0d5..0000000 --- a/metrics/src/test/resources/junit-platform.properties +++ /dev/null @@ -1 +0,0 @@ -junit.jupiter.extensions.autodetection.enabled=true diff --git a/pom.xml b/pom.xml index ab3c01a..3b88af3 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-metrics-parent @@ -57,21 +59,7 @@ - 2.2.4 - 1.35.6 - 2.1.12 - 1.7.36 - - 5.13.4 - 5.19.0 - 1.3 - 1.21.3 - 1.48.6 - 1.15.1 - 1.37 - 2.17.2 - 3.4.2 - 2.19.2 + 0.1.0 https://maven.pkg.github.com/scalecube/scalecube-metrics @@ -87,153 +75,14 @@ metrics-prometheus - - - - - org.agrona - agrona - ${agrona.version} - - - - - io.aeron - aeron-agent - ${aeron.version} - - - io.aeron - aeron-all - ${aeron.version} - - - io.aeron - aeron-driver - ${aeron.version} - - - io.aeron - aeron-client - ${aeron.version} - - - io.aeron - aeron-cluster - ${aeron.version} - - - io.aeron - aeron-archive - ${aeron.version} - - - - - net.bytebuddy - byte-buddy - ${byte-buddy.version} - - - net.bytebuddy - byte-buddy-agent - ${byte-buddy.version} - - - - - org.hdrhistogram - HdrHistogram - ${hdrhistogram.version} - - - - - org.openjdk.jmh - jmh-core - ${jmh.version} - - - org.openjdk.jmh - jmh-generator-annprocess - ${jmh.version} - - - - - org.slf4j - slf4j-api - ${slf4j.version} - - - org.apache.logging.log4j - log4j-bom - ${log4j.version} - pom - import - - - com.lmax - disruptor - ${disruptor.version} - - - - - com.fasterxml.jackson - jackson-bom - ${jackson.version} - pom - import - - - - - org.junit - junit-bom - ${junit.version} - pom - import - - - org.mockito - mockito-core - ${mockito.version} - - - org.mockito - mockito-junit-jupiter - ${mockito.version} - - - net.bytebuddy - * - - - - - org.testcontainers - testcontainers-bom - ${testcontainers.version} - pom - import - - - - - - - - maven-surefire-plugin - - - -javaagent:${settings.localRepository}/org/mockito/mockito-core/${mockito.version}/mockito-core-${mockito.version}.jar - --add-exports java.base/jdk.internal.misc=ALL-UNNAMED - --add-exports java.base/sun.nio.ch=ALL-UNNAMED - - - - - + + + + io.scalecube + scalecube-test-support + ${scalecube-test-support.version} + test + +