This is an automated email from the ASF dual-hosted git repository.
mcvsubbu 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 06c7e7d Moving dependencies and enabling a shaded jar (#4930)
06c7e7d is described below
commit 06c7e7d02a2ac569a3a31b7f2165702cb1764305
Author: Subbu Subramaniam <[email protected]>
AuthorDate: Tue Dec 17 11:22:38 2019 -0800
Moving dependencies and enabling a shaded jar (#4930)
* Moving dependencies and enabling a shaded jar
Removed pinot-core dependency on pinot-thrift, pinot-json and pinot-csv.
Instead, added these as dependencies inside pinot-hadoop and pinot-spark.
Enabled shaded build for the kafka common code so that we can export the
class AvroRecordToPinotRowGenerator for internal builds.
A better way to do this may be to move check-in external kafka connectors
* Updated as per offline discussion
Jackie-Jiang and I discussed offline, right now we are fine without
importing the
kafka-base package, so removed the shading that I added earlier.
Added back csv and json to pinot-core in test scope, since travis failed
---
pinot-batch-ingestion/pinot-hadoop/pom.xml | 15 +++++++++++++++
pinot-batch-ingestion/pinot-spark/pom.xml | 10 ++++++++++
pinot-core/pom.xml | 27 ++++++++++++---------------
3 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/pinot-batch-ingestion/pinot-hadoop/pom.xml
b/pinot-batch-ingestion/pinot-hadoop/pom.xml
index ef7a329..6f2e6b0 100644
--- a/pinot-batch-ingestion/pinot-hadoop/pom.xml
+++ b/pinot-batch-ingestion/pinot-hadoop/pom.xml
@@ -131,6 +131,21 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-thrift</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-csv</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-json</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<scope>provided</scope>
diff --git a/pinot-batch-ingestion/pinot-spark/pom.xml
b/pinot-batch-ingestion/pinot-spark/pom.xml
index b459ca3..f587bf8 100644
--- a/pinot-batch-ingestion/pinot-spark/pom.xml
+++ b/pinot-batch-ingestion/pinot-spark/pom.xml
@@ -128,6 +128,16 @@
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-thrift</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-csv</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
<artifactId>pinot-orc</artifactId>
<version>${project.version}</version>
<exclusions>
diff --git a/pinot-core/pom.xml b/pinot-core/pom.xml
index 202c37f..741b569 100644
--- a/pinot-core/pom.xml
+++ b/pinot-core/pom.xml
@@ -71,21 +71,6 @@
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
- <artifactId>pinot-csv</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.pinot</groupId>
- <artifactId>pinot-json</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.pinot</groupId>
- <artifactId>pinot-thrift</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.pinot</groupId>
<artifactId>pinot-common</artifactId>
</dependency>
<dependency>
@@ -200,6 +185,18 @@
</dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-csv</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-json</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
<artifactId>pinot-spi</artifactId>
<version>${project.version}</version>
<type>test-jar</type>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
