[MAINTENANCE] Remove forkMode removed parameter from surefire

apache · Jan 25, 2025 · c711c77 · c711c77
1 parent b8d9d6d
commit c711c77
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 49 deletions.
diff --git a/blueprint/itests/blueprint-itests/pom.xml b/blueprint/itests/blueprint-itests/pom.xml
@@ -339,13 +339,6 @@
 
     <build>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>

diff --git a/ejb/ejb-modeller-itest/pom.xml b/ejb/ejb-modeller-itest/pom.xml
@@ -551,8 +551,6 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
-                    <forkMode>pertest</forkMode>
-
                     <!-- Tests are not reliable -->
                     <skipTests>true</skipTests>
                 </configuration>
@@ -574,7 +572,6 @@
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
                         <configuration>
-                            <forkMode>pertest</forkMode>
                             <!--
                                 when the local repo location has been specified, we need to pass
                                 on this information to PAX mvn url

diff --git a/jmx/jmx-itests/pom.xml b/jmx/jmx-itests/pom.xml
@@ -253,14 +253,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/jndi/jndi-url-itest/pom.xml b/jndi/jndi-url-itest/pom.xml
@@ -45,6 +45,7 @@
     <properties>
         <asm-debug-all.version>5.0.3</asm-debug-all.version>
         <cm.version>3.2.0-v20070116</cm.version>
+        <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
         <geronimo-servlet_2.5_spec.version>1.2</geronimo-servlet_2.5_spec.version>
         <jndi-api.version>${jndi-api.dev-version}</jndi-api.version>
         <jndi-bundle.version>${jndi-bundle.dev-version}</jndi-bundle.version>
@@ -279,14 +280,11 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>pertest</forkMode>
-                </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
-                <version>1.5.0</version>
+                <version>${depends-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <phase>generate-resources</phase>

diff --git a/parent/pom.xml b/parent/pom.xml
@@ -404,7 +404,6 @@
                     <artifactId>maven-surefire-plugin</artifactId>
                     <configuration>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                        <forkMode>once</forkMode>
                         <argLine>-enableassertions</argLine>
                         <failIfNoTests>false</failIfNoTests>
                         <workingDirectory>${project.build.directory}</workingDirectory>

diff --git a/proxy/proxy-itests/pom.xml b/proxy/proxy-itests/pom.xml
@@ -189,13 +189,6 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>${maven-compiler-plugin.version}</version>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>

diff --git a/spi-fly/pom.xml b/spi-fly/pom.xml
@@ -143,7 +143,6 @@
                     <version>${maven-surefire-plugin.version}</version>
                     <configuration>
                         <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                        <forkMode>once</forkMode>
                         <argLine>
                             -enableassertions
                         </argLine>
@@ -210,7 +209,6 @@
                             <version>${maven-surefire-plugin.version}</version>
                             <configuration>
                                 <redirectTestOutputToFile>true</redirectTestOutputToFile>
-                                <forkMode>once</forkMode>
                                 <argLine>
                                     -enableassertions
                                     --add-opens java.base/java.lang=ALL-UNNAMED

diff --git a/subsystem/subsystem-itests/pom.xml b/subsystem/subsystem-itests/pom.xml
@@ -66,6 +66,7 @@
         <slf4j-api.version>1.7.7</slf4j-api.version>
         <tinybundles.version>2.0.0</tinybundles.version>
         <url.version>2.5.3</url.version>
+        <depends-maven-plugin.version>1.5.0</depends-maven-plugin.version>
     </properties>
 
     <dependencies>
@@ -866,7 +867,7 @@
             <plugin>
                 <groupId>org.apache.servicemix.tooling</groupId>
                 <artifactId>depends-maven-plugin</artifactId>
-                <version>1.5.0</version>
+                <version>${depends-maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>generate-depends-file</id>
@@ -876,14 +877,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
 

diff --git a/web/web-itests/pom.xml b/web/web-itests/pom.xml
@@ -210,14 +210,6 @@
                     </execution>
                 </executions>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration>
-                    <forkMode>pertest</forkMode>
-                </configuration>
-            </plugin>
         </plugins>
     </build>