Repository: nifi Updated Branches: refs/heads/master af27e4070 -> f5f132b1a
NIFI-2828: Fixed issue with transitive Hadoop dependencies in Hive NAR This closes #1146 Project: http://git-wip-us.apache.org/repos/asf/nifi/repo Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/f5f132b1 Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/f5f132b1 Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/f5f132b1 Branch: refs/heads/master Commit: f5f132b1abc63a0b3612e4efe6a3faa129c337e2 Parents: af27e40 Author: Matt Burgess <[email protected]> Authored: Tue Oct 18 16:22:15 2016 -0400 Committer: Oleg Zhurakousky <[email protected]> Committed: Thu Oct 20 14:56:01 2016 -0400 ---------------------------------------------------------------------- .../nifi-hive-bundle/nifi-hive-processors/pom.xml | 7 +++++++ nifi-nar-bundles/nifi-hive-bundle/pom.xml | 5 +++++ pom.xml | 1 + 3 files changed, 13 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/nifi/blob/f5f132b1/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 3d07b86..eebdcbf 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 @@ -58,6 +58,7 @@ <dependency> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-client</artifactId> + <version>${hive.hadoop.version}</version> <exclusions> <exclusion> <groupId>com.google.code.findbugs</groupId> @@ -68,6 +69,12 @@ <dependency> <groupId>org.apache.nifi</groupId> <artifactId>nifi-hadoop-utils</artifactId> + <exclusions> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-client</artifactId> + </exclusion> + </exclusions> </dependency> <dependency> <groupId>com.github.stephenc.findbugs</groupId> http://git-wip-us.apache.org/repos/asf/nifi/blob/f5f132b1/nifi-nar-bundles/nifi-hive-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml index 5ab10e8..0186740 100644 --- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml @@ -26,6 +26,11 @@ <version>1.1.0-SNAPSHOT</version> <packaging>pom</packaging> + <properties> + <!-- Need to override hadoop.version here, for Hive and hadoop-client transitive dependencies --> + <hadoop.version>${hive.hadoop.version}</hadoop.version> + </properties> + <modules> <module>nifi-hive-processors</module> <module>nifi-hive-nar</module> http://git-wip-us.apache.org/repos/asf/nifi/blob/f5f132b1/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 735a9ec..7cf41b4 100644 --- a/pom.xml +++ b/pom.xml @@ -101,6 +101,7 @@ language governing permissions and limitations under the License. --> <yammer.metrics.version>2.2.0</yammer.metrics.version> <ranger.version>0.6.0</ranger.version> <hive.version>1.2.1</hive.version> + <hive.hadoop.version>2.6.2</hive.hadoop.version> <hbase.version>1.1.2</hbase.version> <storm.version>1.0.1</storm.version> </properties>
