You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@storm.apache.org by pt...@apache.org on 2016/07/25 21:09:31 UTC
[14/16] storm git commit: STORM-1876: update poms
STORM-1876: update poms
Signed-off-by: P. Taylor Goetz <pt...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/storm/repo
Commit: http://git-wip-us.apache.org/repos/asf/storm/commit/d823f438
Tree: http://git-wip-us.apache.org/repos/asf/storm/tree/d823f438
Diff: http://git-wip-us.apache.org/repos/asf/storm/diff/d823f438
Branch: refs/heads/1.0.x-branch
Commit: d823f438de1fcbf60ef344edc043713b6a21c186
Parents: 7980b8f
Author: P. Taylor Goetz <pt...@gmail.com>
Authored: Mon Jul 25 16:04:59 2016 -0400
Committer: P. Taylor Goetz <pt...@gmail.com>
Committed: Mon Jul 25 16:33:16 2016 -0400
----------------------------------------------------------------------
examples/storm-starter/pom.xml | 4 ++--
external/flux/flux-examples/pom.xml | 2 +-
external/flux/pom.xml | 2 +-
external/sql/storm-sql-kafka/pom.xml | 4 ++--
external/storm-kafka-client/pom.xml | 1 +
external/storm-kafka/pom.xml | 8 +++-----
pom.xml | 14 +++++++++-----
7 files changed, 19 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/storm/blob/d823f438/examples/storm-starter/pom.xml
----------------------------------------------------------------------
diff --git a/examples/storm-starter/pom.xml b/examples/storm-starter/pom.xml
index 62c262f..5d2ab9e 100644
--- a/examples/storm-starter/pom.xml
+++ b/examples/storm-starter/pom.xml
@@ -148,12 +148,12 @@
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>${kafka.artifact.id}</artifactId>
- <scope>provided</scope>
+ <artifactId>${storm.kafka.artifact.id}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
+ <version>${storm.kafka.version}</version>
</dependency>
<dependency>
<groupId>org.apache.storm</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/d823f438/external/flux/flux-examples/pom.xml
----------------------------------------------------------------------
diff --git a/external/flux/flux-examples/pom.xml b/external/flux/flux-examples/pom.xml
index 1edfaa3..783c9d8 100644
--- a/external/flux/flux-examples/pom.xml
+++ b/external/flux/flux-examples/pom.xml
@@ -95,7 +95,7 @@
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>${kafka.artifact.id}</artifactId>
+ <artifactId>${storm.kafka.artifact.id}</artifactId>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/storm/blob/d823f438/external/flux/pom.xml
----------------------------------------------------------------------
diff --git a/external/flux/pom.xml b/external/flux/pom.xml
index c0c727c..4c8de93 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>
http://git-wip-us.apache.org/repos/asf/storm/blob/d823f438/external/sql/storm-sql-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/sql/storm-sql-kafka/pom.xml b/external/sql/storm-sql-kafka/pom.xml
index 6b6e364..92b6b2f 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>
- <scope>provided</scope>
+ <artifactId>${storm.kafka.artifact.id}</artifactId>
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
+ <version>${storm.kafka.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/d823f438/external/storm-kafka-client/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka-client/pom.xml b/external/storm-kafka-client/pom.xml
index a7f1c43..0954e01 100644
--- a/external/storm-kafka-client/pom.xml
+++ b/external/storm-kafka-client/pom.xml
@@ -51,6 +51,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
+ <version>${storm.kafka.client.version}</version>
</dependency>
<!--test dependencies -->
<dependency>
http://git-wip-us.apache.org/repos/asf/storm/blob/d823f438/external/storm-kafka/pom.xml
----------------------------------------------------------------------
diff --git a/external/storm-kafka/pom.xml b/external/storm-kafka/pom.xml
index ccfe570..33f8e97 100644
--- a/external/storm-kafka/pom.xml
+++ b/external/storm-kafka/pom.xml
@@ -30,10 +30,6 @@
<name>storm-kafka</name>
<description>Storm Spouts for Apache Kafka</description>
- <properties>
- <kafka.version>0.8.2.1</kafka.version>
- <kafka.artifact.id>kafka_2.10</kafka.artifact.id>
- </properties>
<build>
<plugins>
<plugin>
@@ -123,12 +119,14 @@
</dependency>
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>${kafka.artifact.id}</artifactId>
+ <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>${storm.kafka.version}</version>
</dependency>
<dependency>
<groupId>org.apache.storm</groupId>
http://git-wip-us.apache.org/repos/asf/storm/blob/d823f438/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index d87a3d0..56455c2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -249,8 +249,12 @@
<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>0.9.0.1</kafka.version>
- <kafka.artifact.id>kafka_2.11</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 storm-kafka-client spout code -->
+ <storm.kafka.client.version>0.9.0.1</storm.kafka.client.version>
<!-- Java and clojure build lifecycle test properties are defined here to avoid having to create a default profile -->
<java.unit.test.exclude>org.apache.storm.testing.IntegrationTest</java.unit.test.exclude>
@@ -855,8 +859,8 @@
</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>
<exclusions>
<exclusion>
<groupId>org.apache.zookeeper</groupId>
@@ -875,7 +879,7 @@
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
- <version>${kafka.version}</version>
+ <version>${storm.kafka.client.version}</version>
</dependency>
</dependencies>