From ad461e08b770fb1eb2e5493aa4105b323eca1dfc Mon Sep 17 00:00:00 2001
From: isper3at <smith3at@gmail.com>
Date: Tue, 9 May 2017 22:20:18 -0400
Subject: [PATCH] Added failsafe plugin to parent pom

without the failsafe plugin the integration tests
were not being run. Added the plugin to the parent
pom, fixed the failing tests, removed the plugin
from fluo pom to prevent conflicts.
---
 .../accumulo/AccumuloGetInstanceDetailsIT.java     |  5 +----
 .../api/client/accumulo/AccumuloUninstallIT.java   |  1 -
 extras/rya.pcj.fluo/pom.xml                        | 11 -----------
 pom.xml                                            | 14 ++++++++++++--
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetailsIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetailsIT.java
index df03e7861..4f1295473 100644
--- a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetailsIT.java
+++ b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetailsIT.java
@@ -40,7 +40,6 @@
 import org.apache.rya.api.instance.RyaDetails.FreeTextIndexDetails;
 import org.apache.rya.api.instance.RyaDetails.JoinSelectivityDetails;
 import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails;
-import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails.FluoDetails;
 import org.apache.rya.api.instance.RyaDetails.ProspectorDetails;
 import org.apache.rya.api.instance.RyaDetails.TemporalIndexDetails;
 import org.junit.Test;
@@ -63,7 +62,6 @@ public void getDetails() throws AccumuloException, AccumuloSecurityException, Du
                 .setEnableTemporalIndex(true)
                 .setEnablePcjIndex(true)
                 .setEnableGeoIndex(true)
-                .setFluoPcjAppName("fluo_app_name")
                 .build();
 
         final AccumuloConnectionDetails connectionDetails = new AccumuloConnectionDetails(
@@ -91,8 +89,7 @@ public void getDetails() throws AccumuloException, AccumuloSecurityException, Du
                 .setEntityCentricIndexDetails( new EntityCentricIndexDetails(true) )
                 .setPCJIndexDetails(
                         PCJIndexDetails.builder()
-                            .setEnabled(true)
-                            .setFluoDetails( new FluoDetails("fluo_app_name") ))
+                            .setEnabled(true))
                 .setProspectorDetails( new ProspectorDetails(Optional.<Date>absent()) )
                 .setJoinSelectivityDetails( new JoinSelectivityDetails(Optional.<Date>absent()) )
                 .build();
diff --git a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloUninstallIT.java b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloUninstallIT.java
index 7f79efb8b..3966ddfa3 100644
--- a/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloUninstallIT.java
+++ b/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloUninstallIT.java
@@ -55,7 +55,6 @@ public void uninstall() throws Exception {
                 .setEnableTemporalIndex(true)
                 .setEnablePcjIndex(true)
                 .setEnableGeoIndex(true)
-                .setFluoPcjAppName("fluo_app_name")
                 .build();
 
         final AccumuloConnectionDetails connectionDetails = new AccumuloConnectionDetails(
diff --git a/extras/rya.pcj.fluo/pom.xml b/extras/rya.pcj.fluo/pom.xml
index 844c86bba..54a22fcd8 100644
--- a/extras/rya.pcj.fluo/pom.xml
+++ b/extras/rya.pcj.fluo/pom.xml
@@ -63,17 +63,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <artifactId>maven-failsafe-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>integration-test</goal>
-                            <goal>verify</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
 		<groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-dependency-plugin</artifactId>
diff --git a/pom.xml b/pom.xml
index 93915a691..8e0688534 100644
--- a/pom.xml
+++ b/pom.xml
@@ -883,13 +883,23 @@ under the License.
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>integration-test</goal>
+                            <goal>verify</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <exclude>**/*IntegrationTest.java
-                        </exclude>
+                        <exclude>**/*IntegrationTest.java</exclude>
                     </excludes>
                 </configuration>
             </plugin>