You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ne...@apache.org on 2019/07/11 17:55:17 UTC
[incubator-pinot] branch master updated: make kafka version number
controlled by config number (#4396)
This is an automated email from the ASF dual-hosted git repository.
nehapawar pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
The following commit(s) were added to refs/heads/master by this push:
new bca6756 make kafka version number controlled by config number (#4396)
bca6756 is described below
commit bca67566b7ea6de79e28814c2f91b2341ebb9ce9
Author: James Shao <ja...@users.noreply.github.com>
AuthorDate: Thu Jul 11 10:55:12 2019 -0700
make kafka version number controlled by config number (#4396)
* make kafka version number controlled by config number
* update per feedback
* separate kafka connector version config and lib config
---
pinot-connectors/pinot-connector-kafka-0.9/pom.xml | 6 +++---
pinot-integration-tests/pom.xml | 3 +--
pinot-perf/pom.xml | 3 +--
pinot-tools/pom.xml | 3 +--
pom.xml | 7 +++++++
5 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/pinot-connectors/pinot-connector-kafka-0.9/pom.xml b/pinot-connectors/pinot-connector-kafka-0.9/pom.xml
index ae0317e..e8f6c93 100644
--- a/pinot-connectors/pinot-connector-kafka-0.9/pom.xml
+++ b/pinot-connectors/pinot-connector-kafka-0.9/pom.xml
@@ -34,7 +34,7 @@
<url>https://pinot.apache.org/</url>
<properties>
<pinot.root>${basedir}/../..</pinot.root>
- <kafka.version>0.9.0.1</kafka.version>
+ <kafka.lib.version>0.9.0.1</kafka.lib.version>
</properties>
<dependencies>
@@ -42,8 +42,8 @@
<!-- Kafka -->
<dependency>
<groupId>org.apache.kafka</groupId>
- <artifactId>kafka_2.10</artifactId>
- <version>${kafka.version}</version>
+ <artifactId>kafka_${kafka.scala.version}</artifactId>
+ <version>${kafka.lib.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
diff --git a/pinot-integration-tests/pom.xml b/pinot-integration-tests/pom.xml
index 5467174..b58647f 100644
--- a/pinot-integration-tests/pom.xml
+++ b/pinot-integration-tests/pom.xml
@@ -189,10 +189,9 @@
<version>${project.version}</version>
<type>test-jar</type>
</dependency>
- <!-- TODO: figure out a way to avoid explicitly setting the kafka module dependency, and instead inject it, such that any kafka stream implementation can use this -->
<dependency>
<groupId>org.apache.pinot</groupId>
- <artifactId>pinot-connector-kafka-0.9</artifactId>
+ <artifactId>pinot-connector-kafka-${kafka.version}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/pinot-perf/pom.xml b/pinot-perf/pom.xml
index 64b1891..74bb09f 100644
--- a/pinot-perf/pom.xml
+++ b/pinot-perf/pom.xml
@@ -50,10 +50,9 @@
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-broker</artifactId>
</dependency>
- <!-- TODO: figure out a way to avoid explicitly setting the kafka module dependency, and instead inject it, such that any kafka stream implementation can use this -->
<dependency>
<groupId>org.apache.pinot</groupId>
- <artifactId>pinot-connector-kafka-0.9</artifactId>
+ <artifactId>pinot-connector-kafka-${kafka.version}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/pinot-tools/pom.xml b/pinot-tools/pom.xml
index 84a88a2..6e18295 100644
--- a/pinot-tools/pom.xml
+++ b/pinot-tools/pom.xml
@@ -54,10 +54,9 @@
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-broker</artifactId>
</dependency>
- <!-- TODO: figure out a way to avoid explicitly setting the kafka module dependency, and instead inject it, such that any kafka stream implementation can use this -->
<dependency>
<groupId>org.apache.pinot</groupId>
- <artifactId>pinot-connector-kafka-0.9</artifactId>
+ <artifactId>pinot-connector-kafka-${kafka.version}</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index 6dd5815..a734f94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -136,6 +136,13 @@
<!-- Sets the VM argument line used when unit tests are run. -->
<argLine>-Xms4g -Xmx4g -XX:MaxPermSize=512m -XX:MaxDirectMemorySize=10g</argLine>
+
+ <!-- handle kafka imports
+ kafka dependency is still explicitly defined in pinot-integration-tests, pinot-tools and pinot-perf pom files.
+ To change kafka connector dependency, we only need to update this version number config.
+ TODO: figure out a way to inject kafka dependency instead of explicitly setting the kafka module dependency -->
+ <kafka.version>0.9</kafka.version>
+ <kafka.scala.version>2.10</kafka.scala.version>
</properties>
<profiles>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org