Merge branch 'CURATOR-3.0' into CURATOR-99
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/24ba3c27 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/24ba3c27 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/24ba3c27 Branch: refs/heads/master Commit: 24ba3c2745c5fd6e4eaeba2cd2f31f7caeeccf65 Parents: 3a966ea 8363692 Author: randgalt <[email protected]> Authored: Mon Jan 23 21:56:03 2017 -0500 Committer: randgalt <[email protected]> Committed: Mon Jan 23 21:56:03 2017 -0500 ---------------------------------------------------------------------- curator-client/pom.xml | 40 ++++- .../org/apache/curator/utils/DebugUtils.java | 1 + curator-recipes/pom.xml | 6 + .../framework/recipes/cache/TreeCache.java | 67 +++++---- .../recipes/locks/InterProcessSemaphore.java | 6 + .../locks/InterProcessSemaphoreMutex.java | 13 +- .../recipes/locks/InterProcessSemaphoreV2.java | 5 + .../curator/framework/recipes/locks/Lease.java | 8 + .../framework/recipes/nodes/PersistentNode.java | 15 +- .../recipes/leader/TestLeaderSelector.java | 2 +- .../leader/TestLeaderSelectorParticipants.java | 2 +- .../locks/TestInterProcessSemaphore.java | 11 +- .../recipes/nodes/TestGroupMember.java | 28 +++- curator-test/pom.xml | 47 +++++- .../apache/curator/test/BaseClassForTests.java | 148 +++++++++++++++---- curator-x-discovery/pom.xml | 6 + .../curator/x/discovery/ServiceInstance.java | 32 +++- .../x/discovery/ServiceInstanceBuilder.java | 9 +- .../discovery/details/ServiceProviderImpl.java | 8 + .../x/discovery/TestJsonInstanceSerializer.java | 35 +++-- .../discovery/details/TestServiceProvider.java | 109 ++++++++++++++ pom.xml | 45 +++++- 22 files changed, 545 insertions(+), 98 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/curator/blob/24ba3c27/pom.xml ----------------------------------------------------------------------
