Repository: nifi Updated Branches: refs/heads/master 7d8dd2702 -> ed42f2e3e
NIFI-2552: Updated Curator for HiveQL processors using Zookeeper quorum in URL Signed-off-by: Yolanda M. Davis <[email protected]> This closes #865 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/ed42f2e3 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/ed42f2e3 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/ed42f2e3 Branch: refs/heads/master Commit: ed42f2e3e339b5db9113fbbc60db94c74c1f9d29 Parents: 7d8dd27 Author: Matt Burgess <[email protected]> Authored: Mon Aug 15 08:54:28 2016 -0400 Committer: Yolanda M. Davis <[email protected]> Committed: Mon Aug 15 16:53:57 2016 -0400 ---------------------------------------------------------------------- .../nifi-hadoop-libraries-nar/pom.xml | 7 ++++++ .../nifi-hive-processors/pom.xml | 26 ++++++++++++++++++++ 2 files changed, 33 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/ed42f2e3/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml index 9cfa8b3..6bc805c 100644 --- a/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml +++ b/nifi-nar-bundles/nifi-hadoop-libraries-bundle/nifi-hadoop-libraries-nar/pom.xml @@ -20,6 +20,7 @@ <properties> <maven.javadoc.skip>true</maven.javadoc.skip> <source.skip>true</source.skip> + <curator.version>2.11.0</curator.version> </properties> <dependencies> <dependency> @@ -46,5 +47,11 @@ <artifactId>findbugs-annotations</artifactId> <version>1.3.9-1</version> </dependency> + <!-- Hadoop brings in Curator 2.6.0 but 2.11.0 is needed for the HiveQL processors --> + <dependency> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + <version>${curator.version}</version> + </dependency> </dependencies> </project> http://git-wip-us.apache.org/repos/asf/nifi/blob/ed42f2e3/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml index 02face9..d5b5e16 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive-processors/pom.xml @@ -132,6 +132,14 @@ <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -151,6 +159,14 @@ <groupId>org.apache.calcite</groupId> <artifactId>calcite-avatica</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + </exclusion> </exclusions> </dependency> <dependency> @@ -166,6 +182,16 @@ <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> <scope>provided</scope> + <exclusions> + <exclusion> + <groupId>org.apache.curator</groupId> + <artifactId>curator-framework</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.curator</groupId> + <artifactId>curator-client</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>org.apache.nifi</groupId>
