You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by xi...@apache.org on 2022/06/01 23:14:13 UTC
[pinot] branch master updated: Spark connector pom fixes (#8810)
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 8b2b8f5762 Spark connector pom fixes (#8810)
8b2b8f5762 is described below
commit 8b2b8f576209eea0b03f4c929c3c80f19f214908
Author: Caner Balci <ca...@gmail.com>
AuthorDate: Wed Jun 1 16:14:07 2022 -0700
Spark connector pom fixes (#8810)
---
pinot-connectors/pinot-spark-connector/pom.xml | 64 +++++++++++++++++---------
1 file changed, 42 insertions(+), 22 deletions(-)
diff --git a/pinot-connectors/pinot-spark-connector/pom.xml b/pinot-connectors/pinot-spark-connector/pom.xml
index 14a4e667e9..49829a571c 100644
--- a/pinot-connectors/pinot-spark-connector/pom.xml
+++ b/pinot-connectors/pinot-spark-connector/pom.xml
@@ -39,6 +39,7 @@
<jackson.module.scala.version>2.10.0</jackson.module.scala.version>
<scalaxml.version>1.3.0</scalaxml.version>
<scalatest.version>3.1.1</scalatest.version>
+ <shadeBase>org.apache.pinot.\$internal</shadeBase>
<!-- TODO: delete this prop once all the checkstyle warnings are fixed -->
<checkstyle.fail.on.violation>false</checkstyle.fail.on.violation>
@@ -140,19 +141,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-netty-shaded</artifactId>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-protobuf</artifactId>
- </dependency>
- <dependency>
- <groupId>io.grpc</groupId>
- <artifactId>grpc-stub</artifactId>
- </dependency>
<dependency>
<groupId>org.scala-lang</groupId>
<artifactId>scala-library</artifactId>
@@ -199,19 +187,25 @@
</executions>
</plugin>
<plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptorRefs>
- <descriptorRef>jar-with-dependencies</descriptorRef>
- </descriptorRefs>
- </configuration>
+ <artifactId>maven-shade-plugin</artifactId>
<executions>
<execution>
- <id>assemble-all</id>
<phase>package</phase>
<goals>
- <goal>single</goal>
+ <goal>shade</goal>
</goals>
+ <configuration>
+ <relocations>
+ <relocation>
+ <pattern>com</pattern>
+ <shadedPattern>${shadeBase}.com</shadedPattern>
+ <includes>
+ <include>com.google.protobuf.**</include>
+ <include>com.google.common.**</include>
+ </includes>
+ </relocation>
+ </relocations>
+ </configuration>
</execution>
</executions>
</plugin>
@@ -334,6 +328,16 @@
</build>
<dependencies>
+ <dependency>
+ <groupId>org.apache.pinot</groupId>
+ <artifactId>pinot-common</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.zookeeper</groupId>
+ <artifactId>zookeeper</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.apache.pinot</groupId>
<artifactId>pinot-core</artifactId>
@@ -359,6 +363,22 @@
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-netty-shaded</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-protobuf</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>io.grpc</groupId>
+ <artifactId>grpc-stub</artifactId>
+ </dependency>
</dependencies>
-
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org