You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by mc...@apache.org on 2020/05/06 23:38:38 UTC
[nifi] branch master updated: NIFI-7428: Switch hive.version
property to set Hive 3 version
This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/master by this push:
new b7c81d6 NIFI-7428: Switch hive.version property to set Hive 3 version
b7c81d6 is described below
commit b7c81d6007852d933961d0067030bc807363e2ee
Author: Matthew Burgess <ma...@apache.org>
AuthorDate: Wed May 6 16:59:50 2020 -0400
NIFI-7428: Switch hive.version property to set Hive 3 version
This closes #4259
---
.../nifi-hive-bundle/nifi-hive-processors/pom.xml | 8 ++++----
.../nifi-hive-bundle/nifi-hive3-nar/pom.xml | 2 --
.../nifi-hive-bundle/nifi-hive3-processors/pom.xml | 22 +++-------------------
nifi-nar-bundles/nifi-hive-bundle/pom.xml | 6 +++---
4 files changed, 10 insertions(+), 28 deletions(-)
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 9b9b2e7..061c4e5 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
@@ -27,7 +27,7 @@
<properties>
<!-- Need to override hadoop.version here, for Hive and hadoop-client transitive dependencies -->
- <hadoop.version>${hive.hadoop.version}</hadoop.version>
+ <hadoop.version>${hive12.hadoop.version}</hadoop.version>
</properties>
<dependencies>
@@ -61,7 +61,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
- <version>${hive.version}</version>
+ <version>${hive12.version}</version>
<exclusions>
<exclusion>
<groupId>org.json</groupId>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-streaming</artifactId>
- <version>${hive.version}</version>
+ <version>${hive12.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -83,7 +83,7 @@
<dependency>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-core</artifactId>
- <version>${hive.version}</version>
+ <version>${hive12.version}</version>
</dependency>
<dependency>
<groupId>org.apache.hadoop</groupId>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/pom.xml
index 3abc824..9563372 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-nar/pom.xml
@@ -28,8 +28,6 @@
<properties>
<maven.javadoc.skip>true</maven.javadoc.skip>
<source.skip>true</source.skip>
- <!-- Need to override hadoop.version here, for Hive and hadoop-client transitive dependencies -->
- <hadoop.version>${hive3.hadoop.version}</hadoop.version>
</properties>
<dependencies>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
index a90c83c..6215f37 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/nifi-hive3-processors/pom.xml
@@ -25,11 +25,6 @@
<artifactId>nifi-hive3-processors</artifactId>
<packaging>jar</packaging>
- <properties>
- <!-- Need to override hadoop.version here, for Hive and hadoop-client transitive dependencies -->
- <hadoop.version>${hive3.hadoop.version}</hadoop.version>
- </properties>
-
<dependencies>
<dependency>
<groupId>org.apache.nifi</groupId>
@@ -74,7 +69,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-jdbc</artifactId>
- <version>${hive3.version}</version>
+ <version>${hive.version}</version>
<exclusions>
<exclusion>
<groupId>org.json</groupId>
@@ -89,7 +84,7 @@
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>hive-streaming</artifactId>
- <version>${hive3.version}</version>
+ <version>${hive.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -100,18 +95,7 @@
<dependency>
<groupId>org.apache.hive.hcatalog</groupId>
<artifactId>hive-hcatalog-core</artifactId>
- <version>${hive3.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.hadoop</groupId>
- <artifactId>hadoop-client</artifactId>
- <version>${hadoop.version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.google.code.findbugs</groupId>
- <artifactId>jsr305</artifactId>
- </exclusion>
- </exclusions>
+ <version>${hive.version}</version>
</dependency>
<dependency>
<groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-hive-bundle/pom.xml b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
index e77c8fb..5c153b3 100644
--- a/nifi-nar-bundles/nifi-hive-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-hive-bundle/pom.xml
@@ -51,10 +51,10 @@
<properties>
<hive11.version>1.1.1</hive11.version>
<hive11.hadoop.version>2.6.2</hive11.hadoop.version>
- <hive.version>1.2.1</hive.version>
- <hive.hadoop.version>2.6.2</hive.hadoop.version>
+ <hive12.version>1.2.1</hive12.version>
+ <hive12.hadoop.version>2.6.2</hive12.hadoop.version>
<hive3.version>3.1.2</hive3.version>
- <hive3.hadoop.version>3.1.0</hive3.hadoop.version>
+ <hive.version>${hive3.version}</hive.version>
</properties>
<build>