STORM-1876: update poms
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 0262255..09cb798 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -158,12 +158,12 @@
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>${kafka.artifact.id}</artifactId>
+ <artifactId>${storm.kafka.artifact.id}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka.version}</version>
+ <version>${storm.kafka.version}</version>
</dependency>
<dependency>
<groupId>org.apache.storm</groupId>
diff --git a/external/flux/flux-examples/pom.xml b/external/flux/flux-examples/pom.xml
index 6441bf3..f1272ac 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -95,8 +95,7 @@
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>${kafka.artifact.id}</artifactId>
- <scope>compile</scope>
+ <artifactId>${storm.kafka.artifact.id}</artifactId>
</dependency>
</dependencies>
diff --git a/external/flux/pom.xml b/external/flux/pom.xml
index 56d9bab..5083055 100644
--- a/external/flux/pom.xml
+++ b/external/flux/pom.xml
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>${kafka.artifact.id}</artifactId>
+ <artifactId>${storm.kafka.artifact.id}</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/external/sql/storm-sql-kafka/pom.xml b/external/sql/storm-sql-kafka/pom.xml
index c1d6616..a55fa74 100644
--- a/external/sql/storm-sql-kafka/pom.xml
+++ b/external/sql/storm-sql-kafka/pom.xml
@@ -63,12 +63,12 @@
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>${kafka.artifact.id}</artifactId>
+ <artifactId>${storm.kafka.artifact.id}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka.version}</version>
+ <version>${storm.kafka.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml
index 6c82b6a..f7a387c 100644
--- a/external/storm-kafka-client/pom.xml
+++ b/external/storm-kafka-client/pom.xml
@@ -52,6 +52,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
+ <version>${storm.kafka.client.version}</version>
</dependency>
<!--test dependencies -->
<dependency>
diff --git a/external/storm-kafka-monitor/pom.xml b/external/storm-kafka-monitor/pom.xml
index 3af24ce..b00a129 100644
--- a/external/storm-kafka-monitor/pom.xml
+++ b/external/storm-kafka-monitor/pom.xml
@@ -46,10 +46,12 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
+ <version>${storm.kafka.client.version}</version>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>${kafka.artifact.id}</artifactId>
+ <artifactId>${storm.kafka.artifact.id}</artifactId>
+ <version>${storm.kafka.version}</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index f150e78..08550c3 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -119,14 +119,14 @@
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>${kafka.artifact.id}</artifactId>
- <version>${kafka.version}</version>
+ <artifactId>${storm.kafka.artifact.id}</artifactId>
+ <version>${storm.kafka.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka.version}</version>
+ <version>${storm.kafka.version}</version>
</dependency>
<dependency>
<groupId>org.apache.storm</groupId>
diff --git a/pom.xml b/pom.xml
index 854ae46..0a4e65b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -258,11 +258,11 @@
<calcite.version>1.4.0-incubating</calcite.version>
<jackson.version>2.6.3</jackson.version>
<maven-surefire.version>2.18.1</maven-surefire.version>
- <!-- Kafka version used by old kafka spout code -->
- <kafka.version>0.8.2.1</kafka.version>
- <kafka.artifact.id>kafka_2.10</kafka.artifact.id>
+ <!-- Kafka version used by old storm-kafka spout code -->
+ <storm.kafka.version>0.8.2.1</storm.kafka.version>
+ <storm.kafka.artifact.id>kafka_2.10</storm.kafka.artifact.id>
- <!-- kafka version used by new kafka spout code -->
+ <!-- kafka version used by new storm-kafka-client spout code -->
<storm.kafka.client.version>0.10.0.0</storm.kafka.client.version>
@@ -876,8 +876,8 @@
<!-- kafka artifact dependency needed for storm-kafka -->
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>${kafka.artifact.id}</artifactId>
- <version>${kafka.version}</version>
+ <artifactId>${storm.kafka.artifact.id}</artifactId>
+ <version>${storm.kafka.version}</version>
<scope>provided</scope>
<exclusions>
<exclusion>
