[#noissue] Improved maven-failsafe-plugin to only work with it-modules

pinpoint-apm · Oct 8, 2024 · b5f895b · b5f895b
1 parent 34527c4
commit b5f895b
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 29 deletions.
diff --git a/agent-module/plugins-it/pom.xml b/agent-module/plugins-it/pom.xml
@@ -162,6 +162,13 @@
                 </plugin>
             </plugins>
         </pluginManagement>
-
+
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+            </plugin>
+        </plugins>
+
     </build>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -1763,6 +1763,34 @@
                     <artifactId>build-helper-maven-plugin</artifactId>
                     <version>${plugin.build-helper.version}</version>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>${plugin.failsafe.version}</version>
+                    <configuration>
+                        <jvm>${test.jdk.home}/bin/java</jvm>
+                        <testFailureIgnore>true</testFailureIgnore>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                            <configuration>
+                                <excludes>
+                                    <exclude>**/*Base</exclude>
+                                </excludes>
+                                <includes>
+                                    <include>**/*IT.java</include>
+                                </includes>
+                                <!-- AbstractPinpointPluginTestSuite needs this to resolve
+                                path of required jars -->
+                                <useSystemClassLoader>false</useSystemClassLoader>
+                            </configuration>
+                        </execution>
+                    </executions>
+                </plugin>
 
                 <!-- reporting -->
                 <plugin>
@@ -1906,34 +1934,7 @@
                     <reuseForks>true</reuseForks>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <version>${plugin.failsafe.version}</version>
-                <configuration>
-                    <jvm>${test.jdk.home}/bin/java</jvm>
-                    <testFailureIgnore>true</testFailureIgnore>
-                </configuration>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                        <configuration>
-                            <excludes>
-                                <exclude>**/*Base</exclude>
-                            </excludes>
-                            <includes>
-                                <include>**/*IT.java</include>
-                            </includes>
-                            <!-- AbstractPinpointPluginTestSuite needs this to resolve
-                            path of required jars -->
-                            <useSystemClassLoader>false</useSystemClassLoader>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-enforcer-plugin</artifactId>