Merge branch 'CURATOR-200'
Project: http://git-wip-us.apache.org/repos/asf/curator/repo Commit: http://git-wip-us.apache.org/repos/asf/curator/commit/a47ab1e1 Tree: http://git-wip-us.apache.org/repos/asf/curator/tree/a47ab1e1 Diff: http://git-wip-us.apache.org/repos/asf/curator/diff/a47ab1e1 Branch: refs/heads/CURATOR-351 Commit: a47ab1e1d685fd1792ffd8d4e01412c91bb3dbe2 Parents: 2724443 53b931a Author: randgalt <randg...@apache.org> Authored: Mon Jan 16 13:24:02 2017 -0500 Committer: randgalt <randg...@apache.org> Committed: Mon Jan 16 13:24:02 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/a47ab1e1/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 9814b25,c37595e..35a58bf --- a/pom.xml +++ b/pom.xml @@@ -76,10 -76,10 +76,10 @@@ <scannotation-version>1.0.2</scannotation-version> <resteasy-jaxrs-version>2.3.0.GA</resteasy-jaxrs-version> <guava-version>16.0.1</guava-version> - <testng-version>6.8.8</testng-version> + <testng-version>6.10</testng-version> <swift-version>0.12.0</swift-version> <dropwizard-version>0.7.0</dropwizard-version> - <maven-shade-plugin-version>2.3</maven-shade-plugin-version> + <maven-shade-plugin-version>2.4.3</maven-shade-plugin-version> <slf4j-version>1.7.6</slf4j-version> <clirr-maven-plugin-version>2.6.1</clirr-maven-plugin-version>
