You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by sn...@apache.org on 2021/07/29 17:22:19 UTC
[pinot] 02/03: Fix the shaded issue with Apache Pulsar (#7223)
This is an automated email from the ASF dual-hosted git repository.
snlee pushed a commit to branch release-0.8.0-rc
in repository https://gitbox.apache.org/repos/asf/pinot.git
commit ee887b97e77ef7a132d3d6d60f83a800e52d4555
Author: Seunghyun Lee <sn...@linkedin.com>
AuthorDate: Wed Jul 28 19:13:04 2021 -0700
Fix the shaded issue with Apache Pulsar (#7223)
* Fix the shaded issue with Apache Pulsar
As mentioned in #7221, Apache Pulsar plugin did not create the
shaded jar. This PR addresses it. Moreover, we also fix the
javadoc lint issue when building the apache release.
* Update pom.xml
Co-authored-by: Xiang Fu <xi...@gmail.com>
---
pinot-distribution/pinot-assembly.xml | 4 ++
.../pinot-stream-ingestion/pinot-pulsar/pom.xml | 44 ++++++++++++++--------
pom.xml | 4 +-
3 files changed, 35 insertions(+), 17 deletions(-)
diff --git a/pinot-distribution/pinot-assembly.xml b/pinot-distribution/pinot-assembly.xml
index 09e01ab..8bfc730 100644
--- a/pinot-distribution/pinot-assembly.xml
+++ b/pinot-distribution/pinot-assembly.xml
@@ -59,6 +59,10 @@
<source>${pinot.root}/pinot-plugins/pinot-stream-ingestion/pinot-kinesis/target/pinot-kinesis-${project.version}-shaded.jar</source>
<destName>plugins/pinot-stream-ingestion/pinot-kinesis/pinot-kinesis-${project.version}-shaded.jar</destName>
</file>
+ <file>
+ <source>${pinot.root}/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/target/pinot-pulsar-${project.version}-shaded.jar</source>
+ <destName>plugins/pinot-stream-ingestion/pinot-pulsar/pinot-pulsar-${project.version}-shaded.jar</destName>
+ </file>
<!-- End Include Pinot Stream Ingestion Plugins-->
<!-- Start Include Pinot Batch Ingestion Plugins-->
<file>
diff --git a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
index 7e720c5..fd7128e 100644
--- a/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
+++ b/pinot-plugins/pinot-stream-ingestion/pinot-pulsar/pom.xml
@@ -22,19 +22,20 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
<artifactId>pinot-stream-ingestion</artifactId>
<groupId>org.apache.pinot</groupId>
<version>0.8.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
+ <artifactId>pinot-pulsar</artifactId>
<name>Pinot Pulsar</name>
<url>https://pinot.apache.org/</url>
- <artifactId>pinot-pulsar</artifactId>
<properties>
+ <phase.prop>package</phase.prop>
<pinot.root>${basedir}/../../..</pinot.root>
<pulsar.version>2.7.2</pulsar.version>
<jetty-server.version>9.4.39.v20210325</jetty-server.version>
@@ -90,6 +91,14 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcpkix-jdk15on</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15on</artifactId>
+ </exclusion>
</exclusions>
</dependency>
<dependency>
@@ -132,10 +141,6 @@
<artifactId>grpc-context</artifactId>
</exclusion>
<exclusion>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- </exclusion>
- <exclusion>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</exclusion>
@@ -220,12 +225,16 @@
<artifactId>netty-transport-native-unix-common</artifactId>
</exclusion>
<exclusion>
+ <groupId>jakarta.ws.rs</groupId>
+ <artifactId>jakarta.ws.rs-api</artifactId>
+ </exclusion>
+ <exclusion>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-ext-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk15on</artifactId>
</exclusion>
<exclusion>
- <groupId>jakarta.ws.rs</groupId>
- <artifactId>jakarta.ws.rs-api</artifactId>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15on</artifactId>
</exclusion>
</exclusions>
</dependency>
@@ -275,11 +284,6 @@
<version>${grpc-context.version}</version>
</dependency>
<dependency>
- <groupId>org.bouncycastle</groupId>
- <artifactId>bcpkix-jdk15on</artifactId>
- <version>${bouncycastle.version}</version>
- </dependency>
- <dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
<version>${netty-tcnative.version}</version>
@@ -366,7 +370,17 @@
</dependency>
<dependency>
<groupId>org.bouncycastle</groupId>
- <artifactId>bcprov-ext-jdk15on</artifactId>
+ <artifactId>bcpkix-jdk15to18</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-ext-jdk15to18</artifactId>
+ <version>${bouncycastle.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.bouncycastle</groupId>
+ <artifactId>bcprov-jdk15to18</artifactId>
<version>${bouncycastle.version}</version>
</dependency>
<dependency>
diff --git a/pom.xml b/pom.xml
index aa92fd1..87446a6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1355,10 +1355,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
- <version>2.10.1</version>
+ <version>3.2.0</version>
<configuration>
<!-- Remove this after fixing all javadoc warnings -->
- <additionalparam>-Xdoclint:none</additionalparam>
+ <doclint>none</doclint>
</configuration>
</plugin>
<plugin>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org