From 80224e3e5ed7ee7b09c4985a920a7fa393bff26c Mon Sep 17 00:00:00 2001
From: vijayk <vkumar@hortonworks.com>
Date: Wed, 7 Sep 2016 06:09:36 +0000
Subject: [PATCH] NIFI-2741 Move HBase, Storm, Hive, and Kafka versions into
 properties.

Signed-off-by: Bryan Bende <bbende@apache.org>
---
 nifi-external/nifi-storm-spout/pom.xml                     | 2 +-
 .../nifi-hive-bundle/nifi-hive-processors/pom.xml          | 5 -----
 .../nifi-kafka-bundle/nifi-kafka-0-10-processors/pom.xml   | 4 ++--
 .../nifi-kafka-bundle/nifi-kafka-0-8-processors/pom.xml    | 4 ++--
 .../nifi-kafka-bundle/nifi-kafka-0-9-processors/pom.xml    | 4 ++--
 nifi-nar-bundles/nifi-kafka-bundle/pom.xml                 | 7 +++++++
 .../nifi-kite-bundle/nifi-kite-processors/pom.xml          | 1 -
 .../nifi-hbase_1_1_2-client-service-bundle/pom.xml         | 2 +-
 pom.xml                                                    | 3 +++
 9 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/nifi-external/nifi-storm-spout/pom.xml b/nifi-external/nifi-storm-spout/pom.xml
index 4ae36faaa3..53eca36063 100644
--- a/nifi-external/nifi-storm-spout/pom.xml
+++ b/nifi-external/nifi-storm-spout/pom.xml
@@ -27,7 +27,7 @@
         <dependency>
             <groupId>org.apache.storm</groupId>
             <artifactId>storm-core</artifactId>
-            <version>1.0.1</version>
+            <version>${storm.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
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 d2d0c23306..f68d5a56cb 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
@@ -25,11 +25,6 @@
     <artifactId>nifi-hive-processors</artifactId>
     <packaging>jar</packaging>
 
-    <properties>
-        <hive.version>1.2.1</hive.version>
-    </properties>
-
-
     <dependencies>
         <dependency>
             <groupId>org.apache.nifi</groupId>
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/pom.xml
index a9e3a4f5aa..ad3fb7d38c 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/pom.xml
@@ -41,12 +41,12 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
-            <version>0.10.0.1</version>
+            <version>${kafka10.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka_2.10</artifactId>
-            <version>0.10.0.1</version>
+            <version>${kafka10.version}</version>
             <scope>test</scope>
             <exclusions>
                 <!-- Transitive dependencies excluded because they are located
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/pom.xml
index b662974118..00cfba8373 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/pom.xml
@@ -37,12 +37,12 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
-            <version>0.8.2.2</version>
+            <version>${kafka8.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka_2.10</artifactId>
-            <version>0.8.2.2</version>
+            <version>${kafka8.version}</version>
             <exclusions>
                 <!-- Transitive dependencies excluded because they are located 
                 in a legacy Maven repository, which Maven 3 doesn't support. -->
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/pom.xml
index 0ed7a65c01..465aaae4ce 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/pom.xml
@@ -41,12 +41,12 @@
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka-clients</artifactId>
-            <version>0.9.0.1</version>
+            <version>${kafka9.version}</version>
         </dependency>
         <dependency>
             <groupId>org.apache.kafka</groupId>
             <artifactId>kafka_2.10</artifactId>
-            <version>0.9.0.1</version>
+            <version>${kafka9.version}</version>
             <scope>test</scope>
             <exclusions>
                 <!-- Transitive dependencies excluded because they are located
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
index 4d20226d3b..ba49c18ac3 100644
--- a/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
@@ -21,6 +21,13 @@
     </parent>
     <artifactId>nifi-kafka-bundle</artifactId>
     <packaging>pom</packaging>
+
+    <properties>
+      <kafka8.version>0.8.2.2</kafka8.version>
+      <kafka9.version>0.9.0.1</kafka9.version>
+      <kafka10.version>0.10.0.1</kafka10.version>
+    </properties>
+
     <modules>
         <module>nifi-kafka-0-8-processors</module>
         <module>nifi-kafka-0-9-processors</module>
diff --git a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
index 1a4d315a9c..3f86050234 100644
--- a/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
+++ b/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
@@ -26,7 +26,6 @@
 
     <properties>
         <kite.version>1.0.0</kite.version>
-        <hive.version>1.2.0</hive.version>
         <findbugs-annotations.version>1.3.9-1</findbugs-annotations.version>
     </properties>
 
diff --git a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
index edcb8a384d..8faecef44a 100644
--- a/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
+++ b/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
@@ -52,7 +52,7 @@
             <dependency>
                 <groupId>org.apache.hbase</groupId>
                 <artifactId>hbase-client</artifactId>
-                <version>1.1.2</version>
+                <version>${hbase.version}</version>
             </dependency>
             <!-- the top-level pom forces 18.0, but Hadoop 2.6 expects 12.0.1 -->
             <dependency>
diff --git a/pom.xml b/pom.xml
index ce14757634..0f1d088c9f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -100,6 +100,9 @@ language governing permissions and limitations under the License. -->
         <hadoop.http.client.version>4.2.5</hadoop.http.client.version>
         <yammer.metrics.version>2.2.0</yammer.metrics.version>
         <ranger.version>0.6.0</ranger.version>
+        <hive.version>1.2.1</hive.version>
+        <hbase.version>1.1.2</hbase.version>
+        <storm.version>1.0.1</storm.version>
     </properties>