You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ro...@apache.org on 2022/06/27 14:06:54 UTC
[activemq-artemis] 02/03: fixups for changes on main between d0d2a9a16bb6664d1ebeb977f7213a9b8fa640da and 2ab0e85db48964fdb45b47b7c7da3ea504943c56
This is an automated email from the ASF dual-hosted git repository.
robbie pushed a commit to branch new-logging
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 41785fe2aac5dbfed4bdcf6aea4b24c44a53a021
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Mon Jun 27 13:39:58 2022 +0100
fixups for changes on main between d0d2a9a16bb6664d1ebeb977f7213a9b8fa640da and 2ab0e85db48964fdb45b47b7c7da3ea504943c56
---
artemis-unit-test-support/pom.xml | 4 ++--
.../src/main/java/org/apache/activemq/artemis/utils/Wait.java | 5 +++--
tests/artemis-test-support/pom.xml | 5 -----
.../src/main/java/org/apache/activemq/artemis/tests/util/Jmx.java | 8 +++++---
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/artemis-unit-test-support/pom.xml b/artemis-unit-test-support/pom.xml
index 45409e7acb..91264ec7c4 100644
--- a/artemis-unit-test-support/pom.xml
+++ b/artemis-unit-test-support/pom.xml
@@ -37,8 +37,8 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
diff --git a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/utils/Wait.java b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/utils/Wait.java
index 3d782e19d4..84a02a907d 100644
--- a/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/utils/Wait.java
+++ b/artemis-unit-test-support/src/main/java/org/apache/activemq/artemis/utils/Wait.java
@@ -21,14 +21,15 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.LockSupport;
import java.util.function.Supplier;
-import org.jboss.logging.Logger;
import org.junit.Assert;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utility adapted from: org.apache.activemq.util.Wait
*/
public class Wait {
- private static Logger logger = Logger.getLogger(Wait.class);
+ private static Logger logger = LoggerFactory.getLogger(Wait.class);
public static final long MAX_WAIT_MILLIS = 30 * 1000;
public static final int SLEEP_MILLIS = 100;
diff --git a/tests/artemis-test-support/pom.xml b/tests/artemis-test-support/pom.xml
index a01162b339..ec4f72672d 100644
--- a/tests/artemis-test-support/pom.xml
+++ b/tests/artemis-test-support/pom.xml
@@ -102,11 +102,6 @@
<artifactId>junit</artifactId>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.jboss.logging</groupId>
- <artifactId>jboss-logging</artifactId>
- <scope>provided</scope>
- </dependency>
<!-- This should be the only dependency not at 'provided' scope, for now -->
<dependency>
diff --git a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/Jmx.java b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/Jmx.java
index 05e2f8ad98..6f6fb20a37 100644
--- a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/Jmx.java
+++ b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/tests/util/Jmx.java
@@ -37,11 +37,13 @@ import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
import org.apache.activemq.artemis.utils.JsonLoader;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class Jmx {
- private static final Logger LOGGER = Logger.getLogger(Jmx.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(Jmx.class);
@FunctionalInterface
public interface ThrowableFunction<T, R> {
@@ -106,7 +108,7 @@ public class Jmx {
final String backup = nodePair.getString("backup", null);
networkTopology.put(nodeID, new Pair<>(live, backup));
} catch (Exception e) {
- LOGGER.warnf(e, "Error on %s", nodePair);
+ LOGGER.warn("Error on {}", nodePair, e);
}
}
return networkTopology;