Merge branch 'master' into CURATOR-3.0
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/8e7fbac8 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/8e7fbac8 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/8e7fbac8 Branch: refs/heads/CURATOR-351 Commit: 8e7fbac86dfe14f18a540a6a10c75f5bfe74120a Parents: 304da97 a47ab1e Author: randgalt <[email protected]> Authored: Mon Jan 16 13:27:31 2017 -0500 Committer: randgalt <[email protected]> Committed: Mon Jan 16 13:27:31 2017 -0500 ---------------------------------------------------------------------- curator-client/pom.xml | 40 ++++++++++++++++++++++++++++++++-- curator-recipes/pom.xml | 6 +++++ curator-test/pom.xml | 47 +++++++++++++++++++++++++++++++++++----- curator-x-discovery/pom.xml | 6 +++++ pom.xml | 43 +++++++++++++++++++++++++++++++++++- 5 files changed, 133 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-client/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-recipes/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-test/pom.xml ---------------------------------------------------------------------- diff --cc curator-test/pom.xml index c81dfec,4cac12b..afc9f36 --- a/curator-test/pom.xml +++ b/curator-test/pom.xml @@@ -41,11 -41,11 +41,6 @@@ </dependency> <dependency> - <groupId>org.apache.commons</groupId> - <artifactId>commons-math</artifactId> - <groupId>org.javassist</groupId> - <artifactId>javassist</artifactId> -- </dependency> -- -- <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/curator-x-discovery/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/8e7fbac8/pom.xml ----------------------------------------------------------------------
