This is an automated email from the ASF dual-hosted git repository. robbie pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
commit 6f0e243ec532743d50db7d63eff2ba968301354b Author: Justin Bertram <[email protected]> AuthorDate: Sat Feb 1 12:58:35 2025 -0600 ARTEMIS-5286 don't mix JUnit 4 & 5 in the same test --- .../core/config/impl/FileXIncludeSchemaConfigurationTest.java | 6 +++--- .../artemis/core/server/management/ArtemisMBeanServerGuardTest.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeSchemaConfigurationTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeSchemaConfigurationTest.java index 6803259351..75f9b1464a 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeSchemaConfigurationTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileXIncludeSchemaConfigurationTest.java @@ -16,13 +16,13 @@ */ package org.apache.activemq.artemis.core.config.impl; -import static org.junit.Assume.assumeTrue; -import static org.junit.jupiter.api.Assertions.assertEquals; - import org.apache.activemq.artemis.core.server.plugin.ActiveMQServerBasePlugin; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.TestTemplate; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + public class FileXIncludeSchemaConfigurationTest extends FileConfigurationTest { @Override diff --git a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuardTest.java b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuardTest.java index 26f3cc3eff..dd7de1bbfd 100644 --- a/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuardTest.java +++ b/artemis-server/src/test/java/org/apache/activemq/artemis/core/server/management/ArtemisMBeanServerGuardTest.java @@ -19,7 +19,7 @@ package org.apache.activemq.artemis.core.server.management; import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder; import org.apache.activemq.artemis.spi.core.security.jaas.RolePrincipal; import org.apache.activemq.artemis.tests.util.ServerTestBase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import javax.management.ObjectName; import javax.security.auth.Subject; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information, visit: https://activemq.apache.org/contact
