diff --git a/cli/src/main/java/org/jboss/as/cli/CommandLineMain.java b/cli/src/main/java/org/jboss/as/cli/CommandLineMain.java index 3a716671006..b710fbf66de 100644 --- a/cli/src/main/java/org/jboss/as/cli/CommandLineMain.java +++ b/cli/src/main/java/org/jboss/as/cli/CommandLineMain.java @@ -23,7 +23,6 @@ import java.io.File; import java.io.FileWriter; -import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; @@ -35,7 +34,6 @@ import org.jboss.as.cli.impl.CliLauncher; import org.jboss.logging.Logger; -import org.jboss.logmanager.Configurator; import org.jboss.logmanager.LogContext; import org.jboss.logmanager.configuration.ContextConfiguration; import org.jboss.logmanager.configuration.PropertyContextConfiguration; diff --git a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/embedded/main/module.xml b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/embedded/main/module.xml index dc73d35534f..287b8ebb5a1 100644 --- a/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/embedded/main/module.xml +++ b/core-feature-pack/common/src/main/resources/modules/system/layers/base/org/wildfly/embedded/main/module.xml @@ -50,6 +50,5 @@ - diff --git a/logmanager/pom.xml b/logmanager/pom.xml index 484698c96df..100c3aacf77 100644 --- a/logmanager/pom.xml +++ b/logmanager/pom.xml @@ -25,7 +25,7 @@ org.wildfly.core wildfly-core-parent - 21.0.0.Beta5-SNAPSHOT + 21.1.0.Beta2-SNAPSHOT wildfly-logmanager diff --git a/testsuite/embedded/pom.xml b/testsuite/embedded/pom.xml index 89fad8c2b04..b5b14332822 100644 --- a/testsuite/embedded/pom.xml +++ b/testsuite/embedded/pom.xml @@ -57,6 +57,11 @@ log4j-core test + + org.jboss.logmanager + jboss-logmanager + test + org.slf4j slf4j-api @@ -82,29 +87,114 @@ org.apache.maven.plugins maven-surefire-plugin - false - ${testLogToFile} - + 1 false - -Djava.util.logging.manager=org.jboss.logmanager.LogManager - ${wildfly.home} ${wildfly.home} - jdk ${jboss.test.start.timeout} ${project.build.directory}${file.separator}test-logs -Dmaven.repo.local=${settings.localRepository} ${surefire.system.args} ${jvm.args.ip.server} ${jvm.args.security} ${jvm.args.other} ${jvm.args.timeouts} -Djbossas.ts.dir=${jbossas.ts.dir} ${settings.localRepository} + + + default-test + + + org.wildfly.core.test.embedded.standalone.*TestCase + org.wildfly.core.test.embedded.host.controller.*TestCase + + + + + log4j2-test + + test + + test + + + **/Log4j2*TestCase.java + + + org.jboss.logmanager:jboss-logmanager + org.slf4j:slf4j-api + ch.qos.logback:logback-classic + ch.qos.logback:logback-core + + + + + logback-test + + test + + test + + + **/Logback*TestCase.java + + + org.jboss.logmanager:jboss-logmanager + org.apache.logging.log4j:log4j-api + org.apache.logging.log4j:log4j-core + + + + + jul-test + + test + + test + + + **/Jul*TestCase.java + + + + java.util.logging.LogManager + + + + + org.apache.logging.log4j:log4j-api + org.apache.logging.log4j:log4j-core + org.slf4j:slf4j-api + ch.qos.logback:logback-classic + ch.qos.logback:logback-core + + + + + jboss-logmanager-test + + test + + test + + + **/JBossLogManager*TestCase.java + + + org.apache.logging.log4j:log4j-api + org.apache.logging.log4j:log4j-core + org.slf4j:slf4j-api + ch.qos.logback:logback-classic + ch.qos.logback:logback-core + + + + org.jboss.galleon