Repository: incubator-rya Updated Branches: refs/heads/master 2e71ff2a7 -> 0e613334f
Added failsafe plugin to parent pom. Closes #158. 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. Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/0e613334 Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/0e613334 Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/0e613334 Branch: refs/heads/master Commit: 0e613334f72ab45c1ec4775973dc26f215ed308e Parents: 2e71ff2 Author: isper3at <[email protected]> Authored: Tue May 9 22:20:18 2017 -0400 Committer: Caleb Meier <[email protected]> Committed: Mon May 15 18:51:21 2017 -0700 ---------------------------------------------------------------------- .../client/accumulo/AccumuloGetInstanceDetailsIT.java | 5 +---- .../rya/api/client/accumulo/AccumuloUninstallIT.java | 1 - extras/rya.pcj.fluo/pom.xml | 11 ----------- pom.xml | 14 ++++++++++++-- 4 files changed, 13 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/0e613334/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloGetInstanceDetailsIT.java ---------------------------------------------------------------------- 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 df03e78..4f12954 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.EntityCentricIndexDetails; 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 class AccumuloGetInstanceDetailsIT extends AccumuloITBase { .setEnableTemporalIndex(true) .setEnablePcjIndex(true) .setEnableGeoIndex(true) - .setFluoPcjAppName("fluo_app_name") .build(); final AccumuloConnectionDetails connectionDetails = new AccumuloConnectionDetails( @@ -91,8 +89,7 @@ public class AccumuloGetInstanceDetailsIT extends AccumuloITBase { .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(); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/0e613334/extras/indexing/src/test/java/org/apache/rya/api/client/accumulo/AccumuloUninstallIT.java ---------------------------------------------------------------------- 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 7f79efb..3966ddf 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 class AccumuloUninstallIT extends AccumuloITBase { .setEnableTemporalIndex(true) .setEnablePcjIndex(true) .setEnableGeoIndex(true) - .setFluoPcjAppName("fluo_app_name") .build(); final AccumuloConnectionDetails connectionDetails = new AccumuloConnectionDetails( http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/0e613334/extras/rya.pcj.fluo/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pom.xml b/extras/rya.pcj.fluo/pom.xml index 844c86b..54a22fc 100644 --- a/extras/rya.pcj.fluo/pom.xml +++ b/extras/rya.pcj.fluo/pom.xml @@ -64,17 +64,6 @@ </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> </plugin> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/0e613334/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 93915a6..8e06885 100644 --- a/pom.xml +++ b/pom.xml @@ -884,12 +884,22 @@ under the License. </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>
