From 231da90fee255c6f910910031da170a7879847aa Mon Sep 17 00:00:00 2001
From: "James R. Perkins" <jperkins@redhat.com>
Date: Tue, 20 Jun 2023 13:43:15 -0700
Subject: [PATCH] Fix after bad rebase.

Signed-off-by: James R. Perkins <jperkins@redhat.com>
---
 .../org/jboss/as/cli/CommandLineMain.java     |   2 -
 .../base/org/wildfly/embedded/main/module.xml |   1 -
 logmanager/pom.xml                            |   2 +-
 testsuite/embedded/pom.xml                    | 102 ++++++++++++++++--
 4 files changed, 97 insertions(+), 10 deletions(-)

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 @@
         <module name="org.jboss.modules"/>
         <module name="org.jboss.stdio"/>
         <module name="org.jboss.threads"/>
-        <module name="org.wildfly.core.logmanager" services="import"/>
     </dependencies>
 </module>
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 @@
     <parent>
         <groupId>org.wildfly.core</groupId>
         <artifactId>wildfly-core-parent</artifactId>
-        <version>21.0.0.Beta5-SNAPSHOT</version>
+        <version>21.1.0.Beta2-SNAPSHOT</version>
     </parent>
 
     <artifactId>wildfly-logmanager</artifactId>
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 @@
             <artifactId>log4j-core</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.logmanager</groupId>
+            <artifactId>jboss-logmanager</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
@@ -82,29 +87,114 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <failIfNoTests>false</failIfNoTests>
-                    <!-- parallel>none</parallel -->
                     <redirectTestOutputToFile>${testLogToFile}</redirectTestOutputToFile>
 
-                    <!-- Always use a new fork so each test gets it's own embedded environment -->
+                    <!-- Always use a new fork so each test gets its own embedded environment -->
                     <forkCount>1</forkCount>
                     <reuseForks>false</reuseForks>
 
-                    <argLine>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</argLine>
-
                     <environmentVariables>
                         <JBOSS_HOME>${wildfly.home}</JBOSS_HOME>
                     </environmentVariables>
 
                     <systemPropertyVariables>
                         <jboss.home>${wildfly.home}</jboss.home>
-                        <org.jboss.logging.provider>jdk</org.jboss.logging.provider>
                         <jboss.test.start.timeout>${jboss.test.start.timeout}</jboss.test.start.timeout>
                         <jboss.test.log.dir>${project.build.directory}${file.separator}test-logs</jboss.test.log.dir>
                         <jvm.args>-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}</jvm.args>
                         <maven.repo.local>${settings.localRepository}</maven.repo.local>
                     </systemPropertyVariables>
                 </configuration>
+                <executions>
+                    <execution>
+                        <id>default-test</id>
+                        <configuration>
+                            <excludes>
+                                <exclude>org.wildfly.core.test.embedded.standalone.*TestCase</exclude>
+                                <exclude>org.wildfly.core.test.embedded.host.controller.*TestCase</exclude>
+                            </excludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>log4j2-test</id>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <phase>test</phase>
+                        <configuration>
+                            <includes>
+                                <include>**/Log4j2*TestCase.java</include>
+                            </includes>
+                            <classpathDependencyExcludes>
+                                <exclude>org.jboss.logmanager:jboss-logmanager</exclude>
+                                <exclude>org.slf4j:slf4j-api</exclude>
+                                <exclude>ch.qos.logback:logback-classic</exclude>
+                                <exclude>ch.qos.logback:logback-core</exclude>
+                            </classpathDependencyExcludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>logback-test</id>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <phase>test</phase>
+                        <configuration>
+                            <includes>
+                                <include>**/Logback*TestCase.java</include>
+                            </includes>
+                            <classpathDependencyExcludes>
+                                <exclude>org.jboss.logmanager:jboss-logmanager</exclude>
+                                <exclude>org.apache.logging.log4j:log4j-api</exclude>
+                                <exclude>org.apache.logging.log4j:log4j-core</exclude>
+                            </classpathDependencyExcludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>jul-test</id>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <phase>test</phase>
+                        <configuration>
+                            <includes>
+                                <include>**/Jul*TestCase.java</include>
+                            </includes>
+                            <systemPropertyVariables>
+                                <!-- Do not use the JBoss Log Manager which is set in the parent configuration. -->
+                                <java.util.logging.manager>java.util.logging.LogManager</java.util.logging.manager>
+                            </systemPropertyVariables>
+                            <classpathDependencyExcludes>
+                                <!-- Typically this should be excluded, but we currently use the PatternFormatter. -->
+                                <!-- <exclude>org.jboss.logmanager:jboss-logmanager</exclude> -->
+                                <exclude>org.apache.logging.log4j:log4j-api</exclude>
+                                <exclude>org.apache.logging.log4j:log4j-core</exclude>
+                                <exclude>org.slf4j:slf4j-api</exclude>
+                                <exclude>ch.qos.logback:logback-classic</exclude>
+                                <exclude>ch.qos.logback:logback-core</exclude>
+                            </classpathDependencyExcludes>
+                        </configuration>
+                    </execution>
+                    <execution>
+                        <id>jboss-logmanager-test</id>
+                        <goals>
+                            <goal>test</goal>
+                        </goals>
+                        <phase>test</phase>
+                        <configuration>
+                            <includes>
+                                <include>**/JBossLogManager*TestCase.java</include>
+                            </includes>
+                            <classpathDependencyExcludes>
+                                <exclude>org.apache.logging.log4j:log4j-api</exclude>
+                                <exclude>org.apache.logging.log4j:log4j-core</exclude>
+                                <exclude>org.slf4j:slf4j-api</exclude>
+                                <exclude>ch.qos.logback:logback-classic</exclude>
+                                <exclude>ch.qos.logback:logback-core</exclude>
+                            </classpathDependencyExcludes>
+                        </configuration>
+                    </execution>
+                </executions>
             </plugin>
             <plugin>
                 <groupId>org.jboss.galleon</groupId>