Repository: accumulo Updated Branches: refs/heads/1.6.1-SNAPSHOT 10d8264e0 -> e440e4712 refs/heads/master cc0c06799 -> 9bc87f97b
ACCUMULO-3064 Allow useSslForIT to always be specified. Previously, the configuration would only be set when the shared-mini-for-it profile was activated. There's no reason this has to be the case -- the normal MAC setup can create and use SSL for RPCs. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e440e471 Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e440e471 Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e440e471 Branch: refs/heads/1.6.1-SNAPSHOT Commit: e440e47120593c0f7e1d4cf772b4bcd7ff960b70 Parents: 10d8264 Author: Josh Elser <els...@apache.org> Authored: Tue Aug 12 18:17:47 2014 -0400 Committer: Josh Elser <els...@apache.org> Committed: Tue Aug 12 18:17:47 2014 -0400 ---------------------------------------------------------------------- test/pom.xml | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/e440e471/test/pom.xml ---------------------------------------------------------------------- diff --git a/test/pom.xml b/test/pom.xml index 17c8527..7c932d6 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -201,6 +201,16 @@ <configuration> <systemPropertyVariables> <timeout.factor>${timeout.factor}</timeout.factor> + <org.apache.accumulo.test.functional.useSslForIT>${useSslForIT}</org.apache.accumulo.test.functional.useSslForIT> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <systemPropertyVariables> + <org.apache.accumulo.test.functional.useSslForIT>${useSslForIT}</org.apache.accumulo.test.functional.useSslForIT> </systemPropertyVariables> </configuration> </plugin> @@ -260,18 +270,6 @@ </execution> </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-failsafe-plugin</artifactId> - <configuration> - <systemProperties> - <property> - <name>org.apache.accumulo.test.functional.useSslForIT</name> - <value>${useSslForIT}</value> - </property> - </systemProperties> - </configuration> - </plugin> </plugins> </build> </profile>
