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/08/17 16:31:52 UTC
[activemq-artemis] 06/06: remove uses of JBL from compatibility tests, add artemis-unit-test-support to snapshots CP to ensure test appender class is found and avoids stacktracing
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 fbe5b0a22200165eea5e33d758b8de1414510f58
Author: Robbie Gemmell <ro...@apache.org>
AuthorDate: Wed Aug 17 17:28:27 2022 +0100
remove uses of JBL from compatibility tests, add artemis-unit-test-support to snapshots CP to ensure test appender class is found and avoids stacktracing
removes seemingly unused artemis-rest dependency
---
tests/compatibility-tests/pom.xml | 7 +-
.../logs/JBossLoggingApacheLoggerBridge.java | 131 ---------------------
.../tests/compatibility/base/ClasspathBase.java | 9 +-
.../tests/compatibility/base/VersionedBase.java | 5 +-
4 files changed, 10 insertions(+), 142 deletions(-)
diff --git a/tests/compatibility-tests/pom.xml b/tests/compatibility-tests/pom.xml
index 67337648c2..6b71156f50 100644
--- a/tests/compatibility-tests/pom.xml
+++ b/tests/compatibility-tests/pom.xml
@@ -129,11 +129,6 @@
<version>${project.version}</version>
<type>pom</type>
</dependency>
- <dependency>
- <groupId>org.apache.activemq.rest</groupId>
- <artifactId>artemis-rest</artifactId>
- <version>3.0.0-SNAPSHOT</version>
- </dependency>
<dependency>
<groupId>org.apache.groovy</groupId>
<artifactId>groovy-all</artifactId>
@@ -288,6 +283,7 @@
<arg>org.apache.groovy:groovy-all:pom:${groovy.version}</arg>
</libListWithDeps>
<libList>
+ <arg>org.apache.activemq:artemis-unit-test-support:${project.version}</arg>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/ARTEMIS-SNAPSHOT.cp</file>
@@ -316,6 +312,7 @@
<arg>org.apache.activemq:artemis-jakarta-server:${project.version}</arg>
<arg>org.apache.activemq:artemis-jakarta-client:${project.version}</arg>
<arg>org.apache.activemq:artemis-jakarta-service-extensions:${project.version}</arg>
+ <arg>org.apache.activemq:artemis-unit-test-support:${project.version}</arg>
<arg>org.apache.activemq.tests:compatibility-tests:${project.version}</arg>
</libList>
<file>${basedir}/target/ARTEMIS-JAKARTAEE.cp</file>
diff --git a/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java b/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java
deleted file mode 100644
index c71c70d4e4..0000000000
--- a/tests/compatibility-tests/src/main/java/org/apache/activemq/artemis/logs/JBossLoggingApacheLoggerBridge.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.activemq.artemis.logs;
-
-import org.apache.commons.logging.Log;
-import org.jboss.logging.Logger;
-
-/**
- * This is a necessary copy of the JBossLoggingApacheLoggerBridge on artemis-commons package.
- * Since we define -Dorg.apache.commons.logging.Log=org.apache.activemq.artemis.logs.JBossLoggingApacheLoggerBridge
- * We need to have the class defined.
- * However I cannot import commons into older versions.
- * For that reason this class was needed as a duplicate.
- * */
-public class JBossLoggingApacheLoggerBridge implements Log {
-
- final Logger bridgeLog;
-
- public JBossLoggingApacheLoggerBridge(Class clazz) {
- bridgeLog = Logger.getLogger(clazz);
- }
-
- public JBossLoggingApacheLoggerBridge(String name) {
- bridgeLog = Logger.getLogger(name);
- }
-
- @Override
- public void debug(Object message) {
- bridgeLog.debug(message);
- }
-
- @Override
- public void debug(Object message, Throwable t) {
- bridgeLog.debug(message, t);
- }
-
- @Override
- public void error(Object message) {
- bridgeLog.error(message);
- }
-
- @Override
- public void error(Object message, Throwable t) {
- bridgeLog.error(message, t);
- }
-
- @Override
- public void fatal(Object message) {
- bridgeLog.fatal(message);
- }
-
- @Override
- public void fatal(Object message, Throwable t) {
- bridgeLog.fatal(message, t);
- }
-
- @Override
- public void info(Object message) {
- bridgeLog.info(message);
- }
-
- @Override
- public void info(Object message, Throwable t) {
- bridgeLog.info(message, t);
- }
-
- @Override
- public boolean isDebugEnabled() {
- return bridgeLog.isDebugEnabled();
- }
-
- @Override
- public boolean isErrorEnabled() {
- return bridgeLog.isEnabled(Logger.Level.ERROR);
- }
-
- @Override
- public boolean isFatalEnabled() {
- return bridgeLog.isEnabled(Logger.Level.FATAL);
- }
-
- @Override
- public boolean isInfoEnabled() {
- return bridgeLog.isInfoEnabled();
- }
-
- @Override
- public boolean isTraceEnabled() {
- return bridgeLog.isTraceEnabled();
- }
-
- @Override
- public boolean isWarnEnabled() {
- return bridgeLog.isEnabled(Logger.Level.WARN);
- }
-
- @Override
- public void trace(Object message) {
- bridgeLog.trace(message);
- }
-
- @Override
- public void trace(Object message, Throwable t) {
- bridgeLog.trace(message, t);
- }
-
- @Override
- public void warn(Object message) {
- bridgeLog.warn(message);
- }
-
- @Override
- public void warn(Object message, Throwable t) {
- bridgeLog.warn(message, t);
- }
-}
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java
index eb504b3a94..c24cedf82f 100644
--- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/ClasspathBase.java
@@ -26,7 +26,6 @@ import java.util.HashSet;
import java.util.Map;
import org.apache.activemq.artemis.tests.compatibility.GroovyRun;
-import org.jboss.logging.Logger;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.Assume;
@@ -36,6 +35,8 @@ import org.junit.rules.TemporaryFolder;
import org.junit.rules.TestRule;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT;
@@ -43,7 +44,7 @@ import static org.apache.activemq.artemis.tests.compatibility.GroovyRun.SNAPSHOT
public class ClasspathBase {
- private static final Logger logger = Logger.getLogger(ClasspathBase.class);
+ private static final Logger logger = LoggerFactory.getLogger(ClasspathBase.class);
private final Logger instanceLog = logger;
@@ -52,12 +53,12 @@ public class ClasspathBase {
@Override
protected void starting(Description description) {
- instanceLog.info(String.format("**** start #test %s() ***", ClasspathBase.this.getClass().getName() + "::" + description.getMethodName()));
+ instanceLog.info("**** start #test {}::{}() ***", ClasspathBase.this.getClass().getName(), description.getMethodName());
}
@Override
protected void finished(Description description) {
- instanceLog.info(String.format("**** end #test %s() ***", ClasspathBase.this.getClass().getName() + "::" + description.getMethodName()));
+ instanceLog.info("**** end #test {}::{}() ***", ClasspathBase.this.getClass().getName(), description.getMethodName());
}
};
diff --git a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/VersionedBase.java b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/VersionedBase.java
index e3e56ef60c..706d8adff4 100644
--- a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/VersionedBase.java
+++ b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/base/VersionedBase.java
@@ -21,11 +21,12 @@ import java.io.File;
import java.util.LinkedList;
import java.util.List;
-import org.jboss.logging.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public abstract class VersionedBase extends ClasspathBase {
- private static final Logger logger = Logger.getLogger(VersionedBase.class);
+ private static final Logger logger = LoggerFactory.getLogger(VersionedBase.class);
protected final String server;
protected final String sender;