Merge pull request #1 from ipeteclarke/main

Updated Pom file to use failsafe to run Integration Tests
smartrics · Jun 3, 2024 · c2fa968 · c2fa968
2 parents 24f230a + f35513b
commit c2fa968
Show file tree

Hide file tree

Showing 4 changed files with 70 additions and 1 deletion.
diff --git a/nifi-iotics-hostservice/pom.xml b/nifi-iotics-hostservice/pom.xml
@@ -21,6 +21,7 @@
         <groupId>smartrics.iotics.nifi</groupId>
         <artifactId>nifi-iotics</artifactId>
         <version>1.1-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <artifactId>nifi-iotics-hostservice</artifactId>

diff --git a/nifi-iotics-nar/pom.xml b/nifi-iotics-nar/pom.xml
@@ -20,6 +20,7 @@
         <groupId>smartrics.iotics.nifi</groupId>
         <artifactId>nifi-iotics</artifactId>
         <version>1.1-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <artifactId>nifi-iotics-nar</artifactId>

diff --git a/nifi-iotics-processors/pom.xml b/nifi-iotics-processors/pom.xml
@@ -21,6 +21,7 @@
         <groupId>smartrics.iotics.nifi</groupId>
         <artifactId>nifi-iotics</artifactId>
         <version>1.1-SNAPSHOT</version>
+        <relativePath>..</relativePath>
     </parent>
 
     <artifactId>nifi-iotics-processors</artifactId>
@@ -33,6 +34,34 @@
         <maven-test-plugins.version>3.2.5</maven-test-plugins.version>
     </properties>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>3.2.5</version>
+            </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>add-integration-test-source-as-test-sources</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/integration/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>

diff --git a/pom.xml b/pom.xml
@@ -32,6 +32,7 @@
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <google.gson.version>2.10.1</google.gson.version>
         <google.guava.version>33.1.0-android</google.guava.version>
+        <skipITs>true</skipITs>    
     </properties>
 
     <licenses>
@@ -75,7 +76,27 @@
                     <generateBackupPoms>false</generateBackupPoms>
                 </configuration>
             </plugin>
-        </plugins>        <pluginManagement>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.6.0</version>
+                <executions>
+                    <execution>
+                        <id>add-integration-test-source-as-test-sources</id>
+                        <phase>generate-test-sources</phase>
+                        <goals>
+                            <goal>add-test-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/integrationTest/java</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>        
+        <pluginManagement>
             <plugins>
                 <!-- https://mvnrepository.com/artifact/org.codehaus.mojo/versions-maven-plugin -->
                 <plugin>
@@ -99,6 +120,23 @@
                         <reuseForks>true</reuseForks>
                     </configuration>
                 </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>3.2.5</version>
+                    <executions>
+                        <execution>
+                            <goals>
+                                <goal>integration-test</goal>
+                                <goal>verify</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                    <configuration>
+                        <testSourceDirectory>src/integration/java</testSourceDirectory>
+                        <skipITs>${skipITs}</skipITs>    
+                    </configuration>
+                </plugin>
             </plugins>
         </pluginManagement>
     </build>