Skip to content

Commit

Permalink
Fix after bad rebase.
Browse files Browse the repository at this point in the history 
Signed-off-by: James R. Perkins <[email protected]>
  • Loading branch information
@jamezp
jamezp committed Jun 30, 2023
1 parent fb1ba8f commit 231da90
Show file tree
Hide file tree
Showing 4 changed files with 97 additions and 10 deletions.
2 changes: 0 additions & 2 deletions cli/src/main/java/org/jboss/as/cli/CommandLineMain.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down
1 change: 0 additions & 1 deletion ...common/src/main/resources/modules/system/layers/base/org/wildfly/embedded/main/module.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 1 addition & 1 deletion logmanager/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
102 changes: 96 additions & 6 deletions testsuite/embedded/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down

0 comments on commit 231da90

Please sign in to comment.