You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by bb...@apache.org on 2016/09/07 16:07:40 UTC
nifi git commit: NIFI-2741 Move HBase, Storm, Hive,
and Kafka versions into properties.
Repository: nifi
Updated Branches:
refs/heads/master 8d6e12fdc -> 80224e3e5
NIFI-2741 Move HBase, Storm, Hive, and Kafka versions into properties.
Signed-off-by: Bryan Bende <bb...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/nifi/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi/commit/80224e3e
Tree: http://git-wip-us.apache.org/repos/asf/nifi/tree/80224e3e
Diff: http://git-wip-us.apache.org/repos/asf/nifi/diff/80224e3e
Branch: refs/heads/master
Commit: 80224e3e5ed7ee7b09c4985a920a7fa393bff26c
Parents: 8d6e12f
Author: vijayk <vk...@hortonworks.com>
Authored: Wed Sep 7 06:09:36 2016 +0000
Committer: Bryan Bende <bb...@apache.org>
Committed: Wed Sep 7 12:06:01 2016 -0400
----------------------------------------------------------------------
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(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/nifi/blob/80224e3e/nifi-external/nifi-storm-spout/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-external/nifi-storm-spout/pom.xml b/nifi-external/nifi-storm-spout/pom.xml
index 4ae36fa..53eca36 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>
http://git-wip-us.apache.org/repos/asf/nifi/blob/80224e3e/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 d2d0c23..f68d5a5 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>
http://git-wip-us.apache.org/repos/asf/nifi/blob/80224e3e/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-10-processors/pom.xml
----------------------------------------------------------------------
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 a9e3a4f..ad3fb7d 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
http://git-wip-us.apache.org/repos/asf/nifi/blob/80224e3e/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-8-processors/pom.xml
----------------------------------------------------------------------
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 b662974..00cfba8 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. -->
http://git-wip-us.apache.org/repos/asf/nifi/blob/80224e3e/nifi-nar-bundles/nifi-kafka-bundle/nifi-kafka-0-9-processors/pom.xml
----------------------------------------------------------------------
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 0ed7a65..465aaae 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
http://git-wip-us.apache.org/repos/asf/nifi/blob/80224e3e/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
----------------------------------------------------------------------
diff --git a/nifi-nar-bundles/nifi-kafka-bundle/pom.xml b/nifi-nar-bundles/nifi-kafka-bundle/pom.xml
index 4d20226..ba49c18 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>
http://git-wip-us.apache.org/repos/asf/nifi/blob/80224e3e/nifi-nar-bundles/nifi-kite-bundle/nifi-kite-processors/pom.xml
----------------------------------------------------------------------
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 1a4d315..3f86050 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>
http://git-wip-us.apache.org/repos/asf/nifi/blob/80224e3e/nifi-nar-bundles/nifi-standard-services/nifi-hbase_1_1_2-client-service-bundle/pom.xml
----------------------------------------------------------------------
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 edcb8a3..8faecef 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>
http://git-wip-us.apache.org/repos/asf/nifi/blob/80224e3e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ce14757..0f1d088 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>