This is an automated email from the ASF dual-hosted git repository. asf-gitbox-commits pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/deltaspike.git
commit b330c0d9f498910573147a7a314653ce6c2a0f63 Author: Mark Struberg <[email protected]> AuthorDate: Tue May 12 09:53:11 2026 +0200 DELTASPIKE-1366 we do not run test-control tests in JakartaEE servers. The test-control and test-control5 is only intended for in-JVM unit tests. --- deltaspike/modules/test-control/impl/pom.xml | 8 ---- deltaspike/modules/test-control5/impl/pom.xml | 64 ++++++++++++++++++++------- 2 files changed, 48 insertions(+), 24 deletions(-) diff --git a/deltaspike/modules/test-control/impl/pom.xml b/deltaspike/modules/test-control/impl/pom.xml index b04de4663..77d088b7c 100644 --- a/deltaspike/modules/test-control/impl/pom.xml +++ b/deltaspike/modules/test-control/impl/pom.xml @@ -80,14 +80,6 @@ <scope>provided</scope> </dependency> -<!-- - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <scope>test</scope> - </dependency> ---> - <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> diff --git a/deltaspike/modules/test-control5/impl/pom.xml b/deltaspike/modules/test-control5/impl/pom.xml index 17cb85dc6..fff692921 100644 --- a/deltaspike/modules/test-control5/impl/pom.xml +++ b/deltaspike/modules/test-control5/impl/pom.xml @@ -124,22 +124,6 @@ </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <dependencies> - <dependency> - <groupId>org.apache.maven.surefire</groupId> - <artifactId>surefire-junit-platform</artifactId> - <version>${maven.surefire.plugin.version}</version> - </dependency> - </dependencies> - </plugin> - </plugins> - </build> - <profiles> <profile> @@ -167,7 +151,24 @@ <scope>test</scope> </dependency> </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-junit-platform</artifactId> + <version>${maven.surefire.plugin.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + </profile> + <profile> <id>Weld</id> <dependencies> @@ -181,6 +182,37 @@ <!-- The remaining bits of this profile are located under deltaspike/parent/code/pom.xml --> </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <dependencies> + <dependency> + <groupId>org.apache.maven.surefire</groupId> + <artifactId>surefire-junit-platform</artifactId> + <version>${maven.surefire.plugin.version}</version> + </dependency> + </dependencies> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>tomee-build-managed</id> + <!-- + just to switch off the surefire-plugin changes. + We don't run those tests with the EE containers + --> + </profile> + <profile> + <id>wildfly-build-managed</id> + <!-- + just to switch off the surefire-plugin changes. + We don't run those tests with the EE containers + --> </profile> </profiles>
